diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index b008ea46cb6131387caede64c8630138e12bde80..e7f4f0a51fc4877681c35b736853f0188deff744 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -332,7 +332,7 @@ SOURCES += src/main.cc \ src/ui/map3D/ImageWindowGeode.cc contains(DEPENDENCIES_PRESENT, osg) { - message("Including headers for OpenSceneGraph") + message("Including sources for OpenSceneGraph") # Enable only if OpenSceneGraph is available SOURCES += src/ui/map3D/Q3DWidget.cc @@ -352,7 +352,7 @@ contains(DEPENDENCIES_PRESENT, osgearth) { } contains(DEPENDENCIES_PRESENT, libfreenect) { - message("Including headers for libfreenect") + message("Including sources for libfreenect") # Enable only if libfreenect is available SOURCES += src/input/Freenect.cc diff --git a/src/input/Freenect.cc b/src/input/Freenect.cc index 5c2104c8a7771d90824b2d4fb762a2d283c6c900..a60f094f8600eb7f53eacdb6d13c002338a71132 100644 --- a/src/input/Freenect.cc +++ b/src/input/Freenect.cc @@ -174,8 +174,7 @@ Freenect::FreenectThread::run(void) } void -Freenect::rgbCallback(freenect_device* device, freenect_pixel* rgb, - unsigned int timestamp) +Freenect::rgbCallback(freenect_device* device, freenect_pixel* rgb, uint32_t timestamp) { Freenect* freenect = static_cast(freenect_get_user(device)); @@ -184,8 +183,7 @@ Freenect::rgbCallback(freenect_device* device, freenect_pixel* rgb, } void -Freenect::depthCallback(freenect_device* device, void* depth, - unsigned int timestamp) +Freenect::depthCallback(freenect_device* device, freenect_depth* depth, uint32_t timestamp) { Freenect* freenect = static_cast(freenect_get_user(device)); freenect_depth* data = reinterpret_cast(depth); diff --git a/src/input/Freenect.h b/src/input/Freenect.h index 3d47025d5ad9adb1bf7083a9f7887e55964e5a00..e3e3925c5cfd732419f606343fae38bf6378010c 100644 --- a/src/input/Freenect.h +++ b/src/input/Freenect.h @@ -25,10 +25,8 @@ public: void setTiltAngle(int angle); private: - static void rgbCallback(freenect_device* device, freenect_pixel* rgb, - unsigned int timestamp); - static void depthCallback(freenect_device* device, void* depth, - unsigned int timestamp); + static void rgbCallback(freenect_device* device, freenect_pixel* rgb, uint32_t timestamp); + static void depthCallback(freenect_device* device, freenect_depth* depth, uint32_t timestamp); freenect_context* context; freenect_device* device;