Merge branch 'master' of https://github.com/hihozhou/php-opencv

Author: MaleicAcid

README.md

@@ -139,7 +139,10 @@ result:
 - 19.Videostab
 
 
-    
+## Contributors
+
+[@hihozhou](https://github.com/hihozhou)  
+[@MaleicAcid](https://github.com/MaleicAcid)
 
 ## 感谢
 

opencv.cc

@@ -220,6 +220,8 @@ const zend_function_entry opencv_functions[] = {
     ZEND_NS_NAMED_FE(OPENCV_NS, GaussianBlur, ZEND_FN(opencv_gaussian_blur), opencv_gaussian_blur_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, medianBlur, ZEND_FN(opencv_median_blur), opencv_median_blur_arginfo)
     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)
 	PHP_FE_END	/* Must be the last line in opencv_functions[] */
 };
 /* }}} */

source/opencv2/opencv_imgproc.cc

@@ -119,28 +119,28 @@ PHP_FUNCTION(opencv_circle){
 }
 
 /**
+ * todo 传入二维数组
  * CV\fillPoly
  * @param execute_data
  * @param return_value
  */
 PHP_FUNCTION(opencv_fill_poly){
 
-    //define parameters
-    long ncontours, lineType = LINE_8, shift = 0;
+    long ncontours = 1, lineType = LINE_8, shift = 0;
     zval *img_zval, *color_zval, *offset_point_zval = NULL;
     zval *points_zval;
     opencv_point_object *offset_object;
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "OalO|llz",
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "OaO|llz",
                               &img_zval, opencv_mat_ce,
-                              &points_zval, &ncontours,
+                              &points_zval,
                               &color_zval, opencv_scalar_ce,
                               &lineType, &shift,
                               &offset_point_zval) == FAILURE) {
         RETURN_NULL();
     }
 
     unsigned long point_count = zend_hash_num_elements(Z_ARRVAL_P(points_zval));
-    Point root_points[1][point_count];
+    Point root_points[ncontours][point_count];
     opencv_point_object *point_object;
     zend_ulong _h;
     zval *array_val_zval;
@@ -158,7 +158,7 @@ PHP_FUNCTION(opencv_fill_poly){
                 }
             }ZEND_HASH_FOREACH_END();
 
-    const Point* pts[1] = {root_points[0]};
+    const Point* pts[ncontours] = {root_points[0]};
     int npts[] = {(int)point_count};
     Point offset;
     zval *offset_point_real_zval;
@@ -548,6 +548,102 @@ PHP_FUNCTION(opencv_bilateral_filter){
 }
 
 
+PHP_FUNCTION(opencv_dilate){
+    zval *src_zval, *dst_zval, *kernel_zval, *anchor_zval = NULL, *border_value_zval = NULL;
+    long iterations = 1, border_type = BORDER_CONSTANT;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "OzO|OllO",
+                              &src_zval, opencv_mat_ce,
+                              &dst_zval,
+                              &kernel_zval, opencv_mat_ce,
+                              &anchor_zval, opencv_point_ce,
+                              &iterations, &border_type,
+                              &border_value_zval, opencv_scalar_ce) == FAILURE) {
+        RETURN_NULL();
+    }
+    opencv_mat_object *src_object, *dst_object, *kernel_object;
+    Point anchor = Point(-1,-1);
+    Scalar border_value = morphologyDefaultBorderValue();
+
+    src_object = Z_PHP_MAT_OBJ_P(src_zval);
+    kernel_object = Z_PHP_MAT_OBJ_P(kernel_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);
+    }
+
+    if(anchor_zval != NULL){
+        opencv_point_object *anchor_object = Z_PHP_POINT_OBJ_P(anchor_zval);
+        anchor = *anchor_object->point;
+    }
+
+    if(border_value_zval != NULL){
+        opencv_scalar_object *border_value_object = Z_PHP_SCALAR_OBJ_P(border_value_zval);
+        border_value = *border_value_object->scalar;
+    }
+
+    dilate(*src_object->mat, *dst_object->mat, *kernel_object->mat, anchor, (int)iterations, (int)border_type, border_value);
+    RETURN_NULL();
+
+}
+
+PHP_FUNCTION(opencv_erode){
+
+    zval *src_zval, *dst_zval, *kernel_zval, *anchor_zval = NULL, *border_value_zval = NULL;
+    long iterations = 1, border_type = BORDER_CONSTANT;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "OzO|OllO",
+                              &src_zval, opencv_mat_ce,
+                              &dst_zval,
+                              &kernel_zval, opencv_mat_ce,
+                              &anchor_zval, opencv_point_ce,
+                              &iterations, &border_type,
+                              &border_value_zval, opencv_scalar_ce) == FAILURE) {
+        RETURN_NULL();
+    }
+    opencv_mat_object *src_object, *dst_object, *kernel_object;
+    Point anchor = Point(-1,-1);
+    Scalar border_value = morphologyDefaultBorderValue();
+
+    src_object = Z_PHP_MAT_OBJ_P(src_zval);
+    kernel_object = Z_PHP_MAT_OBJ_P(kernel_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);
+    }
+
+    if(anchor_zval != NULL){
+        opencv_point_object *anchor_object = Z_PHP_POINT_OBJ_P(anchor_zval);
+        anchor = *anchor_object->point;
+    }
+
+    if(border_value_zval != NULL){
+        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();
+}
+
 /**
  * color conversion code in CV\cvtColor,opencv enum ColorConversionCodes
  * @param module_number

source/opencv2/opencv_imgproc.h

@@ -89,4 +89,26 @@ ZEND_BEGIN_ARG_INFO_EX(opencv_bilateral_filter_arginfo, 0, 0, 6)
 ZEND_END_ARG_INFO()
 PHP_FUNCTION(opencv_bilateral_filter);
 
+ZEND_BEGIN_ARG_INFO_EX(opencv_dilate_arginfo, 0, 0, 7)
+                ZEND_ARG_INFO(0, src)
+                ZEND_ARG_INFO(1, dst)
+                ZEND_ARG_INFO(0, kernel)
+                ZEND_ARG_INFO(0, anchor)
+                ZEND_ARG_INFO(0, iterations)
+                ZEND_ARG_INFO(0, borderType)
+                ZEND_ARG_INFO(0, borderValue)
+ZEND_END_ARG_INFO()
+PHP_FUNCTION(opencv_dilate);
+
+ZEND_BEGIN_ARG_INFO_EX(opencv_erode_arginfo, 0, 0, 7)
+                ZEND_ARG_INFO(0, src)
+                ZEND_ARG_INFO(1, dst)
+                ZEND_ARG_INFO(0, kernel)
+                ZEND_ARG_INFO(0, anchor)
+                ZEND_ARG_INFO(0, iterations)
+                ZEND_ARG_INFO(0, borderType)
+                ZEND_ARG_INFO(0, borderValue)
+ZEND_END_ARG_INFO()
+PHP_FUNCTION(opencv_erode);
+
 #endif //OPENCV_OPENCV_IMGPROC_H