Merge branch 'dev'

Author: hihozhou

opencv.cc

@@ -222,6 +222,7 @@ const zend_function_entry opencv_functions[] = {
     ZEND_NS_NAMED_FE(OPENCV_NS, bilateralFilter, ZEND_FN(opencv_bilateral_filter), opencv_bilateral_filter_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, dilate, ZEND_FN(opencv_dilate), opencv_dilate_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, erode, ZEND_FN(opencv_erode), opencv_erode_arginfo)
+    ZEND_NS_NAMED_FE(OPENCV_NS, threshold, ZEND_FN(opencv_threshold), opencv_threshold_arginfo)
 	PHP_FE_END	/* Must be the last line in opencv_functions[] */
 };
 /* }}} */

source/opencv2/opencv_imgproc.cc

@@ -125,7 +125,7 @@ PHP_FUNCTION(opencv_circle){
  */
 PHP_FUNCTION(opencv_fill_poly){
 
-    long ncontours = 1, lineType = LINE_8, shift = 0;
+    long lineType = LINE_8, shift = 0;
     zval *img_zval, *color_zval, *offset_point_zval = NULL;
     zval *points_zval;
     opencv_point_object *offset_object;
@@ -138,6 +138,7 @@ PHP_FUNCTION(opencv_fill_poly){
         RETURN_NULL();
     }
 
+    long ncontours = 1;
     unsigned long point_count = zend_hash_num_elements(Z_ARRVAL_P(points_zval));
     Point root_points[ncontours][point_count];
     opencv_point_object *point_object;
@@ -157,7 +158,8 @@ PHP_FUNCTION(opencv_fill_poly){
                 }
             }ZEND_HASH_FOREACH_END();
 
-    const Point* pts[ncontours] = {root_points[0]};
+    const Point* pts[ncontours];
+    pts[0] = root_points[0];
     int npts[] = {(int)point_count};
     Point offset;
     zval *offset_point_real_zval;
@@ -638,11 +640,42 @@ PHP_FUNCTION(opencv_erode){
         opencv_scalar_object *border_value_object = Z_PHP_SCALAR_OBJ_P(border_value_zval);
         border_value = *border_value_object->scalar;
     }
-
     erode(*src_object->mat, *dst_object->mat, *kernel_object->mat, anchor, (int)iterations, (int)border_type, border_value);
     RETURN_NULL();
 }
 
+
+PHP_FUNCTION(opencv_threshold){
+
+    zval *src_zval, *dst_zval;
+    double thresh, maxval;
+    long type;
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ozddl",
+                              &src_zval, opencv_mat_ce,
+                              &dst_zval,
+                              &thresh, &maxval,
+                              &type) == 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);
+    }
+    RETURN_DOUBLE(threshold(*src_object->mat, *dst_object->mat, thresh, maxval, (int)type));
+}
+
 /**
  * color conversion code in CV\cvtColor,opencv enum ColorConversionCodes
  * @param module_number

source/opencv2/opencv_imgproc.h

@@ -111,4 +111,13 @@ ZEND_BEGIN_ARG_INFO_EX(opencv_erode_arginfo, 0, 0, 7)
 ZEND_END_ARG_INFO()
 PHP_FUNCTION(opencv_erode);
 
+ZEND_BEGIN_ARG_INFO_EX(opencv_threshold_arginfo, 0, 0, 5)
+                ZEND_ARG_INFO(0, src)
+                ZEND_ARG_INFO(1, dst)
+                ZEND_ARG_INFO(0, thresh)
+                ZEND_ARG_INFO(0, maxval)
+                ZEND_ARG_INFO(0, type)
+ZEND_END_ARG_INFO()
+PHP_FUNCTION(opencv_threshold);
+
 #endif //OPENCV_OPENCV_IMGPROC_H