Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Include directory for libusb-1.0 in the main cmakelists.txt

Fixed a typo for sync rgb getting
Fixed a typo in sync_get_rgb that made it use depth data instead of  rgb

Signed-off-by: Andrew Miller <amiller@dappervision.com>
  • Loading branch information...
commit 3ea69a0686833427ab289461647a8994c2d1263e 1 parent 16a4b50
Andrew Miller amiller authored qdot committed
3  CMakeLists.txt
@@ -86,6 +86,9 @@ SET(DOC_OUTPUT_PATH ${CMAKE_BINARY_DIR}/doc)
86 86 # Pretty much everyone is going to need the main includes
87 87 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
88 88
  89 +# libfreenect.h includes libusb.h, so everyone needs this too
  90 +include_directories(${LIBUSB_1_INCLUDE_DIRS})
  91 +
89 92 # Add library project
90 93 add_subdirectory (src)
91 94
2  wrappers/c_sync/libfreenect_sync.c
@@ -95,7 +95,7 @@ int freenect_sync_get_depth(char **depth, uint32_t *timestamp) {
95 95 return 0;
96 96 }
97 97
98   -int freenect_sync_rgb_depth(char **rgb, uint32_t *timestamp) {
  98 +int freenect_sync_get_rgb(char **rgb, uint32_t *timestamp) {
99 99 *rgb = malloc(FREENECT_RGB_SIZE);
100 100 if (!thread_running)
101 101 init_thread();
2  wrappers/python/freenect.pyx
@@ -265,7 +265,7 @@ def sync_get_rgb():
265 265 """
266 266 cdef char* rgb
267 267 cdef unsigned int timestamp
268   - out = freenect_sync_get_depth(&rgb, &timestamp)
  268 + out = freenect_sync_get_rgb(&rgb, &timestamp)
269 269 if out:
270 270 return
271 271 rgb_str = PyString_FromStringAndSize(rgb, RGB_BYTES)

0 comments on commit 3ea69a0

Please sign in to comment.
Something went wrong with that request. Please try again.