Follow-up on IntelRealSense#1658

(cherry picked from commit e7fc8dc3270c11816adf669be4eabb30046d9a4d)
dorodnic · May 8, 2018 · f45a99e · f45a99e
1 parent 29cab27
commit f45a99e
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/include/librealsense2/hpp/rs_processing.hpp b/include/librealsense2/hpp/rs_processing.hpp
@@ -224,7 +224,10 @@ namespace rs2
         points calculate(frame depth)
         {
             _block->invoke(std::move(depth));
-            return _queue.wait_for_frame();
+            rs2::frame f;
+            if (!_queue.poll_for_frame(&f))
+                throw std::runtime_error("Error occured during execution of the processing block! See the log for more info");
+            return points(f);
         }
 
         void map_to(frame mapped)
@@ -349,7 +352,8 @@ namespace rs2
         {
             (*_block)(frame);
             rs2::frame f;
-            _queue.poll_for_frame(&f);
+            if (!_queue.poll_for_frame(&f))
+                throw std::runtime_error("Error occured during execution of the processing block! See the log for more info");
             return frameset(f);
         }
 
@@ -387,7 +391,10 @@ namespace rs2
             if(depth)
             {
                 _block->invoke(std::move(depth));
-                return _queue.wait_for_frame();
+                rs2::frame f;
+                if (!_queue.poll_for_frame(&f))
+                    throw std::runtime_error("Error occured during execution of the processing block! See the log for more info");
+                return video_frame(f);
             }
             return depth;
         }
@@ -432,7 +439,8 @@ namespace rs2
         {
             (*_block)(frame);
             rs2::frame f;
-            _queue.poll_for_frame(&f);
+            if (!_queue.poll_for_frame(&f))
+                throw std::runtime_error("Error occured during execution of the processing block! See the log for more info");
             return f;
         }
 
@@ -469,7 +477,8 @@ namespace rs2
         {
             (*_block)(frame);
             rs2::frame f;
-            _queue.poll_for_frame(&f);
+            if (!_queue.poll_for_frame(&f))
+                throw std::runtime_error("Error occured during execution of the processing block! See the log for more info");
             return f;
         }
 
@@ -506,7 +515,8 @@ namespace rs2
         {
             (*_block)(frame);
             rs2::frame f;
-            _queue.poll_for_frame(&f);
+            if (!_queue.poll_for_frame(&f))
+                throw std::runtime_error("Error occured during execution of the processing block! See the log for more info");
             return f;
         }
 
@@ -543,7 +553,8 @@ namespace rs2
         {
             (*_block)(frame);
             rs2::frame f;
-            _queue.poll_for_frame(&f);
+            if (!_queue.poll_for_frame(&f))
+                throw std::runtime_error("Error occured during execution of the processing block! See the log for more info");
             return f;
         }