Merge branch 'master' into dev

doc/android/Android.md

@@ -1,4 +1,5 @@
->:pushpin: While we do not officially support using the Intel® RealSense™ SDK on Android platforms, the RealSense compatible devices can be connected to Android phones and tablets via a USB 3 port.
+>:pushpin: The SDK 2.0 delivers cross-platform open source libraries & tools that allow users to develop on multiple Operating Systems & development environments.  Intel has validated SDK2.0 on Windows and Linux platforms. Please check [latest Release](https://github.com/IntelRealSense/librealsense/releases) for the build versions.  While Intel has not explicitly validated SDK2.0 on Android platforms, it is expected to work on Android as well. Please refer to the build instructions in the section below. Calibration and firmware update tools that would be used in production and manufacturing processes are not available on Android at this time.  Please contact your Intel representative for additional information.
+
 
 #  Build Intel® RealSense™ SDK 2.0 for Android OS
 This document describes how to build the [Intel® RealSense™ SDK 2.0](https://github.com/IntelRealSense/librealsense) including headless tools and examples for Android devices.

doc/error_handling.md

@@ -60,6 +60,8 @@ catch (const rs2::error& e)
     cerr << "Some other error occurred!" << endl;
 }
 ```
+For the full list of FW errors, please refer to [ds5-private.h](../src/ds5/ds5-private.h)
+
 
 ## Callbacks
 With current design, there is no way to propagate exceptions raised inside user callbacks into the library.

tools/terminal/readme.md

@@ -5,6 +5,11 @@
 
 ## Usage
 After installing `librealsense` run `rs-terminal` to launch the tool in HEX mode. 
-`-l <filename>` - load commands specification file.
+
+* `-l <filename>` - load commands specification file.
+* `-d <number>` - choose device by device number
+* `-n <serial>` - choose device by serial number
+* `-a` - broadcast to all connected devices
+
 
 

wrappers/nodejs/test/test-frameset.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Intel Corporation. All rights reserved.
+// Copyright (c) 2018 Intel Corporation. All rights reserved.
 // Use of this source code is governed by an Apache 2.0 license
 // that can be found in the LICENSE file.
 
@@ -117,4 +117,14 @@ describe('FrameSet test', function() {
     let D = frameset.getFrame(rs2.stream['STREAM_COLOR']); // jshint ignore:line
     assert(D instanceof rs2.VideoFrame);
   });
+
+  it('Testing method forEach', () => {
+    let counter = 0;
+    function callback(frame) {
+      counter++;
+      assert.equal(frame instanceof rs2.Frame, true);
+    }
+    frameset.forEach(callback);
+    assert.equal(counter, frameset.size);
+  });
 });

wrappers/opencv/readme.md

@@ -1,5 +1,8 @@
 # OpenCV Samples for Intel® RealSense™ cameras
 Examples in this folder are designed to complement existing [SDK examples](../../examples) and demonstrate how Intel RealSense cameras can be used together with `opencv` in domain of computer-vision. 
+
+> RealSense examples have been desinged and tested with OpenCV 3.4,
+> Working with latest OpenCV 4 requires minor code changes
  
 ## List of Samples:
 1. [ImShow](./imshow) - Minimal OpenCV application for visualizing depth data
@@ -15,7 +18,7 @@ This page is certainly **not** a comprehensive guide to getting started with Ope
 
 ### Windows
 1. Download and install `CMake` from [cmake.org/download](https://cmake.org/download/)
-2. Clone or download OpenCV sources from [github.com/opencv/opencv](https://github.com/opencv/opencv) into a local directory (`C:/git/opencv-master`)
+2. Clone or download OpenCV sources from [github.com/opencv/opencv/tree/3.4](https://github.com/opencv/opencv/tree/3.4) into a local directory (`C:/git/opencv-3.4`)
 3. Run `cmake-gui`, input source code and binaries locations: 
 
 <p align="center"><img src="res/1.PNG" /></p>
@@ -35,7 +38,7 @@ This page is certainly **not** a comprehensive guide to getting started with Ope
 
 <p align="center"><img src="res/3.PNG" /></p>
 
-12. Specify CMake binaries folder for OpenCV as `OpenCV_DIR` (`c:/git/opencv-master`)
+12. Specify CMake binaries folder for OpenCV as `OpenCV_DIR` (`c:/git/opencv-3.4`)
 
 <p align="center"><img src="res/4.PNG" /></p>
 
@@ -51,6 +54,8 @@ This page is certainly **not** a comprehensive guide to getting started with Ope
 ### Linux
 
 1. Build `opencv` from source using the [official guide](https://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html)
+> Please use `git checkout 3.4` to use version 3.4
+
 2. Run `export OpenCV_DIR=~/opencv/build` (`~/opencv/build` is the folder containing `OpenCVConfig.cmake`)
 3. Follow [the instructions](https://github.com/IntelRealSense/librealsense/blob/master/doc/installation.md) to build `librealsense` from source
 4. Add `-DBUILD_CV_EXAMPLES=true` to your `cmake` command