Add CV\Mat->size() and opencv_size_update_property_by_c_size

Author: hihozhou

source/opencv2/core/opencv_mat.cc

@@ -131,8 +131,8 @@ PHP_METHOD(opencv_mat, empty)
 
 PHP_METHOD(opencv_mat, zeros)
 {
-    long rows, cols, flags = IMREAD_COLOR;
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll|l", &rows, &cols, &flags) == FAILURE) {
+    long rows, cols, flags;
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "lll", &rows, &cols, &flags) == FAILURE) {
         RETURN_NULL();
     }
     zval instance;
@@ -148,6 +148,27 @@ PHP_METHOD(opencv_mat, zeros)
     RETURN_ZVAL(&instance,0,0); //return php Mat object
 }
 
+PHP_METHOD(opencv_mat, zeros_by_size)
+{
+    zval *size_zval;
+    long flags;
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &size_zval, opencv_size_ce, &flags) == FAILURE) {
+        RETURN_NULL();
+    }
+
+    opencv_size_object *size_object = Z_PHP_SIZE_OBJ_P(size_zval);
+    zval instance;
+    object_init_ex(&instance, opencv_mat_ce);
+    opencv_mat_object *obj = Z_PHP_MAT_OBJ_P(&instance);
+
+    Mat im = Mat::zeros(*size_object->size, (int)flags);
+
+    obj->mat=new Mat(im);
+    opencv_mat_update_property_by_c_mat(&instance, obj->mat);
+
+    RETURN_ZVAL(&instance,0,0);
+}
+
 
 /**
  * Mat->clone()
@@ -261,7 +282,7 @@ PHP_METHOD(opencv_mat, get_image_roi)
     opencv_mat_object *obj = Z_PHP_MAT_OBJ_P(getThis());
     try {
         Mat roi = (*obj->mat)(*rect_object->rect);
-        new_obj->mat=new Mat(roi);
+        new_obj->mat = new Mat(roi);
     }catch (Exception exception){
         const char* err_msg = exception.what();
         opencv_throw_exception(err_msg);//throw exception
@@ -393,6 +414,24 @@ PHP_METHOD(opencv_mat, convert_to){
     RETURN_NULL();
 }
 
+PHP_METHOD(opencv_mat, size)
+{
+    zval instance;
+    object_init_ex(&instance, opencv_size_ce);
+    opencv_size_object *size_object = Z_PHP_SIZE_OBJ_P(&instance);
+
+    opencv_mat_object *obj = Z_PHP_MAT_OBJ_P(getThis());
+    try {
+        Size size = obj->mat->size();
+        size_object->size = new Size(size);
+    }catch (Exception e){
+        opencv_throw_exception(e.what());
+        RETURN_NULL();
+    }
+    opencv_size_update_property_by_c_size(&instance, size_object->size);
+    RETURN_ZVAL(&instance,0,0);
+}
+
 
 /**
  * opencv_mat_methods[]
@@ -404,7 +443,9 @@ const zend_function_entry opencv_mat_methods[] = {
         PHP_ME(opencv_mat, channels, NULL, ZEND_ACC_PUBLIC)
         PHP_ME(opencv_mat, empty, NULL, ZEND_ACC_PUBLIC)
         PHP_ME(opencv_mat, print, NULL, ZEND_ACC_PUBLIC)
+        PHP_ME(opencv_mat, size, NULL, ZEND_ACC_PUBLIC)
         PHP_ME(opencv_mat, zeros, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+        PHP_MALIAS(opencv_mat, zerosBySize ,zeros_by_size, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
         PHP_MALIAS(opencv_mat, isContinuous ,is_continuous, NULL, ZEND_ACC_PUBLIC)
         PHP_MALIAS(opencv_mat, isSubmatrix ,is_submatrix, NULL, ZEND_ACC_PUBLIC)
         PHP_ME(opencv_mat, row, NULL, ZEND_ACC_PUBLIC)

source/opencv2/core/opencv_type.cc

@@ -272,6 +272,11 @@ void opencv_size_free_obj(zend_object *object)
     zend_object_std_dtor(object);
 }
 
+void opencv_size_update_property_by_c_size(zval *z, Size *size){
+    zend_update_property_long(opencv_size_ce, z, "width", sizeof("width")-1, size->width);
+    zend_update_property_long(opencv_size_ce, z, "height", sizeof("height")-1, size->height);
+}
+
 
 /**
  * Size __construct
@@ -287,9 +292,7 @@ PHP_METHOD(opencv_size, __construct)
     opencv_size_object *obj = Z_PHP_SIZE_OBJ_P(getThis());
     Size size = Size((int)width, (int)height);
     obj->size = new Size(size);
-
-    zend_update_property_long(opencv_size_ce, getThis(), "width", sizeof("width")-1, obj->size->width);
-    zend_update_property_long(opencv_size_ce, getThis(), "height", sizeof("height")-1, obj->size->height);
+    opencv_size_update_property_by_c_size(getThis(), obj->size);
 }
 
 

source/opencv2/core/opencv_type.h

@@ -75,6 +75,8 @@ static inline opencv_rect_object* get_rect_obj(zend_object *obj) {
     return (opencv_rect_object*)((char*)(obj) - XtOffsetOf(opencv_rect_object, std));
 }
 
+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);