Merge branch 'dev'

Author: hihozhou

opencv.cc

@@ -238,6 +238,7 @@ const zend_function_entry opencv_functions[] = {
     ZEND_NS_NAMED_FE(OPENCV_NS, getTickFrequency, ZEND_FN(opencv_get_tick_frequency), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, floodFill, ZEND_FN(opencv_flood_fill), opencv_flood_fill_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, setMouseCallback, ZEND_FN(opencv_set_mouse_callback), NULL)
+    ZEND_NS_NAMED_FE(OPENCV_NS, adaptiveThreshold, ZEND_FN(opencv_adaptive_threshold), opencv_adaptive_threshold_arginfo)
 	PHP_FE_END	/* Must be the last line in opencv_functions[] */
 };
 /* }}} */

source/opencv2/core/opencv_mat.cc

@@ -578,6 +578,64 @@ PHP_METHOD(opencv_mat, set_to)
 
 }
 
+/**
+ * CV\Mat::add()
+ * @param execute_data
+ * @param return_value
+ */
+PHP_METHOD(opencv_mat, add)
+{
+    zval *value1_zval, *value2_zval;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO",
+                              &value1_zval, opencv_mat_ce,
+                              &value2_zval, opencv_mat_ce
+    ) == FAILURE) {
+        RETURN_NULL();
+    }
+
+    opencv_mat_object *value1_obj = Z_PHP_MAT_OBJ_P(value1_zval);
+    opencv_mat_object *value2_obj = Z_PHP_MAT_OBJ_P(value2_zval);
+    zval instance;
+    object_init_ex(&instance, opencv_mat_ce);
+    opencv_mat_object *obj = Z_PHP_MAT_OBJ_P(&instance);
+
+    Mat im = *value1_obj->mat + *value2_obj->mat;
+
+    obj->mat=new Mat(im);
+    //update php Mat object property
+    opencv_mat_update_property_by_c_mat(&instance, obj->mat);
+
+    RETURN_ZVAL(&instance,0,0); //return php Mat object
+}
+
+PHP_METHOD(opencv_mat, subtract)
+{
+    zval *value1_zval, *value2_zval;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO",
+                              &value1_zval, opencv_mat_ce,
+                              &value2_zval, opencv_mat_ce
+    ) == FAILURE) {
+        RETURN_NULL();
+    }
+
+    opencv_mat_object *value1_obj = Z_PHP_MAT_OBJ_P(value1_zval);
+    opencv_mat_object *value2_obj = Z_PHP_MAT_OBJ_P(value2_zval);
+    zval instance;
+    object_init_ex(&instance, opencv_mat_ce);
+    opencv_mat_object *obj = Z_PHP_MAT_OBJ_P(&instance);
+
+    Mat im = *value1_obj->mat - *value2_obj->mat;
+
+    obj->mat=new Mat(im);
+    //update php Mat object property
+    opencv_mat_update_property_by_c_mat(&instance, obj->mat);
+
+    RETURN_ZVAL(&instance,0,0); //return php Mat object
+}
+
+
 /**
  * opencv_mat_methods[]
  */
@@ -604,6 +662,8 @@ const zend_function_entry opencv_mat_methods[] = {
         PHP_ME(opencv_mat, plus, NULL, ZEND_ACC_PUBLIC)
         PHP_ME(opencv_mat, divide, NULL, ZEND_ACC_PUBLIC)
         PHP_MALIAS(opencv_mat, setTo ,set_to, NULL, ZEND_ACC_PUBLIC)
+        PHP_ME(opencv_mat, add , NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+        PHP_ME(opencv_mat, subtract , NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
         PHP_FE_END
 };
 /* }}} */

source/opencv2/opencv_imgproc.cc

@@ -30,6 +30,7 @@ void opencv_imgproc_init(int module_number)
     opencv_morph_types_init(module_number);
     opencv_flood_fill_flags_init(module_number);
     opencv_threshold_types_init(module_number);
+    opencv_adaptive_threshold_types_init(module_number);
 }
 
 /**
@@ -681,6 +682,42 @@ PHP_FUNCTION(opencv_threshold){
     RETURN_DOUBLE(threshold(*src_object->mat, *dst_object->mat, thresh, maxval, (int)type));
 }
 
+
+
+PHP_FUNCTION(opencv_adaptive_threshold){
+
+    zval *src_zval, *dst_zval;
+    double maxValue, C;
+    long adaptiveMethod, thresholdType, blockSize;
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ozdllld",
+                              &src_zval, opencv_mat_ce,
+                              &dst_zval,
+                              &maxValue, &adaptiveMethod,
+                              &thresholdType, &blockSize, &C) == FAILURE) {
+        RETURN_NULL();
+    }
+
+    opencv_mat_object *src_object, *dst_object;
+
+    src_object = Z_PHP_MAT_OBJ_P(src_zval);
+    zval *dst_real_zval = Z_REFVAL_P(dst_zval);
+    if(Z_TYPE_P(dst_real_zval) == IS_OBJECT && Z_OBJCE_P(dst_real_zval) == opencv_mat_ce){
+        dst_object = Z_PHP_MAT_OBJ_P(dst_real_zval);
+    } else{
+        zval_ptr_dtor(dst_real_zval);
+        zval instance;
+        Mat dst;
+        object_init_ex(&instance,opencv_mat_ce);
+        ZVAL_COPY_VALUE(dst_real_zval, &instance);
+        dst_object = Z_PHP_MAT_OBJ_P(dst_real_zval);
+        dst_object->mat = new Mat(dst);
+    }
+
+    adaptiveThreshold(*src_object->mat, *dst_object->mat, maxValue, (int)adaptiveMethod, (int)thresholdType, (int)blockSize, C);
+    RETURN_NULL();
+}
+
+
 /**
  * CV\sobel
  * @param execute_data
@@ -1347,4 +1384,10 @@ void opencv_threshold_types_init(int module_number){
     REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "THRESH_MASK", THRESH_MASK, CONST_CS | CONST_PERSISTENT);
     REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "THRESH_OTSU", THRESH_OTSU, CONST_CS | CONST_PERSISTENT);
     REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "THRESH_TRIANGLE", THRESH_TRIANGLE, CONST_CS | CONST_PERSISTENT);
-}
+}
+
+//AdaptiveThresholdTypes
+void opencv_adaptive_threshold_types_init(int module_number){
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "ADAPTIVE_THRESH_MEAN_C", ADAPTIVE_THRESH_MEAN_C, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "ADAPTIVE_THRESH_GAUSSIAN_C", ADAPTIVE_THRESH_GAUSSIAN_C, CONST_CS | CONST_PERSISTENT);
+}

source/opencv2/opencv_imgproc.h

@@ -24,6 +24,7 @@ void opencv_morph_shapes_init(int module_number);
 void opencv_morph_types_init(int module_number);
 void opencv_flood_fill_flags_init(int module_number);
 void opencv_threshold_types_init(int module_number);
+void opencv_adaptive_threshold_types_init(int module_number);
 
 PHP_FUNCTION(opencv_cv_t_color);
 PHP_FUNCTION(opencv_ellipse);
@@ -187,6 +188,17 @@ ZEND_BEGIN_ARG_INFO_EX(opencv_threshold_arginfo, 0, 0, 5)
 ZEND_END_ARG_INFO()
 PHP_FUNCTION(opencv_threshold);
 
+ZEND_BEGIN_ARG_INFO_EX(opencv_adaptive_threshold_arginfo, 0, 0, 7)
+                ZEND_ARG_INFO(0, src)
+                ZEND_ARG_INFO(1, dst)
+                ZEND_ARG_INFO(0, maxValue)
+                ZEND_ARG_INFO(0, adaptiveMethod)
+                ZEND_ARG_INFO(0, thresholdType)
+                ZEND_ARG_INFO(0, blockSize)
+                ZEND_ARG_INFO(0, C)
+ZEND_END_ARG_INFO()
+PHP_FUNCTION(opencv_adaptive_threshold);
+
 ZEND_BEGIN_ARG_INFO_EX(opencv_morphology_ex_arginfo, 0, 0, 8)
                 ZEND_ARG_INFO(0, src)
                 ZEND_ARG_INFO(1, dst)