Merge pull request #385 from xlz/pr383fixed

Minor bugfixes (logger, freestore handling), closes #383

Author: floe

examples/protonect/CMakeLists.txt

@@ -70,6 +70,9 @@ SET(SOURCES
   include/libfreenect2/usb/event_loop.h
   include/libfreenect2/usb/transfer_pool.h
 
+  include/libfreenect2/logger.h
+  include/libfreenect2/logging.h
+
   include/libfreenect2/async_packet_processor.h  
   include/libfreenect2/depth_packet_processor.h
   include/libfreenect2/depth_packet_stream_parser.h

examples/protonect/src/cpu_depth_packet_processor.cpp

@@ -107,7 +107,7 @@ struct Mat
 
 public:
   /** Default constructor. */
-  Mat()
+  Mat():buffer_(0), buffer_end_(0)
   {
   }
 
@@ -1091,17 +1091,20 @@ void CpuDepthPacketProcessor::process(const DepthPacket &packet)
       }
   }
 
-  if(listener_->onNewFrame(Frame::Ir, impl_->ir_frame))
-  {
-    impl_->newIrFrame();
-  }
+  impl_->stopTiming(LOG_INFO);
 
-  if(listener_->onNewFrame(Frame::Depth, impl_->depth_frame))
-  {
-    impl_->newDepthFrame();
+  if (listener_ != 0 ){
+    if(listener_->onNewFrame(Frame::Ir, impl_->ir_frame))
+    {
+      impl_->newIrFrame();
+    }
+
+    if(listener_->onNewFrame(Frame::Depth, impl_->depth_frame))
+    {
+      impl_->newDepthFrame();
+    }
   }
 
-  impl_->stopTiming(LOG_INFO);
 }
 
 } /* namespace libfreenect2 */

examples/protonect/src/logging.cpp

@@ -256,7 +256,7 @@ void WithPerfLogging::startTiming()
 
 std::ostream &WithPerfLogging::stopTiming(std::ostream &stream)
 {
-  impl_->stop(stream);
+  return impl_->stop(stream);
 }
 
 std::string getShortName(const char *func)

examples/protonect/viewer.h

@@ -3,7 +3,7 @@
 
 #include <libfreenect2/config.h>
 #include <libfreenect2/frame_listener.hpp>
-#include <libfreenect2/logging.h>
+#include <iostream>
 #include <string>
 #include <map>
 
@@ -189,7 +189,7 @@ struct ShaderProgram : public WithOpenGLBindings
         {
             gl()->glGetShaderInfoLog(vertex_shader, sizeof(error_buffer), NULL, error_buffer);
 
-            LOG_ERROR << "failed to compile vertex shader!" << std::endl << error_buffer;
+            std::cerr << "failed to compile vertex shader!" << std::endl << error_buffer << std::endl;
         }
 
         gl()->glCompileShader(fragment_shader);
@@ -199,7 +199,7 @@ struct ShaderProgram : public WithOpenGLBindings
         {
             gl()->glGetShaderInfoLog(fragment_shader, sizeof(error_buffer), NULL, error_buffer);
 
-            LOG_ERROR << "failed to compile fragment shader!" << std::endl << error_buffer;
+            std::cerr << "failed to compile fragment shader!" << std::endl << error_buffer << std::endl;
         }
 
         program = gl()->glCreateProgram();
@@ -213,7 +213,7 @@ struct ShaderProgram : public WithOpenGLBindings
         if (status != GL_TRUE)
         {
             gl()->glGetProgramInfoLog(program, sizeof(error_buffer), NULL, error_buffer);
-            LOG_ERROR << "failed to link shader program!" << std::endl << error_buffer;
+            std::cerr << "failed to link shader program!" << std::endl << error_buffer << std::endl;
         }
     }