DecompTypes

Author: hihozhou

opencv.cc

@@ -143,6 +143,7 @@ PHP_MINIT_FUNCTION(opencv)
     opencv_imgproc_init(module_number);
 	opencv_core_init(module_number);
     opencv_border_types_init(module_number);
+	opencv_decomp_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

@@ -35,3 +35,13 @@ void opencv_border_types_init(int module_number){
     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);
 }
+
+void opencv_decomp_types_init(int module_number){
+
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "DECOMP_LU", DecompTypes::DECOMP_LU, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "DECOMP_SVD", DecompTypes::DECOMP_SVD, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "DECOMP_EIG", DecompTypes::DECOMP_EIG, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "DECOMP_CHOLESKY", DecompTypes::DECOMP_CHOLESKY, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "DECOMP_QR", DecompTypes::DECOMP_QR, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "DECOMP_NORMAL", DecompTypes::DECOMP_NORMAL, CONST_CS | CONST_PERSISTENT);
+}

source/opencv2/core/opencv_base.h

@@ -18,4 +18,5 @@
 #define PHP_OPENCV_BASE_H
 
 extern void opencv_border_types_init(int module_number);
+extern void opencv_decomp_types_init(int module_number);
 #endif //OPENCV_BASE_H

source/opencv2/opencv_imgproc.cc

@@ -1512,7 +1512,7 @@ PHP_FUNCTION(opencv_get_perspective_transform){
     ZEND_HASH_FOREACH_END();
 
     try {
-        Mat mat = getPerspectiveTransform(src_points, dst_points);
+        Mat mat = getPerspectiveTransform(src_points, dst_points, (int)solveMethod);
         zval instance;
         object_init_ex(&instance, opencv_mat_ce);
         opencv_mat_object *instance_object = Z_PHP_MAT_OBJ_P(&instance);