Skip to content

Commit 0a68634

Browse files
hihozhouhihozhou
committed
Merge branch 'dev'
2 parents a4a014d + e3bac87 commit 0a68634

File tree

4 files changed

+117
-1
lines changed

4 files changed

+117
-1
lines changed

‎opencv.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ const zend_function_entry opencv_functions[] = {
238238
ZEND_NS_NAMED_FE(OPENCV_NS, getTickFrequency, ZEND_FN(opencv_get_tick_frequency), NULL)
239239
ZEND_NS_NAMED_FE(OPENCV_NS, floodFill, ZEND_FN(opencv_flood_fill), opencv_flood_fill_arginfo)
240240
ZEND_NS_NAMED_FE(OPENCV_NS, setMouseCallback, ZEND_FN(opencv_set_mouse_callback), NULL)
241+
ZEND_NS_NAMED_FE(OPENCV_NS, adaptiveThreshold, ZEND_FN(opencv_adaptive_threshold), opencv_adaptive_threshold_arginfo)
241242
PHP_FE_END /* Must be the last line in opencv_functions[] */
242243
};
243244
/* }}} */

‎source/opencv2/core/opencv_mat.cc

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,64 @@ PHP_METHOD(opencv_mat, set_to)
578578

579579
}
580580

581+
/**
582+
* CV\Mat::add()
583+
* @param execute_data
584+
* @param return_value
585+
*/
586+
PHP_METHOD(opencv_mat, add)
587+
{
588+
zval *value1_zval, *value2_zval;
589+
590+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO",
591+
&value1_zval, opencv_mat_ce,
592+
&value2_zval, opencv_mat_ce
593+
) == FAILURE) {
594+
RETURN_NULL();
595+
}
596+
597+
opencv_mat_object *value1_obj = Z_PHP_MAT_OBJ_P(value1_zval);
598+
opencv_mat_object *value2_obj = Z_PHP_MAT_OBJ_P(value2_zval);
599+
zval instance;
600+
object_init_ex(&instance, opencv_mat_ce);
601+
opencv_mat_object *obj = Z_PHP_MAT_OBJ_P(&instance);
602+
603+
Mat im = *value1_obj->mat + *value2_obj->mat;
604+
605+
obj->mat=new Mat(im);
606+
//update php Mat object property
607+
opencv_mat_update_property_by_c_mat(&instance, obj->mat);
608+
609+
RETURN_ZVAL(&instance,0,0); //return php Mat object
610+
}
611+
612+
PHP_METHOD(opencv_mat, subtract)
613+
{
614+
zval *value1_zval, *value2_zval;
615+
616+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO",
617+
&value1_zval, opencv_mat_ce,
618+
&value2_zval, opencv_mat_ce
619+
) == FAILURE) {
620+
RETURN_NULL();
621+
}
622+
623+
opencv_mat_object *value1_obj = Z_PHP_MAT_OBJ_P(value1_zval);
624+
opencv_mat_object *value2_obj = Z_PHP_MAT_OBJ_P(value2_zval);
625+
zval instance;
626+
object_init_ex(&instance, opencv_mat_ce);
627+
opencv_mat_object *obj = Z_PHP_MAT_OBJ_P(&instance);
628+
629+
Mat im = *value1_obj->mat - *value2_obj->mat;
630+
631+
obj->mat=new Mat(im);
632+
//update php Mat object property
633+
opencv_mat_update_property_by_c_mat(&instance, obj->mat);
634+
635+
RETURN_ZVAL(&instance,0,0); //return php Mat object
636+
}
637+
638+
581639
/**
582640
* opencv_mat_methods[]
583641
*/
@@ -604,6 +662,8 @@ const zend_function_entry opencv_mat_methods[] = {
604662
PHP_ME(opencv_mat, plus, NULL, ZEND_ACC_PUBLIC)
605663
PHP_ME(opencv_mat, divide, NULL, ZEND_ACC_PUBLIC)
606664
PHP_MALIAS(opencv_mat, setTo ,set_to, NULL, ZEND_ACC_PUBLIC)
665+
PHP_ME(opencv_mat, add , NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
666+
PHP_ME(opencv_mat, subtract , NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
607667
PHP_FE_END
608668
};
609669
/* }}} */

‎source/opencv2/opencv_imgproc.cc

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ void opencv_imgproc_init(int module_number)
3030
opencv_morph_types_init(module_number);
3131
opencv_flood_fill_flags_init(module_number);
3232
opencv_threshold_types_init(module_number);
33+
opencv_adaptive_threshold_types_init(module_number);
3334
}
3435

3536
/**
@@ -681,6 +682,42 @@ PHP_FUNCTION(opencv_threshold){
681682
RETURN_DOUBLE(threshold(*src_object->mat, *dst_object->mat, thresh, maxval, (int)type));
682683
}
683684

685+
686+
687+
PHP_FUNCTION(opencv_adaptive_threshold){
688+
689+
zval *src_zval, *dst_zval;
690+
double maxValue, C;
691+
long adaptiveMethod, thresholdType, blockSize;
692+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ozdllld",
693+
&src_zval, opencv_mat_ce,
694+
&dst_zval,
695+
&maxValue, &adaptiveMethod,
696+
&thresholdType, &blockSize, &C) == FAILURE) {
697+
RETURN_NULL();
698+
}
699+
700+
opencv_mat_object *src_object, *dst_object;
701+
702+
src_object = Z_PHP_MAT_OBJ_P(src_zval);
703+
zval *dst_real_zval = Z_REFVAL_P(dst_zval);
704+
if(Z_TYPE_P(dst_real_zval) == IS_OBJECT && Z_OBJCE_P(dst_real_zval) == opencv_mat_ce){
705+
dst_object = Z_PHP_MAT_OBJ_P(dst_real_zval);
706+
} else{
707+
zval_ptr_dtor(dst_real_zval);
708+
zval instance;
709+
Mat dst;
710+
object_init_ex(&instance,opencv_mat_ce);
711+
ZVAL_COPY_VALUE(dst_real_zval, &instance);
712+
dst_object = Z_PHP_MAT_OBJ_P(dst_real_zval);
713+
dst_object->mat = new Mat(dst);
714+
}
715+
716+
adaptiveThreshold(*src_object->mat, *dst_object->mat, maxValue, (int)adaptiveMethod, (int)thresholdType, (int)blockSize, C);
717+
RETURN_NULL();
718+
}
719+
720+
684721
/**
685722
* CV\sobel
686723
* @param execute_data
@@ -1347,4 +1384,10 @@ void opencv_threshold_types_init(int module_number){
13471384
REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "THRESH_MASK", THRESH_MASK, CONST_CS | CONST_PERSISTENT);
13481385
REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "THRESH_OTSU", THRESH_OTSU, CONST_CS | CONST_PERSISTENT);
13491386
REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "THRESH_TRIANGLE", THRESH_TRIANGLE, CONST_CS | CONST_PERSISTENT);
1350-
}
1387+
}
1388+
1389+
//AdaptiveThresholdTypes
1390+
void opencv_adaptive_threshold_types_init(int module_number){
1391+
REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "ADAPTIVE_THRESH_MEAN_C", ADAPTIVE_THRESH_MEAN_C, CONST_CS | CONST_PERSISTENT);
1392+
REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "ADAPTIVE_THRESH_GAUSSIAN_C", ADAPTIVE_THRESH_GAUSSIAN_C, CONST_CS | CONST_PERSISTENT);
1393+
}

‎source/opencv2/opencv_imgproc.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ void opencv_morph_shapes_init(int module_number);
2424
void opencv_morph_types_init(int module_number);
2525
void opencv_flood_fill_flags_init(int module_number);
2626
void opencv_threshold_types_init(int module_number);
27+
void opencv_adaptive_threshold_types_init(int module_number);
2728

2829
PHP_FUNCTION(opencv_cv_t_color);
2930
PHP_FUNCTION(opencv_ellipse);
@@ -187,6 +188,17 @@ ZEND_BEGIN_ARG_INFO_EX(opencv_threshold_arginfo, 0, 0, 5)
187188
ZEND_END_ARG_INFO()
188189
PHP_FUNCTION(opencv_threshold);
189190

191+
ZEND_BEGIN_ARG_INFO_EX(opencv_adaptive_threshold_arginfo, 0, 0, 7)
192+
ZEND_ARG_INFO(0, src)
193+
ZEND_ARG_INFO(1, dst)
194+
ZEND_ARG_INFO(0, maxValue)
195+
ZEND_ARG_INFO(0, adaptiveMethod)
196+
ZEND_ARG_INFO(0, thresholdType)
197+
ZEND_ARG_INFO(0, blockSize)
198+
ZEND_ARG_INFO(0, C)
199+
ZEND_END_ARG_INFO()
200+
PHP_FUNCTION(opencv_adaptive_threshold);
201+
190202
ZEND_BEGIN_ARG_INFO_EX(opencv_morphology_ex_arginfo, 0, 0, 8)
191203
ZEND_ARG_INFO(0, src)
192204
ZEND_ARG_INFO(1, dst)

0 commit comments

Comments
 (0)