Permalink
Browse files

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...
1 parent 16a4b50 commit 3ea69a0686833427ab289461647a8994c2d1263e @amiller amiller committed with qdot Nov 26, 2010
Showing with 5 additions and 2 deletions.
  1. +3 −0 CMakeLists.txt
  2. +1 −1 wrappers/c_sync/libfreenect_sync.c
  3. +1 −1 wrappers/python/freenect.pyx
View
@@ -86,6 +86,9 @@ SET(DOC_OUTPUT_PATH ${CMAKE_BINARY_DIR}/doc)
# Pretty much everyone is going to need the main includes
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
+# libfreenect.h includes libusb.h, so everyone needs this too
+include_directories(${LIBUSB_1_INCLUDE_DIRS})
+
# Add library project
add_subdirectory (src)
@@ -95,7 +95,7 @@ int freenect_sync_get_depth(char **depth, uint32_t *timestamp) {
return 0;
}
-int freenect_sync_rgb_depth(char **rgb, uint32_t *timestamp) {
+int freenect_sync_get_rgb(char **rgb, uint32_t *timestamp) {
*rgb = malloc(FREENECT_RGB_SIZE);
if (!thread_running)
init_thread();
@@ -265,7 +265,7 @@ def sync_get_rgb():
"""
cdef char* rgb
cdef unsigned int timestamp
- out = freenect_sync_get_depth(&rgb, &timestamp)
+ out = freenect_sync_get_rgb(&rgb, &timestamp)
if out:
return
rgb_str = PyString_FromStringAndSize(rgb, RGB_BYTES)

0 comments on commit 3ea69a0

Please sign in to comment.