Merge pull request #227 from laborer2008/master

Updated error reporting messages

Author: floe

examples/protonect/src/depth_packet_stream_parser.cpp

@@ -93,11 +93,11 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
     {
       if((in_length - in_offset) < sizeof(DepthSubPacketFooter))
       {
-        std::cerr << "[DepthPacketStreamParser::handleNewData] incomplete footer detected!" << std::endl;
+        std::cerr << "[DepthPacketStreamParser::onDataReceived] incomplete footer detected!" << std::endl;
       }
       else if(footer->length > wb.length)
       {
-        std::cerr << "[DepthPacketStreamParser::handleNewData] image data too short!" << std::endl;
+        std::cerr << "[DepthPacketStreamParser::onDataReceived] image data too short!" << std::endl;
       }
       else
       {
@@ -123,7 +123,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
           }
           else
           {
-            std::cerr << "[DepthPacketStreamParser::handleNewData] not all subsequences received " << current_subsequence_ << std::endl;
+            std::cerr << "[DepthPacketStreamParser::onDataReceived] not all subsequences received " << current_subsequence_ << std::endl;
           }
 
           current_sequence_ = footer->sequence;
@@ -137,7 +137,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
 
         if(footer->subsequence * footer->length > fb.length)
         {
-          std::cerr << "[DepthPacketStreamParser::handleNewData] front buffer too short! subsequence number is " << footer->subsequence << std::endl;
+          std::cerr << "[DepthPacketStreamParser::onDataReceived] front buffer too short! subsequence number is " << footer->subsequence << std::endl;
         }
         else
         {
@@ -154,15 +154,15 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
     {
       if((wb.length + 8) >= wb.capacity)
       {
-        std::cerr << "[DepthPacketStreamParser::handleNewData] working buffer full, resetting it!" << std::endl;
+        std::cerr << "[DepthPacketStreamParser::onDataReceived] working buffer full, resetting it!" << std::endl;
         wb.length = 0;
         ptr_out = wb.data;
       }
 
       // copy remaining 8 bytes
       if((in_length - in_offset) != 8)
       {
-        std::cerr << "[DepthPacketStreamParser::handleNewData] remaining data should be 8 bytes, but is " << (in_length - in_offset) << std::endl;
+        std::cerr << "[DepthPacketStreamParser::onDataReceived] remaining data should be 8 bytes, but is " << (in_length - in_offset) << std::endl;
       }
 
       for(; in_offset < in_length; ++in_offset)

examples/protonect/src/opengl_depth_packet_processor.cpp

@@ -95,7 +95,7 @@ std::string loadShaderSource(const std::string& filename)
 
   if(!loadResource(filename, &data, &length))
   {
-    std::cerr << "failed to load shader source!" << std::endl;
+    std::cerr << "[loadShaderSource] failed to load shader source!" << std::endl;
     return "";
   }
 

examples/protonect/src/rgb_packet_stream_parser.cpp

@@ -70,7 +70,7 @@ void RgbPacketStreamParser::onDataReceived(unsigned char* buffer, size_t length)
     }
     else
     {
-      std::cerr << "[RgbPacketStreamParser::handleNewData] buffer overflow!" << std::endl;
+      std::cerr << "[RgbPacketStreamParser::onDataReceived] buffer overflow!" << std::endl;
     }
 
     // not full transfer buffer and we already have some data -> signals end of rgb image packet
@@ -94,7 +94,7 @@ void RgbPacketStreamParser::onDataReceived(unsigned char* buffer, size_t length)
       }
       else
       {
-        std::cerr << "[RgbPacketStreamParser::handleNewData] skipping rgb packet!" << std::endl;
+        std::cerr << "[RgbPacketStreamParser::onDataReceived] skipping rgb packet!" << std::endl;
       }
 
       // reset front buffer

examples/protonect/src/turbo_jpeg_rgb_packet_processor.cpp

@@ -50,7 +50,7 @@ class TurboJpegRgbPacketProcessorImpl
     decompressor = tjInitDecompress();
     if(decompressor == 0)
     {
-      std::cerr << "[TurboJpegRgbPacketProcessor] Failed to initialize TurboJPEG decompressor! TurboJPEG error: '" << tjGetErrorStr() << "'" << std::endl;
+      std::cerr << "[TurboJpegRgbPacketProcessorImpl] Failed to initialize TurboJPEG decompressor! TurboJPEG error: '" << tjGetErrorStr() << "'" << std::endl;
     }
 
     newFrame();
@@ -66,7 +66,7 @@ class TurboJpegRgbPacketProcessorImpl
     {
       if(tjDestroy(decompressor) == -1)
       {
-        std::cerr << "[TurboJpegRgbPacketProcessor] Failed to destroy TurboJPEG decompressor! TurboJPEG error: '" << tjGetErrorStr() << "'" << std::endl;
+        std::cerr << "[~TurboJpegRgbPacketProcessorImpl] Failed to destroy TurboJPEG decompressor! TurboJPEG error: '" << tjGetErrorStr() << "'" << std::endl;
       }
     }
   }