Skip to content

Opencv cpp api #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
piedar merged 2 commits into from
May 26, 2018
Merged

Opencv cpp api #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e98a0b
Build libfreenect_cv and cvdemo as C++ sources
richmattes May 26, 2018
db0e182
Fix bugs in sync library error handling
richmattes May 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/usb_libusb10.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
}

if (res < 0 || camera == NULL) {
res = -1;
goto failure;
}

Expand Down
2 changes: 1 addition & 1 deletion wrappers/c_sync/libfreenect_sync.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ static int change_depth_format(sync_kinect_t *kinect, freenect_resolution res, f
static sync_kinect_t *alloc_kinect(int index)
{
sync_kinect_t *kinect = (sync_kinect_t*)malloc(sizeof(sync_kinect_t));
if (freenect_open_device(ctx, &kinect->dev, index)) {
if (freenect_open_device(ctx, &kinect->dev, index) < 0) {
free(kinect);
return NULL;
}
Expand Down
4 changes: 2 additions & 2 deletions wrappers/opencv/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# OpenCV Interface
######################################################################################
find_package(OpenCV REQUIRED)
add_library (freenect_cv SHARED libfreenect_cv.c)
add_library (freenect_cv SHARED libfreenect_cv.cpp)
set_target_properties (freenect_cv PROPERTIES
VERSION ${PROJECT_VER}
SOVERSION ${PROJECT_APIVER})
Expand All @@ -16,7 +16,7 @@ install (TARGETS freenect_cv
install (FILES "libfreenect_cv.h"
DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})

add_executable(freenect-cvdemo cvdemo.c)
add_executable(freenect-cvdemo cvdemo.cpp)
target_link_libraries(freenect-cvdemo freenect freenect_sync freenect_cv ${OpenCV_LIBS})
install (TARGETS freenect-cvdemo
DESTINATION bin)
0 wrappers/opencv/cvdemo.c → wrappers/opencv/cvdemo.cpp
View file
Open in desktop
File renamed without changes.
0 wrappers/opencv/libfreenect_cv.c → wrappers/opencv/libfreenect_cv.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions wrappers/opencv/libfreenect_cv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma once

#include <opencv/cv.h>

#ifdef __cplusplus
extern "C" {
#endif

#include <opencv/cv.h>

IplImage *freenect_sync_get_depth_cv(int index);
IplImage *freenect_sync_get_rgb_cv(int index);

Expand Down