Fix CV\createTrackbar and CV\cvtColor bug

Author: hihozhou

source/opencv2/opencv_highgui.cc

@@ -128,7 +128,6 @@ opencv_fcall_info_cb * opencv_fcall_info_cb_create(zend_fcall_info *fci_ptr, zen
     opencv_fcall_info_cb *cb = new opencv_fcall_info_cb;
     cb->fci = new zend_fcall_info;
     cb->fci_cache = new zend_fcall_info_cache;
-
     memcpy(cb->fci, fci_ptr, sizeof(zend_fcall_info));
     memcpy(cb->fci_cache, fci_cache_ptr, sizeof(zend_fcall_info_cache));
     Z_TRY_ADDREF(cb->fci->function_name);//todo 滑动调或窗口销毁是释放内存
@@ -140,17 +139,19 @@ opencv_fcall_info_cb * opencv_fcall_info_cb_create(zend_fcall_info *fci_ptr, zen
 }
 
 void opencv_create_trackbar_callback(int pos, void* userdata){
-    opencv_fcall_info_cb *fci_s=(opencv_fcall_info_cb*)userdata;
-
-    zval retval;
-    zval args[1];
-    ZVAL_LONG(&args[0], (long)pos);//将滑动条滑动的值传入到闭包参数中
-    fci_s->fci->param_count = 1;
-    fci_s->fci->params = args;
-    fci_s->fci->retval = &retval;
-
-    zend_call_function(fci_s->fci, fci_s->fci_cache);
-    zval_ptr_dtor(&args[0]);
+    if(userdata != 0){
+        opencv_fcall_info_cb *fci_s=(opencv_fcall_info_cb*)userdata;
+
+        zval retval;
+        zval args[1];
+        ZVAL_LONG(&args[0], (long)pos);//将滑动条滑动的值传入到闭包参数中
+        fci_s->fci->param_count = 1;
+        fci_s->fci->params = args;
+        fci_s->fci->retval = &retval;
+
+        zend_call_function(fci_s->fci, fci_s->fci_cache);
+        zval_ptr_dtor(&args[0]);
+    }
 }
 
 
@@ -168,15 +169,19 @@ PHP_FUNCTION(opencv_create_trackbar){
 
     zend_fcall_info fci;
     zend_fcall_info_cache fci_cache;
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssll|f",
+    zend_bool is_null;
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssll|f!",
                               &trackbarname, &trackbarname_len,
                               &winname,&winname_len,
                               &value,&count,
-                              &fci, &fci_cache) == FAILURE) {
+                              &fci, &fci_cache,&is_null) == FAILURE) {
         return;
     }
+    opencv_fcall_info_cb *cb = 0;
+    if (fci.size > 0 && ZEND_NUM_ARGS() > 4) {
+        cb = opencv_fcall_info_cb_create(&fci, &fci_cache);
+    }
     int *trackbar_value_ptr = new int(value);
-    opencv_fcall_info_cb *cb = opencv_fcall_info_cb_create(&fci, &fci_cache);
     createTrackbar(trackbarname, winname, trackbar_value_ptr, (int)count,opencv_create_trackbar_callback,cb);
     RETURN_NULL();
 }

source/opencv2/opencv_imgproc.cc

@@ -36,15 +36,15 @@ void opencv_imgproc_init(int module_number)
  * @param return_value
  */
 PHP_FUNCTION(opencv_cv_t_color){
-    long code;
+    long code, dstCn = 0;
     Mat dstImg;
     zval *mat_zval;
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &mat_zval,opencv_mat_ce, &code) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol|l", &mat_zval,opencv_mat_ce, &code, &dstCn) == FAILURE) {
         RETURN_NULL();
     }
     //get src mat object from mat_zval
     opencv_mat_object *src_obj = Z_PHP_MAT_OBJ_P(mat_zval);
-    cvtColor(*(src_obj->mat), dstImg, (int)code);
+    cvtColor(*(src_obj->mat), dstImg, (int)code, (int)dstCn);
 
     //new PHP Mat bing cv::cvtColor dstImg.
     zval instance;