base文件支持window

Author: hihozhou

config.w32

@@ -17,9 +17,15 @@ if (PHP_OPENCV != "no") {
     CHECK_LIB("opencv_world400d.lib;opencv_world400.lib", "opencv","D:\\opencv\\build\\x64\\vc15\\lib");
     CHECK_HEADER_ADD_INCLUDE("opencv2/opencv.hpp", "CFLAGS_OPENCV", "D:\\opencv\\build\\include");
 
-    EXTENSION("opencv", "opencv.cc opencv_exception.cc source/opencv2/core/hal/opencv_interface.cc","yes");
+    opencv_source_file="opencv.cc \
+                opencv_exception.cc \
+                source/opencv2/core/hal/opencv_interface.cc \
+                source/opencv2/core/opencv_base.cc"
 
-    //ADD_SOURCES(configure_module_dirname + "/source/opencv2/core/hal","opencv_interface.cc");
+    EXTENSION("opencv", opencv_source_file,"yes");
+
+    //ADD_SOURCES(configure_module_dirname + "/source/opencv2/core/hal","opencv_interface.cc","opencv");
+    //ADD_SOURCES(configure_module_dirname + "/source/opencv2/core","opencv_base.cc opencv_cvdef.cc","opencv");
     //ADD_SOURCES(configure_module_dirname + "/source/opencv2/core","opencv_base.cc opencv_cvdef.cc opencv_mat.cc opencv_persistence.cc \
     //opencv_type.cc opencv_utility.cc");
     //ADD_SOURCES(configure_module_dirname + "/source/opencv2/face","opencv_facerec.cc");

opencv.cc

@@ -37,7 +37,7 @@ extern "C" {
 #include "source/opencv2/core/hal/opencv_interface.h"
 #include "opencv_exception.h"
 //#include "source/opencv2/opencv_core.h"
-//#include "source/opencv2/core/opencv_base.h"
+#include "source/opencv2/core/opencv_base.h"
 //#include "source/opencv2/core/opencv_persistence.h"
 //#include "source/opencv2/opencv_objdetect.h"
 //#include "source/opencv2/opencv_videoio.h"
@@ -142,7 +142,7 @@ PHP_MINIT_FUNCTION(opencv)
 //    opencv_type_init(module_number);
 //    opencv_imgproc_init(module_number);
 //	opencv_core_init(module_number);
-//    opencv_border_types_init(module_number);
+    opencv_border_types_init(module_number);
 //	opencv_file_storage_init(module_number);
 //	opencv_objdetect_init(module_number);
 //	opencv_videoio_init(module_number);

source/opencv2/core/opencv_base.cc

@@ -16,20 +16,22 @@
 
 #include "../../../php_opencv.h"
 #include "opencv_base.h"
-
+#include <opencv2/core/base.hpp>
+using namespace cv;
 
 
 void opencv_border_types_init(int module_number){
     //! Various border types, image boundaries are denoted with `|`
     //! @see borderInterpolate, copyMakeBorde
-    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_CONSTANT", BORDER_CONSTANT, CONST_CS | CONST_PERSISTENT);
-    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_REPLICATE", BORDER_REPLICATE, CONST_CS | CONST_PERSISTENT);
-    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_REFLECT", BORDER_REFLECT, CONST_CS | CONST_PERSISTENT);
-    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_WRAP", BORDER_WRAP, CONST_CS | CONST_PERSISTENT);
-    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_REFLECT_101", BORDER_REFLECT_101, CONST_CS | CONST_PERSISTENT);
-    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_TRANSPARENT", BORDER_TRANSPARENT, CONST_CS | CONST_PERSISTENT);
 
-    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_REFLECT101", BORDER_REFLECT101, CONST_CS | CONST_PERSISTENT);
-    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_DEFAULT", BORDER_DEFAULT, CONST_CS | CONST_PERSISTENT);
-    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_ISOLATED", BORDER_ISOLATED, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_CONSTANT", BorderTypes::BORDER_CONSTANT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_REPLICATE", BorderTypes::BORDER_REPLICATE, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_REFLECT", BorderTypes::BORDER_REFLECT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_WRAP", BorderTypes::BORDER_WRAP, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_REFLECT_101", BorderTypes::BORDER_REFLECT_101, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_TRANSPARENT", BorderTypes::BORDER_TRANSPARENT, CONST_CS | CONST_PERSISTENT);
+
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_REFLECT101", BorderTypes::BORDER_REFLECT101, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_DEFAULT", BorderTypes::BORDER_DEFAULT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "BORDER_ISOLATED", BorderTypes::BORDER_ISOLATED, CONST_CS | CONST_PERSISTENT);
 }

source/opencv2/core/opencv_base.h

@@ -17,5 +17,5 @@
 #ifndef PHP_OPENCV_BASE_H
 #define PHP_OPENCV_BASE_H
 
-void opencv_border_types_init(int module_number);
+extern void opencv_border_types_init(int module_number);
 #endif //OPENCV_BASE_H