Merge pull request #294 from laborer2008/master

Various small fixes

Author: floe

examples/protonect/src/cpu_depth_packet_processor.cpp

@@ -44,7 +44,7 @@ namespace libfreenect2
 
 bool loadBufferFromFile2(const std::string& filename, unsigned char *buffer, size_t n)
 {
-  bool success = true;
+  bool success;
   std::ifstream in(filename.c_str());
 
   in.read(reinterpret_cast<char*>(buffer), n);

examples/protonect/src/opencl_depth_packet_processor.cpp

@@ -348,7 +348,7 @@ class OpenCLDepthPacketProcessorImpl
     catch(const cl::Error &err)
     {
       std::cerr << OUT_NAME("init") "ERROR: " << err.what() << "(" << err.err() << ")" << std::endl;
-      throw err;
+      throw;
     }
     return true;
   }
@@ -462,7 +462,7 @@ class OpenCLDepthPacketProcessorImpl
         std::cout << OUT_NAME("init") "Build Log:\t " << program.getBuildInfo<CL_PROGRAM_BUILD_LOG>(device) << std::endl;
       }
 
-      throw err;
+      throw;
     }
     programInitialized = true;
     return true;
@@ -507,8 +507,7 @@ class OpenCLDepthPacketProcessorImpl
     catch(const cl::Error &err)
     {
       std::cerr << OUT_NAME("run") "ERROR: " << err.what() << " (" << err.err() << ")" << std::endl;
-      throw err;
-      return;
+      throw;
     }
   }
 

examples/protonect/src/registration.cpp

@@ -87,7 +87,7 @@ void Registration::apply( int dx, int dy, float dz, float& cx, float &cy) const
 void Registration::apply(const Frame *rgb, const Frame *depth, Frame *undistorted, Frame *registered, const bool enable_filter) const
 {
   // Check if all frames are valid and have the correct size
-  if (!undistorted || !rgb || !registered ||
+  if (!rgb || !depth || !undistorted || !registered ||
       rgb->width != 1920 || rgb->height != 1080 || rgb->bytes_per_pixel != 4 ||
       depth->width != 512 || depth->height != 424 || depth->bytes_per_pixel != 4 ||
       undistorted->width != 512 || undistorted->height != 424 || undistorted->bytes_per_pixel != 4 ||