937f2cc1d5
Fix bogus obsoletes (rhbz#1537213) Update udev rule to allow device access to "video" group
67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
From 9e98a0b11fddeabab6ef5e0915b96c950597e53e Mon Sep 17 00:00:00 2001
|
|
From: Rich Mattes <richmattes@gmail.com>
|
|
Date: Sat, 26 May 2018 16:11:11 -0400
|
|
Subject: [PATCH 1/2] Build libfreenect_cv and cvdemo as C++ sources
|
|
|
|
Signed-off-by: Rich Mattes <richmattes@gmail.com>
|
|
---
|
|
wrappers/opencv/CMakeLists.txt | 4 ++--
|
|
wrappers/opencv/{cvdemo.c => cvdemo.cpp} | 0
|
|
wrappers/opencv/{libfreenect_cv.c => libfreenect_cv.cpp} | 0
|
|
wrappers/opencv/libfreenect_cv.h | 4 ++--
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
rename wrappers/opencv/{cvdemo.c => cvdemo.cpp} (100%)
|
|
rename wrappers/opencv/{libfreenect_cv.c => libfreenect_cv.cpp} (100%)
|
|
|
|
diff --git a/wrappers/opencv/CMakeLists.txt b/wrappers/opencv/CMakeLists.txt
|
|
index 0239075..bc5df19 100644
|
|
--- a/wrappers/opencv/CMakeLists.txt
|
|
+++ b/wrappers/opencv/CMakeLists.txt
|
|
@@ -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})
|
|
@@ -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)
|
|
diff --git a/wrappers/opencv/cvdemo.c b/wrappers/opencv/cvdemo.cpp
|
|
similarity index 100%
|
|
rename from wrappers/opencv/cvdemo.c
|
|
rename to wrappers/opencv/cvdemo.cpp
|
|
diff --git a/wrappers/opencv/libfreenect_cv.c b/wrappers/opencv/libfreenect_cv.cpp
|
|
similarity index 100%
|
|
rename from wrappers/opencv/libfreenect_cv.c
|
|
rename to wrappers/opencv/libfreenect_cv.cpp
|
|
diff --git a/wrappers/opencv/libfreenect_cv.h b/wrappers/opencv/libfreenect_cv.h
|
|
index b73b60c..55e3582 100644
|
|
--- a/wrappers/opencv/libfreenect_cv.h
|
|
+++ b/wrappers/opencv/libfreenect_cv.h
|
|
@@ -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);
|
|
|
|
--
|
|
2.17.0
|
|
|