fix some function bug and add const

Author: hihozhou

source/opencv2/core/opencv_persistence.cc

@@ -42,7 +42,7 @@ zend_object* opencv_file_storage_create_handler(zend_class_entry *type){
  */
 PHP_METHOD(opencv_file_storage, __construct){
     char *source;
-    long source_len = 0, flags;
+    long source_len = 0, flags = FileStorage::READ;
     FileStorage *fs;
     if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sl", &source, &source_len, &flags) == FAILURE) {
         RETURN_NULL();
@@ -214,6 +214,16 @@ PHP_METHOD(opencv_file_storage, release){
     RETURN_NULL();
 }
 
+/**
+ * CV\FileStorage->isOpened()
+ * @param execute_data
+ * @param return_value
+ */
+PHP_METHOD(opencv_file_storage, is_opened){
+    opencv_file_storage_object *obj = Z_PHP_FILE_STORAGE_OBJ_P(getThis());
+    RETURN_BOOL(obj->fileStorage->isOpened());
+}
+
 /**
  * opencv_file_storage_methods[]
  */
@@ -223,6 +233,7 @@ const zend_function_entry opencv_file_storage_methods[] = {
         PHP_ME(opencv_file_storage, write, NULL, ZEND_ACC_PUBLIC)
         PHP_ME(opencv_file_storage, read, NULL, ZEND_ACC_PUBLIC)
         PHP_ME(opencv_file_storage, release, NULL, ZEND_ACC_PUBLIC)
+        PHP_MALIAS(opencv_file_storage, isOpened ,is_opened, NULL, ZEND_ACC_PUBLIC)
         PHP_FE_END
 };
 /* }}} */

source/opencv2/opencv_objdetect.cc

@@ -169,13 +169,20 @@ 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);
+
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "CASCADE_DO_CANNY_PRUNING", CASCADE_DO_CANNY_PRUNING, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "CASCADE_SCALE_IMAGE", CASCADE_SCALE_IMAGE, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "CASCADE_FIND_BIGGEST_OBJECT", CASCADE_FIND_BIGGEST_OBJECT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_NS_LONG_CONSTANT(OPENCV_NS, "CASCADE_DO_ROUGH_SEARCH", CASCADE_DO_ROUGH_SEARCH, CONST_CS | CONST_PERSISTENT);
 }
 
 void opencv_objdetect_init(int module_number){

source/opencv2/opencv_videoio.cc

@@ -171,10 +171,12 @@ PHP_METHOD(opencv_video_capture, read)
         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();
+    bool result = this_object->videoCapture->read(mat);
+    if(result){
+        real_object->mat = new Mat(mat);
+        opencv_mat_update_property_by_c_mat(mat_real_zval, real_object->mat);
+    }
+    RETURN_BOOL(result);
 }
 
 /**