Merge pull request IntelRealSense#2362 from IntelRealSense/master

Merge of master to development

readme.md

@@ -78,4 +78,4 @@ In order to contribute to Intel RealSense SDK, please follow our [contribution g
 
 ## License
 This project is licensed under the [Apache License, Version 2.0](LICENSE).
-Copyright 2017 Intel Corporation
+Copyright 2018 Intel Corporation

wrappers/matlab/points.m

@@ -9,7 +9,7 @@
         % Destructor (uses base class destructor)
 
         % Functions
-        function vertcies = get_vertices(this)
+        function vertices = get_vertices(this)
             vertices = realsense.librealsense_mex('rs2::points', 'get_vertices', this.objectHandle);
         end
         function export_to_ply(this, fname, texture)
@@ -28,4 +28,4 @@ function export_to_ply(this, fname, texture)
             realsense.librealsense_mex('rs2::points', 'size', this.objectHandle);
         end
     end
-end
+end

wrappers/opencv/grabcuts/rs-grabcuts.cpp

@@ -57,7 +57,7 @@ int main(int argc, char * argv[]) try
         // Colorize depth image with white being near and black being far
         // This will take advantage of histogram equalization done by the colorizer
         colorize.set_option(RS2_OPTION_COLOR_SCHEME, 2);
-        frame bw_depth = colorize(depth);
+        frame bw_depth = depth.apply_filter(colorize);
 
         // Generate "near" mask image:
         auto near = frame_to_mat(bw_depth);

wrappers/opencv/imshow/rs-imshow.cpp

@@ -21,7 +21,7 @@ int main(int argc, char * argv[]) try
     while (waitKey(1) < 0 && cvGetWindowHandle(window_name))
     {
         rs2::frameset data = pipe.wait_for_frames(); // Wait for next set of frames from the camera
-        rs2::frame depth = color_map(data.get_depth_frame());
+        rs2::frame depth = data.get_depth_frame().apply_filter(color_map);
 
         // Query frame size (width and height)
         const int w = depth.as<rs2::video_frame>().get_width();