Merge branch 'dev'

hihozhou · hihozhou · commit 868c5d62370c · 2017-07-23T14:30:50.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -16,32 +16,51 @@ notifications:
   email: hihozhou@gmail.com
 
 before_install:
-  - sudo apt-get update
+  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+  - sudo apt-get -qq update
+  - sudo apt-get install gcc-4.8 -y -qq
+  - sudo apt-get install g++-4.8 -y -qq
+
 install:
   # OpenCV dependencies - Details available at: http://docs.opencv.org/trunk/doc/tutorials/introduction/linux_install/linux_install.html
   - sudo apt-get install -y build-essential
-  - sudo apt-get install -y cmake git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev
-  - sudo apt-get install -y python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev
+  # Install cmake
+  - wget https://cmake.org/files/v3.8/cmake-3.8.2.tar.gz
+  - tar -zxf cmake-3.8.2.tar.gz
+  - cd cmake-3.8.2
+  - ./configure
+  - make
+  - sudo make install
+  - cd ..
+
+  - sudo apt-get install -y git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev -qq
+  - sudo apt-get install -y python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev -qq
+
+
+
+
+
   #- sudo apt-get install -y gcc-4.8 g++-4.8
 
   # Download OpenCV-contrib v3.3.0-rc
-  - curl -sL https://github.com/Itseez/opencv_contrib/archive/3.3.0-rc.zip > opencv_contrib.zip
-  - unzip opencv_contrib.zip
-  #- cd opencv_contrib-3.3.0-rc
+  - git clone https://github.com/opencv/opencv_contrib.git
+  - cd opencv_contrib
+  - git checkout 3.3.0-rc
+  - cd ..
 
-  # Download OpenCV v3.3.0-rc .zip file and extract.
-  - curl -sL https://github.com/Itseez/opencv/archive/3.3.0-rc.zip > opencv.zip
-  - unzip opencv.zip
-  - cd opencv-3.3.0-rc
+  # Download OpenCV v3.3.0-rc
+  - git clone https://github.com/opencv/opencv.git
+  - cd opencv
+  - git checkout 3.3.0-rc
 
   # Create a new 'build' folder.
   - mkdir build
   - cd build
 
   # Set build instructions for Ubuntu distro.
-  - cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D WITH_TBB=ON -D BUILD_NEW_PYTHON_SUPPORT=ON -D WITH_V4L=ON -D INSTALL_C_EXAMPLES=ON -D INSTALL_PYTHON_EXAMPLES=ON -D BUILD_EXAMPLES=ON -D WITH_QT=ON -D WITH_OPENGL=ON -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-3.3.0-rc/modules ..
+  - cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D WITH_TBB=ON -D BUILD_NEW_PYTHON_SUPPORT=ON -D WITH_V4L=ON -D INSTALL_C_EXAMPLES=ON -D INSTALL_PYTHON_EXAMPLES=ON -D BUILD_EXAMPLES=ON -D WITH_QT=ON -D WITH_OPENGL=ON -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules ..
   # Run 'make' with four threads.
-  - make -j4
+  - make -j6
 
   # Install to OS.
   - sudo make install
@@ -54,9 +73,17 @@ install:
   # We need to return to the repo "root" folder, so we can then 'cd' into the C++ project folder.
   - cd ../../
 
+#addons:
+#  apt:
+#    sources:
+#      - george-edison55-precise-backports
+#    packages:
+#      - cmake-data
+#      - cmake
+
 #Compile
 before_script:
-    - ./travis/compile.sh
+  - ./travis/compile.sh
 
 script:
     - exit 0
diff --git a/opencv.cc b/opencv.cc
@@ -199,13 +199,16 @@ const zend_function_entry opencv_functions[] = {
     ZEND_NS_NAMED_FE(OPENCV_NS, split, ZEND_FN(opencv_split), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, merge, ZEND_FN(opencv_merge), opencv_merge_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, createTrackbar, ZEND_FN(opencv_create_trackbar), NULL)
+    ZEND_NS_NAMED_FE(OPENCV_NS, destroyWindow, ZEND_FN(opencv_destroy_window), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, getOptimalDFTSize, ZEND_FN(opencv_get_optimal_dft_size), NULL)
     ZEND_NS_NAMED_FE(OPENCV_NS, copyMakeBorder, ZEND_FN(opencv_copy_make_border), opencv_copy_make_border_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, dft, ZEND_FN(opencv_dft), opencv_dft_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, magnitude, ZEND_FN(opencv_magnitude), opencv_magnitude_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, add, ZEND_FN(opencv_add), opencv_add_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, log, ZEND_FN(opencv_log), opencv_log_arginfo)
     ZEND_NS_NAMED_FE(OPENCV_NS, normalize, ZEND_FN(opencv_normalize), opencv_normalize_arginfo)
+    ZEND_NS_NAMED_FE(OPENCV_NS, equalizeHist, ZEND_FN(opencv_equalize_hist), opencv_equalize_hist_arginfo)
+    ZEND_NS_NAMED_FE(OPENCV_NS, resize, ZEND_FN(opencv_resize), opencv_resize_arginfo)
 	PHP_FE_END	/* Must be the last line in opencv_functions[] */
 };
 /* }}} */
diff --git a/source/opencv2/opencv_highgui.cc b/source/opencv2/opencv_highgui.cc
@@ -18,6 +18,7 @@
 #include "../../php_opencv.h"
 #include "opencv_highgui.h"
 #include "core/opencv_mat.h"
+#include "../../opencv_exception.h"
 
 
 #ifdef HAVE_CONFIG_H
@@ -56,8 +57,8 @@ PHP_FUNCTION(opencv_wait_key){
     if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &delay) == FAILURE) {
         RETURN_NULL();
     }
-    waitKey((int)(delay*1000));//seconds
-    RETURN_NULL();
+    int key = waitKey((int)delay);//millisecond
+    RETURN_LONG(key);
 }
 
 /**
@@ -164,6 +165,25 @@ PHP_FUNCTION(opencv_create_trackbar){
 
 }
 
+PHP_FUNCTION(opencv_destroy_window){
+    char *winname;
+    long winname_len;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &winname,&winname_len) == FAILURE) {
+        return;
+    }
+
+    try{
+        destroyWindow(winname);
+    }catch (Exception e){
+        opencv_throw_exception(e.what());
+    }
+
+    RETURN_NULL();
+
+
+}
+
 
 
 void opencv_highgui_init(int module_number)
diff --git a/source/opencv2/opencv_highgui.h b/source/opencv2/opencv_highgui.h
@@ -24,5 +24,6 @@ PHP_FUNCTION(opencv_imshow);
 PHP_FUNCTION(opencv_wait_key);
 PHP_FUNCTION(opencv_named_window);
 PHP_FUNCTION(opencv_create_trackbar);
+PHP_FUNCTION(opencv_destroy_window);
 
 #endif //OPENCV_OPENCV_HIGHGUI_H
diff --git a/source/opencv2/opencv_imgcodecs.cc b/source/opencv2/opencv_imgcodecs.cc
@@ -72,8 +72,11 @@ PHP_FUNCTION(opencv_imwrite){
         RETURN_NULL();
     }
     opencv_mat_object *obj = Z_PHP_MAT_OBJ_P(object);
-    //todo throw exception can't save
-    imwrite(filename,*(obj->mat));
+    try {
+        imwrite(filename,*obj->mat);
+    }catch (Exception e){
+        opencv_throw_exception(e.what());
+    }
     RETURN_TRUE;
 }
 
diff --git a/source/opencv2/opencv_imgproc.cc b/source/opencv2/opencv_imgproc.cc
@@ -19,6 +19,7 @@
 #include <opencv2/imgproc.hpp>
 #include "core/opencv_mat.h"
 #include "core/opencv_type.h"
+#include "../../opencv_exception.h"
 
 
 void opencv_imgproc_init(int module_number)
@@ -225,6 +226,78 @@ PHP_FUNCTION(opencv_rectangle_by_rect){
 }
 
 
+/**
+ * CV\equalizeHist
+ * @param execute_data
+ * @param return_value
+ */
+PHP_FUNCTION(opencv_equalize_hist){
+
+    zval *src_zval, *dst_zval;
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz",
+                              &src_zval, opencv_mat_ce,
+                              &dst_zval) == FAILURE) {
+        RETURN_NULL();
+    }
+
+    opencv_mat_object *src_obj, *dst_object;
+    src_obj = Z_PHP_MAT_OBJ_P(src_zval);
+    zval *dst_real_zval = Z_REFVAL_P(dst_zval);
+    if(Z_TYPE_P(dst_real_zval) == IS_OBJECT && Z_OBJCE_P(dst_real_zval)==opencv_mat_ce){
+        dst_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);
+        dst_object = Z_PHP_MAT_OBJ_P(dst_real_zval);
+        dst_object->mat = new Mat(dst);
+    }
+    try {
+        equalizeHist(*src_obj->mat, *dst_object->mat);
+    }catch (Exception e){
+        opencv_throw_exception(e.what());
+    }
+    RETURN_NULL();
+}
+
+
+PHP_FUNCTION(opencv_resize){
+
+    zval *src_zval, *dst_zval, *dsize_zval;
+    double fx = 0, fy = 0;
+    long interpolation = INTER_LINEAR;
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "OzO|ddl",
+                              &src_zval, opencv_mat_ce,
+                              &dst_zval,
+                              &dsize_zval, opencv_size_ce,
+                              &fx, &fy, &interpolation
+    ) == FAILURE) {
+        RETURN_NULL();
+    }
+
+    opencv_mat_object *src_obj, *dst_object;
+    src_obj = Z_PHP_MAT_OBJ_P(src_zval);
+    zval *dst_real_zval = Z_REFVAL_P(dst_zval);
+    if(Z_TYPE_P(dst_real_zval) == IS_OBJECT && Z_OBJCE_P(dst_real_zval)==opencv_mat_ce){
+        dst_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);
+        dst_object = Z_PHP_MAT_OBJ_P(dst_real_zval);
+        dst_object->mat = new Mat(dst);
+    }
+    opencv_size_object *dsize_obj = Z_PHP_SIZE_OBJ_P(dsize_zval);
+    try {
+        resize(*src_obj->mat, *dst_object->mat, *dsize_obj->size , fx, fy, (int)interpolation);
+    }catch (Exception e){
+        opencv_throw_exception(e.what());
+    }
+    RETURN_NULL();
+}
+
 /**
  * color conversion code in CV\cvtColor,opencv enum ColorConversionCodes
  * @param module_number
diff --git a/source/opencv2/opencv_imgproc.h b/source/opencv2/opencv_imgproc.h
@@ -29,4 +29,20 @@ PHP_FUNCTION(opencv_rectangle);
 PHP_FUNCTION(opencv_rectangle_by_point);
 PHP_FUNCTION(opencv_rectangle_by_rect);
 
+ZEND_BEGIN_ARG_INFO_EX(opencv_equalize_hist_arginfo, 0, 0, 2)
+                ZEND_ARG_INFO(0, src)
+                ZEND_ARG_INFO(1, dst)
+ZEND_END_ARG_INFO()
+PHP_FUNCTION(opencv_equalize_hist);
+
+ZEND_BEGIN_ARG_INFO_EX(opencv_resize_arginfo, 0, 0, 6)
+                ZEND_ARG_INFO(0, src)
+                ZEND_ARG_INFO(1, dst)
+                ZEND_ARG_INFO(0, dsize_zval)
+                ZEND_ARG_INFO(0, fx)
+                ZEND_ARG_INFO(0, fy)
+                ZEND_ARG_INFO(0, interpolation)
+ZEND_END_ARG_INFO()
+PHP_FUNCTION(opencv_resize);
+
 #endif //OPENCV_OPENCV_IMGPROC_H
diff --git a/source/opencv2/opencv_objdetect.cc b/source/opencv2/opencv_objdetect.cc
@@ -112,8 +112,10 @@ PHP_METHOD(opencv_cascade_classifier, detect_multi_scale)
             min_size, max_size);
 
     zval *objects_real_zval = Z_REFVAL_P(objects_zval);
-    zval instance;
-    array_init(&instance);
+
+    zval_dtor(objects_real_zval);//if real_zval value not eq null ,free real_zval to avoid memory leaks detected
+
+    array_init(objects_real_zval);
     for(unsigned long i=0; i < objects.size(); i++){
         zval OPENCV_CONNECT(zval,i);
         Rect OPENCV_CONNECT(rect,i);
@@ -123,10 +125,10 @@ PHP_METHOD(opencv_cascade_classifier, detect_multi_scale)
         OPENCV_CONNECT(rect,i) = objects.at(i);
         OPENCV_CONNECT(rect_object,i)->rect = new Rect(OPENCV_CONNECT(rect,i));
         opencv_rect_update_property_by_c_rect(&OPENCV_CONNECT(zval,i), OPENCV_CONNECT(rect_object,i)->rect);
-        add_next_index_zval(&instance,&OPENCV_CONNECT(zval,i));
 
+        add_next_index_zval(objects_real_zval,&OPENCV_CONNECT(zval,i));
     }
-    ZVAL_COPY_VALUE(objects_real_zval, &instance);
+
     RETURN_NULL();
 }
 
@@ -167,6 +169,16 @@ void opencv_cascade_classifier_init(int module_number){
     opencv_cascade_classifier_object_handlers.free_obj = opencv_cascade_classifier_free_obj;
 }
 
+void opencv_objdetect_constants_init(int module_number)
+{
+
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "CV_HAAR_DO_CANNY_PRUNING", CV_HAAR_DO_CANNY_PRUNING, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "CV_HAAR_SCALE_IMAGE", CV_HAAR_SCALE_IMAGE, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "CV_HAAR_FIND_BIGGEST_OBJECT", CV_HAAR_FIND_BIGGEST_OBJECT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "CV_HAAR_DO_ROUGH_SEARCH", CV_HAAR_DO_ROUGH_SEARCH, CONST_CS | CONST_PERSISTENT);
+}
+
 void opencv_objdetect_init(int module_number){
     opencv_cascade_classifier_init(module_number);
+    opencv_objdetect_constants_init(module_number);
 }
diff --git a/source/opencv2/opencv_videoio.cc b/source/opencv2/opencv_videoio.cc
@@ -16,6 +16,7 @@
 #include "../../php_opencv.h"
 #include "opencv_videoio.h"
 #include "../../opencv_exception.h"
+#include "core/opencv_mat.h"
 
 zend_class_entry *opencv_video_capture_ce;
 
@@ -95,7 +96,6 @@ PHP_METHOD(opencv_video_capture, open)
     }
     opencv_video_capture_object *obj = Z_PHP_VIDEO_CAPTURE_P(getThis());
     char *error_message;
-    VideoCapture *videoCapture;
     again:
     switch (Z_TYPE_P(zval1)) {
         case IS_LONG:
@@ -133,8 +133,44 @@ PHP_METHOD(opencv_video_capture, open)
             free(error_message);
             break;
     }
+}
 
-    obj->videoCapture = videoCapture;
+
+PHP_METHOD(opencv_video_capture, is_opened)
+{
+    opencv_video_capture_object *obj = Z_PHP_VIDEO_CAPTURE_P(getThis());
+    bool is_opend = obj->videoCapture->isOpened();
+    RETURN_BOOL(is_opend);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(opencv_video_capture_read_arginfo, 0, 0, 1)
+                ZEND_ARG_INFO(1, mat)
+ZEND_END_ARG_INFO()
+
+PHP_METHOD(opencv_video_capture, read)
+{
+    zval *mat_zval = NULL;
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &mat_zval) == FAILURE) {
+        RETURN_NULL();
+    }
+
+    zval *mat_real_zval = Z_REFVAL_P(mat_zval);
+    opencv_mat_object *real_object;
+    Mat mat;
+    if(Z_TYPE_P(mat_real_zval) == IS_OBJECT && Z_OBJCE_P(mat_real_zval)==opencv_mat_ce){
+        real_object = Z_PHP_MAT_OBJ_P(mat_real_zval);
+    }else{
+        zval instance;
+
+        object_init_ex(&instance,opencv_mat_ce);
+        ZVAL_COPY_VALUE(mat_real_zval, &instance);// Cover dst_real_zval by Mat object
+        real_object = Z_PHP_MAT_OBJ_P(mat_real_zval);
+    }
+    opencv_video_capture_object *this_object = Z_PHP_VIDEO_CAPTURE_P(getThis());
+    *(this_object->videoCapture) >> mat;
+    real_object->mat = new Mat(mat);
+    opencv_mat_update_property_by_c_mat(mat_real_zval, real_object->mat);
+    RETURN_NULL();
 }
 
 /**
@@ -143,6 +179,8 @@ PHP_METHOD(opencv_video_capture, open)
 const zend_function_entry opencv_video_capture_methods[] = {
         PHP_ME(opencv_video_capture, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
         PHP_ME(opencv_video_capture, open, NULL, ZEND_ACC_PUBLIC)
+        PHP_MALIAS(opencv_video_capture, isOpened ,is_opened, NULL, ZEND_ACC_PUBLIC)
+        PHP_ME(opencv_video_capture, read, opencv_video_capture_read_arginfo, ZEND_ACC_PUBLIC)
         PHP_FE_END
 };
 /* }}} */
diff --git a/tests/videoCapture.phpt b/tests/videoCapture.phpt

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,11 @@ PHP_FUNCTION(opencv_imwrite){`
`72`	`72`	`RETURN_NULL();`
`73`	`73`	`}`
`74`	`74`	`opencv_mat_object *obj = Z_PHP_MAT_OBJ_P(object);`
`75`		`- //todo throw exception can't save`
`76`		`- imwrite(filename,*(obj->mat));`
	`75`	`+ try {`
	`76`	`+ imwrite(filename,*obj->mat);`
	`77`	`+ }catch (Exception e){`
	`78`	`+ opencv_throw_exception(e.what());`
	`79`	`+ }`
`77`	`80`	`RETURN_TRUE;`
`78`	`81`	`}`
`79`	`82`