添加opencv_absdiff

Author: 马来酸

source/opencv2/opencv_core.cc

@@ -388,12 +388,8 @@ PHP_FUNCTION(opencv_absdiff){
         &dst_zval) == FAILURE) {
             RETURN_NULL();
         }
-//        opencv_mat_object *src1_mat_object = NULL, *src2_mat_object = NULL, *dst_mat_object = NULL;
-//        opencv_scalar_object *src1_scalar_object = NULL, *src2_scalar_object = NULL, *dst_scalar_object = NULL;
-
-        void *tmp_src1 = NULL;
-        void *tmp_src2 = NULL;
-        void *tmp_dst = NULL;
+        opencv_mat_object *src1_mat_object = NULL, *src2_mat_object = NULL, *dst_mat_object = NULL;
+        opencv_scalar_object *src1_scalar_object = NULL, *src2_scalar_object = NULL, *dst_scalar_object = NULL;
 
         int flag = 0;//1 mat,0 scalar
 
@@ -405,10 +401,10 @@ PHP_FUNCTION(opencv_absdiff){
         }
 
         if(Z_OBJCE_P(src1_zval) == opencv_mat_ce){
-            tmp_src1 = Z_PHP_MAT_OBJ_P(src1_zval);
+            src1_mat_object = Z_PHP_MAT_OBJ_P(src1_zval);
             flag |= (1<<1);
         }else if(Z_OBJCE_P(src1_zval) == opencv_scalar_ce){
-            tmp_src1 = Z_PHP_SCALAR_OBJ_P(src1_zval);
+            src1_scalar_object = Z_PHP_SCALAR_OBJ_P(src1_zval);
         }else{
             char *error_message = (char*)malloc(strlen("src1 parameter must be Mat or Scalar object.") + 1);
             strcpy(error_message,"src1 parameter must be Mat or Scalar object.");
@@ -424,10 +420,10 @@ PHP_FUNCTION(opencv_absdiff){
         }
 
         if(Z_OBJCE_P(src2_zval) == opencv_mat_ce){
-            tmp_src2 = Z_PHP_MAT_OBJ_P(src2_zval);
+            src2_mat_object = Z_PHP_MAT_OBJ_P(src2_zval);
             flag |= (1<<0);
         }else if(Z_OBJCE_P(src2_zval) == opencv_scalar_ce){
-            tmp_src2 = Z_PHP_SCALAR_OBJ_P(src2_zval);
+            src2_scalar_object = Z_PHP_SCALAR_OBJ_P(src2_zval);
         }else{
             char *error_message = (char*)malloc(strlen("src2 parameter must be Mat or Scalar object.") + 1);
             strcpy(error_message,"src2 parameter must be Mat or Scalar object.");
@@ -439,41 +435,42 @@ PHP_FUNCTION(opencv_absdiff){
 
         if(flag == 0){ //both scalar
             if(Z_TYPE_P(dst_real_zval) == IS_OBJECT && Z_OBJCE_P(dst_real_zval)==opencv_scalar_ce){
-                tmp_dst = Z_PHP_SCALAR_OBJ_P(dst_real_zval);
+                dst_scalar_object = Z_PHP_SCALAR_OBJ_P(dst_real_zval);
             } else{
                 zval instance;
                 Scalar dst;
                 object_init_ex(&instance,opencv_scalar_ce);
                 ZVAL_COPY_VALUE(dst_real_zval, &instance);
-                tmp_dst = Z_PHP_SCALAR_OBJ_P(dst_real_zval);
-                tmp_dst->scalar = new Scalar(dst);
+                dst_scalar_object = Z_PHP_SCALAR_OBJ_P(dst_real_zval);
+                dst_scalar_object->scalar = new Scalar(dst);
             }
 
-            absdiff(*tmp_src1->mat,*tmp_src2->mat, *tmp_dst->mat);
-            opencv_mat_update_property_by_c_mat(dst_real_zval, tmp_dst->mat);
+            absdiff(*src1_scalar_object->scalar,*src2_scalar_object->scalar, *dst_scalar_object->scalar);
+            opencv_scalar_update_property_by_c_scalar(dst_real_zval, dst_scalar_object->scalar);
         }else{
             if(Z_TYPE_P(dst_real_zval) == IS_OBJECT && Z_OBJCE_P(dst_real_zval)==opencv_mat_ce){
-                tmp_dst = Z_PHP_MAT_OBJ_P(dst_real_zval);
+                dst_mat_object = Z_PHP_MAT_OBJ_P(dst_real_zval);
             } else{
                 zval instance;
                 Mat dst;
                 object_init_ex(&instance,opencv_mat_ce);
                 ZVAL_COPY_VALUE(dst_real_zval, &instance);
-                tmp_dst = Z_PHP_MAT_OBJ_P(dst_real_zval);
-                tmp_dst->mat = new Mat(dst);
+
+                dst_mat_object = Z_PHP_MAT_OBJ_P(dst_real_zval);
+                dst_mat_object->mat = new Mat(dst);
             }
             switch (flag){
                 case 1:
-                    absdiff(*tmp_src1->scalar,*tmp_src2->mat, *tmp_dst->mat);
-                    opencv_mat_update_property_by_c_mat(dst_real_zval, tmp_dst->mat);
+                    absdiff(*src1_scalar_object->scalar,*src2_mat_object->mat, *dst_mat_object->mat);
+                    opencv_mat_update_property_by_c_mat(dst_real_zval, dst_mat_object->mat);
                     break;
                 case 10:
-                    absdiff(*tmp_src1->mat,*tmp_src2->scalar, *tmp_dst->mat);
-                    opencv_mat_update_property_by_c_mat(dst_real_zval, tmp_dst->mat);
+                    absdiff(*src1_mat_object->mat,*src2_scalar_object->scalar, *dst_mat_object->mat);
+                    opencv_mat_update_property_by_c_mat(dst_real_zval, dst_mat_object->mat);
                     break;
                 case 11:
-                    absdiff(*tmp_src1->mat,*tmp_src2->mat, *tmp_dst->mat);
-                    opencv_mat_update_property_by_c_mat(dst_real_zval, tmp_dst->mat);
+                    absdiff(*src1_mat_object->mat,*src2_mat_object->mat, *dst_mat_object->mat);
+                    opencv_mat_update_property_by_c_mat(dst_real_zval, dst_mat_object->mat);
                     break;
                 default:
                     break;