fix CV\fillPoly and change opencv_type function

Author: hihozhou

opencv.cc

@@ -193,7 +193,7 @@ const zend_function_entry opencv_functions[] = {
     ZEND_NS_NAMED_FE(OPENCV_NS, cvtColor, ZEND_FN(opencv_cv_t_color), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, ellipse, ZEND_FN(opencv_ellipse), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, circle, ZEND_FN(opencv_circle), NULL)
-    ZEND_NS_NAMED_FE(OPENCV_NS, fillPoly, ZEND_FN(opencv_fill_poly), NULL)//TODO fillPoly
+    ZEND_NS_NAMED_FE(OPENCV_NS, fillPoly, ZEND_FN(opencv_fill_poly), opencv_fill_poly_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, line, ZEND_FN(opencv_line), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, rectangle, ZEND_FN(opencv_rectangle), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, rectangleByPoint, ZEND_FN(opencv_rectangle_by_point), NULL)

source/opencv2/core/opencv_type.cc

@@ -49,10 +49,15 @@ PHP_METHOD(opencv_point, __construct)
     Point point = Point((int)x, (int)y);
     obj->point = new Point(point);
 
-    zend_update_property_long(opencv_point_ce, getThis(), "x", sizeof("x")-1, x);
-    zend_update_property_long(opencv_point_ce, getThis(), "y", sizeof("y")-1, y);
+    opencv_point_update_property_by_c_point(getThis(),obj->point);
 }
 
+void opencv_point_update_property_by_c_point(zval *z, Point *point){
+    zend_update_property_long(opencv_point_ce, z, "x", sizeof("x")-1, point->x);
+    zend_update_property_long(opencv_point_ce, z, "y", sizeof("y")-1, point->y);
+}
+
+
 /**
  * print Point data
  * @param execute_data
@@ -440,8 +445,7 @@ PHP_METHOD(opencv_rect, tl)
     opencv_point_object *point_obj = Z_PHP_POINT_OBJ_P(&point_zval);
     point_obj->point = new Point(rect_obj->rect->tl());
 
-    zend_update_property_long(opencv_point_ce, &point_zval, "x", sizeof("x")-1, point_obj->point->x);
-    zend_update_property_long(opencv_point_ce, &point_zval, "y", sizeof("y")-1, point_obj->point->y);
+    opencv_point_update_property_by_c_point(&point_zval,point_obj->point);
 
     RETURN_ZVAL(&point_zval,0,0); //return php Point object
 }
@@ -460,8 +464,7 @@ PHP_METHOD(opencv_rect, br)
     opencv_point_object *point_obj = Z_PHP_POINT_OBJ_P(&point_zval);
     point_obj->point = new Point(rect_obj->rect->br());
 
-    zend_update_property_long(opencv_point_ce, &point_zval, "x", sizeof("x")-1, point_obj->point->x);
-    zend_update_property_long(opencv_point_ce, &point_zval, "y", sizeof("y")-1, point_obj->point->y);
+    opencv_point_update_property_by_c_point(&point_zval,point_obj->point);
 
     RETURN_ZVAL(&point_zval,0,0); //return php Point object
 }
@@ -480,8 +483,7 @@ PHP_METHOD(opencv_rect, size)
     opencv_size_object *size_obj = Z_PHP_SIZE_OBJ_P(&size_zval);
     size_obj->size = new Size(rect_obj->rect->size());
 
-    zend_update_property_long(opencv_size_ce, &size_zval, "width", sizeof("width")-1, size_obj->size->width);
-    zend_update_property_long(opencv_size_ce, &size_zval, "height", sizeof("height")-1, size_obj->size->height);
+    opencv_size_update_property_by_c_size(&size_zval,size_obj->size);
 
     RETURN_ZVAL(&size_zval,0,0); //return php Point object
 }

source/opencv2/core/opencv_type.h

@@ -80,4 +80,7 @@ void opencv_size_update_property_by_c_size(zval *z, Size *size);
 void opencv_rect_update_property_by_c_rect(zval *z, Rect *rect);
 
 void opencv_scalar_update_property_by_c_scalar(zval *z,Scalar *scalar);
+
+void opencv_point_update_property_by_c_point(zval *z, Point *point);
+
 #endif //OPENCV_OPENCV_TYPE_H

source/opencv2/opencv_imgproc.cc

@@ -124,48 +124,74 @@ PHP_FUNCTION(opencv_circle){
  */
 PHP_FUNCTION(opencv_fill_poly){
 
-    long thickness = 1, lineType = LINE_8, shift = 0;
-    long *number_points;
-    long ncoutours;
-    zval *mat_zval, *scalar_zval, *offset_point_zval;
-    zval *start_point_zval;
+    //define parameters
+    long ncontours, 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(), "OOllO|llO",
-                              &mat_zval, opencv_mat_ce,
-                              &start_point_zval, opencv_point_ce,
-                              &number_points,
-                              &ncoutours,
-                              &scalar_zval, opencv_scalar_ce,
-                              &thickness, &lineType,
-                              &offset_point_zval, opencv_point_ce) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "OalO|llz",
+                              &img_zval, opencv_mat_ce,
+                              &points_zval, &ncontours,
+                              &color_zval, opencv_scalar_ce,
+                              &lineType, &shift,
+                              &offset_point_zval) == FAILURE) {
         RETURN_NULL();
     }
 
-    zval *offset_point_real_zval = Z_REFVAL_P(offset_point_zval);
-    if(Z_TYPE_P(offset_point_real_zval) == IS_OBJECT && Z_OBJCE_P(offset_point_real_zval)==opencv_point_ce){
-        // is Point object
-        offset_object = Z_PHP_POINT_OBJ_P(offset_point_real_zval);
+    unsigned long point_count = zend_hash_num_elements(Z_ARRVAL_P(points_zval));
+    Point root_points[1][point_count];
+    opencv_point_object *point_object;
+    zend_ulong _h;
+    zval *array_val_zval;
+    ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(points_zval),_h,array_val_zval){
+                again1:
+                if(Z_TYPE_P(array_val_zval) == IS_OBJECT && Z_OBJCE_P(array_val_zval) == opencv_point_ce){
+                    point_object = Z_PHP_POINT_OBJ_P(array_val_zval);
+                    root_points[0][_h] = *point_object->point;
+                }else if(Z_TYPE_P(array_val_zval) == IS_REFERENCE){
+                    array_val_zval = Z_REFVAL_P(array_val_zval);
+                    goto again1;
+                } else {
+                    opencv_throw_exception("points array value just Point object.");
+                    RETURN_NULL();
+                }
+            }ZEND_HASH_FOREACH_END();
+
+    const Point* pts[1] = {root_points[0]};
+    int npts[] = {(int)point_count};
+    Point offset;
+    zval *offset_point_real_zval;
+
+    if(offset_point_zval != NULL){
+        offset_point_real_zval = Z_REFVAL_P(offset_point_zval);
+        if(Z_TYPE_P(offset_point_real_zval) == IS_OBJECT && Z_OBJCE_P(offset_point_real_zval) == opencv_point_ce){
+            // is Point object
+            offset_object = Z_PHP_POINT_OBJ_P(offset_point_real_zval);
+        } else{
+            // isn't Point object
+            zval_ptr_dtor(offset_point_real_zval);
+            zval instance;
+            object_init_ex(&instance,opencv_point_ce);
+            ZVAL_COPY_VALUE(offset_point_real_zval, &instance);// Cover dst_real_zval by Point object
+            offset_object = Z_PHP_POINT_OBJ_P(offset_point_real_zval);
+        }
     } else{
-        // isn't Point object
-        zval instance;
-        Point dst;
-        object_init_ex(&instance,opencv_point_ce);
-        ZVAL_COPY_VALUE(offset_point_real_zval, &instance);// Cover dst_real_zval by Point object
-        offset_object = Z_PHP_POINT_OBJ_P(offset_point_real_zval);
-        offset_object->point = new Point(dst);
+        offset = Point();
     }
 
-    opencv_mat_object *mat_obj = Z_PHP_MAT_OBJ_P(mat_zval);
-    opencv_point_object *start_point_obj = Z_PHP_POINT_OBJ_P(start_point_zval);
-    opencv_scalar_object *scalar_obj = Z_PHP_SCALAR_OBJ_P(scalar_zval);
+    opencv_mat_object *mat_obj = Z_PHP_MAT_OBJ_P(img_zval);
+    opencv_scalar_object *scalar_obj = Z_PHP_SCALAR_OBJ_P(color_zval);
 
-    const Point *pts = (start_point_obj->point);
-    const int *npts = (int*)(number_points);
-    fillPoly(*(mat_obj->mat), &pts, npts, ncoutours, *(scalar_obj->scalar), thickness, lineType, *offset_object->point);
+    fillPoly(*(mat_obj->mat), pts, npts, (int)ncontours, *(scalar_obj->scalar), (int)lineType, (int)shift, offset);
+    if(offset_point_zval != NULL){
+        offset_object->point = new Point(offset);
+        opencv_point_update_property_by_c_point(offset_point_real_zval, offset_object->point);
+    }
 
     RETURN_NULL();
 }
 
+
 /**
  * CV\line
  * @param execute_data

source/opencv2/opencv_imgproc.h

@@ -23,7 +23,17 @@ void opencv_line_type_init(int module_number);
 PHP_FUNCTION(opencv_cv_t_color);
 PHP_FUNCTION(opencv_ellipse);
 PHP_FUNCTION(opencv_circle);
-PHP_FUNCTION(opencv_fill_poly);//TODO fillPoly
+ZEND_BEGIN_ARG_INFO_EX(opencv_fill_poly_arginfo, 0, 0, 7)
+                ZEND_ARG_INFO(0, img)
+                ZEND_ARG_INFO(0, pts)//point array
+                ZEND_ARG_INFO(0, ncontours)
+                ZEND_ARG_INFO(0, color)
+                ZEND_ARG_INFO(0, lineType)
+                ZEND_ARG_INFO(0, shift)
+                ZEND_ARG_INFO(1, offset)
+ZEND_END_ARG_INFO()
+PHP_FUNCTION(opencv_fill_poly);
+
 PHP_FUNCTION(opencv_line);
 PHP_FUNCTION(opencv_rectangle);
 PHP_FUNCTION(opencv_rectangle_by_point);