Merge pull request #2766 from valgur/patch-1

box_dimensioner_multicam sample: Fix an incorrect IR image being returned from DeviceManager
IntelRealSense · Nov 28, 2018 · 46e6aa8 · 46e6aa8
2 parents e82dc15 + 5170fe8
commit 46e6aa8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/COPYING → NOTICE b/COPYING → NOTICE
diff --git a/wrappers/labview/readme.md b/wrappers/labview/readme.md
@@ -80,4 +80,10 @@ So now you are streaming data. To grab data you call the Capture VI inside a loo
 Note that frames can arrive asynchronously. You can query their time stamp or counters to align them, or just grab the nearest frames in time.     
 
 
-Finally, it is VERY important that you use the Release Frame VI to release each frame when it is no longer needed, or you will very quickly stop streaming. Also, be sure to CLOSE everything properly, or you will have problems streaming the next time, and LabVIEW may crash.   
+Finally, it is VERY important that you use the Release Frame VI to release each frame when it is no longer needed, or you will very quickly stop streaming. Also, be sure to CLOSE everything properly, or you will have problems streaming the next time, and LabVIEW may crash. 
+
+
+-------------------
+
+
+> **Note**: If you are looking for a different way to modify DLL file location, please refer to [#1947](https://github.com/IntelRealSense/librealsense/issues/1947) and consider trying   [github.com/ryannazaretian/librealsense/tree/master/wrappers/labview](https://github.com/ryannazaretian/librealsense/tree/master/wrappers/labview) as a possible solution. 
diff --git a/wrappers/python/examples/box_dimensioner_multicam/realsense_device_manager.py b/wrappers/python/examples/box_dimensioner_multicam/realsense_device_manager.py
@@ -213,10 +213,11 @@ def poll_frames(self):
                 frames[serial] = {}
                 for stream in streams:
                     if (rs.stream.infrared == stream.stream_type()):
+                        frame = frameset.get_infrared_frame(stream.stream_index())
                         key_ = (stream.stream_type(), stream.stream_index())
                     else:
+                        frame = frameset.first_or_default(stream.stream_type())
                         key_ = stream.stream_type()
-                    frame = frameset.first_or_default(stream.stream_type())
                     frames[serial][key_] = frame
 
         return frames