Fix up coding style to suppress -Wall warnings

xlz · xlz · commit 2e91125f6219 · 2016-01-07T03:52:45.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,6 +38,9 @@ IF(MSVC)
   # "zero-length array in struct" from libusb.h
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244 /wd4200 /wd4305 /wd4146")
   ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) # no warning for getenv()
+ELSE()
+  # Heed warnings from non-MSVC compilers
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 ENDIF()
 
 IF(ENABLE_CXX11)
diff --git a/examples/viewer.cpp b/examples/viewer.cpp
@@ -6,9 +6,6 @@ Viewer::Viewer() : shader_folder("src/shader/"),
                    win_width(600),
                    win_height(400)
 {
-    // init glfw - if already initialized nothing happens
-    int init = glfwInit();
-
 }
 
 static void glfwErrorCallback(int error, const char* description)
@@ -18,6 +15,9 @@ static void glfwErrorCallback(int error, const char* description)
 
 void Viewer::initialize()
 {
+    // init glfw - if already initialized nothing happens
+    glfwInit();
+
     GLFWerrorfun prev_func = glfwSetErrorCallback(glfwErrorCallback);
     if (prev_func)
       glfwSetErrorCallback(prev_func);
diff --git a/examples/viewer.h b/examples/viewer.h
@@ -67,7 +67,7 @@ struct Texture : public WithOpenGLBindings
     unsigned char *data;
     size_t size;
 
-    Texture() : texture(0), data(0), size(0), bytes_per_pixel(FormatT::BytesPerPixel), height(0), width(0)
+    Texture() : bytes_per_pixel(FormatT::BytesPerPixel), height(0), width(0), texture(0), data(0), size(0)
     {
     }
 
@@ -125,13 +125,13 @@ struct Texture : public WithOpenGLBindings
     {
         typedef unsigned char type;
 
-        int linestep = width * bytes_per_pixel / sizeof(type);
+        size_t linestep = width * bytes_per_pixel / sizeof(type);
 
         type *first_line = reinterpret_cast<type *>(data), *last_line = reinterpret_cast<type *>(data) + (height - 1) * linestep;
 
-        for (int y = 0; y < height / 2; ++y)
+        for (size_t y = 0; y < height / 2; ++y)
         {
-            for (int x = 0; x < linestep; ++x, ++first_line, ++last_line)
+            for (size_t x = 0; x < linestep; ++x, ++first_line, ++last_line)
             {
                 std::swap(*first_line, *last_line);
             }
@@ -271,8 +271,8 @@ class Viewer : WithOpenGLBindings {
     std::map<std::string,libfreenect2::Frame*> frames;
     Texture<F8C4> rgb;
     Texture<F32C1> ir;
-    int win_height;
     int win_width;
+    int win_height;
 public:
     Viewer();
     void initialize();
diff --git a/include/internal/libfreenect2/depth_packet_stream_parser.h b/include/internal/libfreenect2/depth_packet_stream_parser.h
@@ -73,9 +73,9 @@ class DepthPacketStreamParser : public DataCallback
   libfreenect2::DoubleBuffer buffer_;
   libfreenect2::Buffer work_buffer_;
 
+  uint32_t processed_packets_;
   uint32_t current_sequence_;
   uint32_t current_subsequence_;
-  uint32_t processed_packets_;
 };
 
 } /* namespace libfreenect2 */
diff --git a/include/internal/libfreenect2/protocol/response.h b/include/internal/libfreenect2/protocol/response.h
@@ -101,7 +101,7 @@ class FirmwareVersionResponse
     FWSubsystemVersion max;
     std::stringstream version_string;
     // the main blob's index
-    int i = 3;
+    size_t i = 3;
     if (i < versions_.size())
     {
       const FWSubsystemVersion &ver = versions_[i];
diff --git a/src/command_transaction.cpp b/src/command_transaction.cpp
@@ -49,7 +49,7 @@ CommandTransaction::Result::~Result()
 
 void CommandTransaction::Result::allocate(size_t size)
 {
-  if (capacity != size)
+  if ((size_t)capacity != size)
   {
     deallocate();
     data = new unsigned char[size];
@@ -143,7 +143,7 @@ CommandTransaction::ResultCode CommandTransaction::send(const CommandBase& comma
     code = Error;
   }
 
-  if(transferred_bytes != command.size())
+  if((size_t)transferred_bytes != command.size())
   {
     LOG_ERROR << "sent number of bytes differs from expected number! expected: " << command.size() << " got: " << transferred_bytes;
     code = Error;
diff --git a/src/cpu_depth_packet_processor.cpp b/src/cpu_depth_packet_processor.cpp
@@ -617,6 +617,7 @@ class CpuDepthPacketProcessorImpl: public WithPerfLogging
     // if(DISABLE_DISAMBIGUATION)
     if(false)
     {
+#if 0
         //r0.yz = r3.zx + r4.zx // add
         //r0.yz = r5.xz + r0.zy // add
         float phase = m0[0] + m1[0] + m2[0]; // r0.y
@@ -628,6 +629,7 @@ class CpuDepthPacketProcessorImpl: public WithPerfLogging
         //r3.zw = r4.xy // mov
         float tmp3 = m0[2] + m1[2] + m2[2]; // r3.z
         float tmp4 = m0[1] + m1[1] + m2[1]; // r3.w
+#endif
     }
     else
     {
diff --git a/src/libfreenect2.cpp b/src/libfreenect2.cpp
@@ -305,8 +305,8 @@ class Freenect2Impl
   Freenect2Impl(void *usb_context) :
     managed_usb_context_(usb_context == 0),
     usb_context_(reinterpret_cast<libusb_context *>(usb_context)),
-    initialized(false),
-    has_device_enumeration_(false)
+    has_device_enumeration_(false),
+    initialized(false)
   {
 #ifdef __linux__
     if (libusb_get_version()->nano < 10952)
@@ -755,7 +755,7 @@ bool Freenect2DeviceImpl::start()
   for (uint32_t status = 0, last = 0; (status & 1) == 0; last = status)
   {
     command_tx_.execute(ReadStatus0x090000Command(nextCommandSeq()), result);
-    if (result.length < sizeof(uint32_t))
+    if ((size_t)result.length < sizeof(uint32_t))
       continue; //TODO should report error
     status = *reinterpret_cast<const uint32_t *>(result.data);
     if (status != last)
@@ -769,7 +769,7 @@ bool Freenect2DeviceImpl::start()
   usb_control_.setIrInterfaceState(UsbControl::Enabled);
 
   command_tx_.execute(ReadStatus0x090000Command(nextCommandSeq()), result);
-  if (result.length >= sizeof(uint32_t))
+  if ((size_t)result.length >= sizeof(uint32_t))
     LOG_DEBUG << "status 0x090000: " << *reinterpret_cast<const uint32_t *>(result.data);
 
   command_tx_.execute(SetStreamEnabledCommand(nextCommandSeq()), result);
diff --git a/src/opengl_depth_packet_processor.cpp b/src/opengl_depth_packet_processor.cpp
@@ -124,9 +124,9 @@ struct ShaderProgram : public WithOpenGLBindings
 
   ShaderProgram() :
     program(0),
-    is_mesa_checked(false),
     vertex_shader(0),
-    fragment_shader(0)
+    fragment_shader(0),
+    is_mesa_checked(false)
   {
   }
 
@@ -296,7 +296,7 @@ struct Texture : public WithOpenGLBindings
   unsigned char *data;
   size_t size;
 
-  Texture() : texture(0), data(0), size(0), bytes_per_pixel(FormatT::BytesPerPixel), height(0), width(0)
+  Texture() : bytes_per_pixel(FormatT::BytesPerPixel), height(0), width(0), texture(0), data(0), size(0)
   {
   }
 
@@ -314,7 +314,7 @@ struct Texture : public WithOpenGLBindings
 
     GLint max_size;
     glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE, &max_size);
-    if (new_width > max_size || new_height > max_size)
+    if (new_width > (size_t)max_size || new_height > (size_t)max_size)
     {
       LOG_ERROR << "GL_MAX_RECTANGLE_TEXTURE_SIZE is too small: " << max_size;
       exit(-1);
@@ -363,13 +363,13 @@ struct Texture : public WithOpenGLBindings
   {
     typedef unsigned char type;
 
-    int linestep = width * bytes_per_pixel / sizeof(type);
+    size_t linestep = width * bytes_per_pixel / sizeof(type);
 
     type *first_line = reinterpret_cast<type *>(data), *last_line = reinterpret_cast<type *>(data) + (height - 1) * linestep;
 
-    for(int y = 0; y < height / 2; ++y)
+    for(size_t y = 0; y < height / 2; ++y)
     {
-      for(int x = 0; x < linestep; ++x, ++first_line, ++last_line)
+      for(size_t x = 0; x < linestep; ++x, ++first_line, ++last_line)
       {
         std::swap(*first_line, *last_line);
       }
@@ -431,8 +431,8 @@ class OpenGLDepthPacketProcessorImpl : public WithOpenGLBindings, public WithPer
 
   OpenGLDepthPacketProcessorImpl(GLFWwindow *new_opengl_context_ptr, bool debug) :
     opengl_context_ptr(new_opengl_context_ptr),
-    square_vao(0),
     square_vbo(0),
+    square_vao(0),
     stage1_framebuffer(0),
     filter1_framebuffer(0),
     stage2_framebuffer(0),

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,6 @@ Viewer::Viewer() : shader_folder("src/shader/"),`
`6`	`6`	`win_width(600),`
`7`	`7`	`win_height(400)`
`8`	`8`	`{`
`9`		`- // init glfw - if already initialized nothing happens`
`10`		`- int init = glfwInit();`
`11`		`-`
`12`	`9`	`}`
`13`	`10`
`14`	`11`	`static void glfwErrorCallback(int error, const char* description)`
`@@ -18,6 +15,9 @@ static void glfwErrorCallback(int error, const char* description)`
`18`	`15`
`19`	`16`	`void Viewer::initialize()`
`20`	`17`	`{`
	`18`	`+ // init glfw - if already initialized nothing happens`
	`19`	`+ glfwInit();`
	`20`	`+`
`21`	`21`	`GLFWerrorfun prev_func = glfwSetErrorCallback(glfwErrorCallback);`
`22`	`22`	`if (prev_func)`
`23`	`23`	`glfwSetErrorCallback(prev_func);`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ struct Texture : public WithOpenGLBindings`
`67`	`67`	`unsigned char *data;`
`68`	`68`	`size_t size;`
`69`	`69`
`70`		`- Texture() : texture(0), data(0), size(0), bytes_per_pixel(FormatT::BytesPerPixel), height(0), width(0)`
	`70`	`+ Texture() : bytes_per_pixel(FormatT::BytesPerPixel), height(0), width(0), texture(0), data(0), size(0)`
`71`	`71`	`{`
`72`	`72`	`}`
`73`	`73`
`@@ -125,13 +125,13 @@ struct Texture : public WithOpenGLBindings`
`125`	`125`	`{`
`126`	`126`	`typedef unsigned char type;`
`127`	`127`
`128`		`- int linestep = width * bytes_per_pixel / sizeof(type);`
	`128`	`+ size_t linestep = width * bytes_per_pixel / sizeof(type);`
`129`	`129`
`130`	`130`	`type first_line = reinterpret_cast<type >(data), last_line = reinterpret_cast<type >(data) + (height - 1) * linestep;`
`131`	`131`
`132`		`- for (int y = 0; y < height / 2; ++y)`
	`132`	`+ for (size_t y = 0; y < height / 2; ++y)`
`133`	`133`	`{`
`134`		`- for (int x = 0; x < linestep; ++x, ++first_line, ++last_line)`
	`134`	`+ for (size_t x = 0; x < linestep; ++x, ++first_line, ++last_line)`
`135`	`135`	`{`
`136`	`136`	`std::swap(first_line, last_line);`
`137`	`137`	`}`
`@@ -271,8 +271,8 @@ class Viewer : WithOpenGLBindings {`
`271`	`271`	`std::map<std::string,libfreenect2::Frame*> frames;`
`272`	`272`	`Texture<F8C4> rgb;`
`273`	`273`	`Texture<F32C1> ir;`
`274`		`- int win_height;`
`275`	`274`	`int win_width;`
	`275`	`+ int win_height;`
`276`	`276`	`public:`
`277`	`277`	`Viewer();`
`278`	`278`	`void initialize();`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ class FirmwareVersionResponse`
`101`	`101`	`FWSubsystemVersion max;`
`102`	`102`	`std::stringstream version_string;`
`103`	`103`	`// the main blob's index`
`104`		`- int i = 3;`
	`104`	`+ size_t i = 3;`
`105`	`105`	`if (i < versions_.size())`
`106`	`106`	`{`
`107`	`107`	`const FWSubsystemVersion &ver = versions_[i];`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ CommandTransaction::Result::~Result()`
`49`	`49`
`50`	`50`	`void CommandTransaction::Result::allocate(size_t size)`
`51`	`51`	`{`
`52`		`- if (capacity != size)`
	`52`	`+ if ((size_t)capacity != size)`
`53`	`53`	`{`
`54`	`54`	`deallocate();`
`55`	`55`	`data = new unsigned char[size];`
`@@ -143,7 +143,7 @@ CommandTransaction::ResultCode CommandTransaction::send(const CommandBase& comma`
`143`	`143`	`code = Error;`
`144`	`144`	`}`
`145`	`145`
`146`		`- if(transferred_bytes != command.size())`
	`146`	`+ if((size_t)transferred_bytes != command.size())`
`147`	`147`	`{`
`148`	`148`	`LOG_ERROR << "sent number of bytes differs from expected number! expected: " << command.size() << " got: " << transferred_bytes;`
`149`	`149`	`code = Error;`
Original file line number	Diff line number	Diff line change
`@@ -617,6 +617,7 @@ class CpuDepthPacketProcessorImpl: public WithPerfLogging`
`617`	`617`	`// if(DISABLE_DISAMBIGUATION)`
`618`	`618`	`if(false)`
`619`	`619`	`{`
	`620`	`+#if 0`
`620`	`621`	`//r0.yz = r3.zx + r4.zx // add`
`621`	`622`	`//r0.yz = r5.xz + r0.zy // add`
`622`	`623`	`float phase = m0[0] + m1[0] + m2[0]; // r0.y`
`@@ -628,6 +629,7 @@ class CpuDepthPacketProcessorImpl: public WithPerfLogging`
`628`	`629`	`//r3.zw = r4.xy // mov`
`629`	`630`	`float tmp3 = m0[2] + m1[2] + m2[2]; // r3.z`
`630`	`631`	`float tmp4 = m0[1] + m1[1] + m2[1]; // r3.w`
	`632`	`+#endif`
`631`	`633`	`}`
`632`	`634`	`else`
`633`	`635`	`{`
Original file line number	Diff line number	Diff line change
`@@ -124,9 +124,9 @@ struct ShaderProgram : public WithOpenGLBindings`
`124`	`124`
`125`	`125`	`ShaderProgram() :`
`126`	`126`	`program(0),`
`127`		`- is_mesa_checked(false),`
`128`	`127`	`vertex_shader(0),`
`129`		`- fragment_shader(0)`
	`128`	`+ fragment_shader(0),`
	`129`	`+ is_mesa_checked(false)`
`130`	`130`	`{`
`131`	`131`	`}`
`132`	`132`
`@@ -296,7 +296,7 @@ struct Texture : public WithOpenGLBindings`
`296`	`296`	`unsigned char *data;`
`297`	`297`	`size_t size;`
`298`	`298`
`299`		`- Texture() : texture(0), data(0), size(0), bytes_per_pixel(FormatT::BytesPerPixel), height(0), width(0)`
	`299`	`+ Texture() : bytes_per_pixel(FormatT::BytesPerPixel), height(0), width(0), texture(0), data(0), size(0)`
`300`	`300`	`{`
`301`	`301`	`}`
`302`	`302`
`@@ -314,7 +314,7 @@ struct Texture : public WithOpenGLBindings`
`314`	`314`
`315`	`315`	`GLint max_size;`
`316`	`316`	`glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE, &max_size);`
`317`		`- if (new_width > max_size \|\| new_height > max_size)`
	`317`	`+ if (new_width > (size_t)max_size \|\| new_height > (size_t)max_size)`
`318`	`318`	`{`
`319`	`319`	`LOG_ERROR << "GL_MAX_RECTANGLE_TEXTURE_SIZE is too small: " << max_size;`
`320`	`320`	`exit(-1);`
`@@ -363,13 +363,13 @@ struct Texture : public WithOpenGLBindings`
`363`	`363`	`{`
`364`	`364`	`typedef unsigned char type;`
`365`	`365`
`366`		`- int linestep = width * bytes_per_pixel / sizeof(type);`
	`366`	`+ size_t linestep = width * bytes_per_pixel / sizeof(type);`
`367`	`367`
`368`	`368`	`type first_line = reinterpret_cast<type >(data), last_line = reinterpret_cast<type >(data) + (height - 1) * linestep;`
`369`	`369`
`370`		`- for(int y = 0; y < height / 2; ++y)`
	`370`	`+ for(size_t y = 0; y < height / 2; ++y)`
`371`	`371`	`{`
`372`		`- for(int x = 0; x < linestep; ++x, ++first_line, ++last_line)`
	`372`	`+ for(size_t x = 0; x < linestep; ++x, ++first_line, ++last_line)`
`373`	`373`	`{`
`374`	`374`	`std::swap(first_line, last_line);`
`375`	`375`	`}`
`@@ -431,8 +431,8 @@ class OpenGLDepthPacketProcessorImpl : public WithOpenGLBindings, public WithPer`
`431`	`431`
`432`	`432`	`OpenGLDepthPacketProcessorImpl(GLFWwindow *new_opengl_context_ptr, bool debug) :`
`433`	`433`	`opengl_context_ptr(new_opengl_context_ptr),`
`434`		`- square_vao(0),`
`435`	`434`	`square_vbo(0),`
	`435`	`+ square_vao(0),`
`436`	`436`	`stage1_framebuffer(0),`
`437`	`437`	`filter1_framebuffer(0),`
`438`	`438`	`stage2_framebuffer(0),`