Merge branch 'master' into win32

2019-05-15 16:47:45 +08:00
parent 0d6aae81b8 f9eab62680
commit c2d2fd9c8a
12 changed files with 253 additions and 77 deletions
--- a/others/include/camera/camera_define.h
+++ b/others/include/camera/camera_define.h
@@ -31,6 +31,7 @@ typedef unsigned char UCHAR;
 #define HMODULE void*


+
 #define TRUE 1
 #define FALSE 0
 //图像查表变换的方式
--- a/others/include/camera/camera_wrapper.h
+++ b/others/include/camera/camera_wrapper.h
@@ -14,7 +14,11 @@
 #include <opencv2/imgproc/imgproc.hpp>

 #include "camera/wrapper_head.h"
-#include "camera/CameraApi.h"
+#ifdef Windows
+    #include "camera/CameraApi.h"
+#elif defined(Linux)
+    #include "camera/camera_api.h"
+#endif

 class CameraWrapper: public WrapperHead {
 private: