From 0c49689bbb8e40d326a3d71c0767db727542a0d4 Mon Sep 17 00:00:00 2001 From: Vladimir Goncharov Date: Sun, 31 Dec 2017 20:31:48 +0200 Subject: [PATCH 1/4] Update README.md misprint --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bf6adc0..f63ab77 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ make install php.ini ``` -extension="opencv.so path" +extension="opencv.so" ``` ## Example @@ -149,4 +149,4 @@ result: 感谢[韩天峰](https://github.com/matyhtf)老大的指导， 感谢[盘古大叔](https://github.com/pangudashu)的[php7-internal](https://github.com/pangudashu/php7-internal)项目以及平常的指导， -感谢`木桶技术升级交流群`和`黑夜路人技术群`、以及`PHP内核交流`的群友对技术的帮助。 \ No newline at end of file +感谢`木桶技术升级交流群`和`黑夜路人技术群`、以及`PHP内核交流`的群友对技术的帮助。 From e6ffb0d264cc398c44a5aa9f4385363d24715a7d Mon Sep 17 00:00:00 2001 From: Vladimir Goncharov Date: Mon, 1 Jan 2018 22:21:58 +0200 Subject: [PATCH 2/4] Update opencv_facerec.cc --- source/opencv2/face/opencv_facerec.cc | 42 ++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/source/opencv2/face/opencv_facerec.cc b/source/opencv2/face/opencv_facerec.cc index feffcd6..a7ba613 100644 --- a/source/opencv2/face/opencv_facerec.cc +++ b/source/opencv2/face/opencv_facerec.cc @@ -114,6 +114,43 @@ PHP_METHOD(opencv_lbph_face_recognizer, predict) RETURN_LONG(predict_label); } +PHP_METHOD(opencv_lbph_face_recognizer, predictConfidence) +{ + zval *src_zval; + int label = 0; + double confidence = 0; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &src_zval, opencv_mat_ce) == FAILURE) { + RETURN_NULL(); + } + opencv_lbph_face_recognizer_object *obj = Z_PHP_LBPH_FACE_RECOGNIZER_OBJ_P(getThis()); + opencv_mat_object *src_object = Z_PHP_MAT_OBJ_P(src_zval); + obj->faceRecognizer->predict(*src_object->mat, label, confidence); + RETURN_DOUBLE(confidence); +} + +PHP_METHOD(opencv_lbph_face_recognizer, read) +{ + char *filename; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &filename) == FAILURE) { + RETURN_NULL(); + } + + opencv_lbph_face_recognizer_object *obj = Z_PHP_LBPH_FACE_RECOGNIZER_OBJ_P(getThis()); + obj->faceRecognizer->read(filename); + RETURN_NULL(); +} + +PHP_METHOD(opencv_lbph_face_recognizer, write) +{ + char *filename; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &filename) == FAILURE) { + RETURN_NULL(); + } + + opencv_lbph_face_recognizer_object *obj = Z_PHP_LBPH_FACE_RECOGNIZER_OBJ_P(getThis()); + obj->faceRecognizer->write(filename); + RETURN_NULL(); +} /** * opencv_lbph_face_recognizer_methods[] @@ -122,6 +159,9 @@ const zend_function_entry opencv_lbph_face_recognizer_methods[] = { PHP_ME(opencv_lbph_face_recognizer, create, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_ME(opencv_lbph_face_recognizer, train, NULL, ZEND_ACC_PUBLIC) PHP_ME(opencv_lbph_face_recognizer, predict, NULL, ZEND_ACC_PUBLIC) + PHP_ME(opencv_lbph_face_recognizer, predictConfidence, NULL, ZEND_ACC_PUBLIC) + PHP_ME(opencv_lbph_face_recognizer, read, NULL, ZEND_ACC_PUBLIC) + PHP_ME(opencv_lbph_face_recognizer, write, NULL, ZEND_ACC_PUBLIC) PHP_FE_END }; /* }}} */ @@ -198,4 +238,4 @@ void opencv_base_face_recognizer_init(int module_number){ } -#endif \ No newline at end of file +#endif From 9e9e40a17c28a4d9a3fa8058cff0e4ac99032609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=B5=B7=E6=B5=A9?= Date: Tue, 2 Jan 2018 10:10:57 +0800 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f63ab77..a526920 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ make install php.ini ``` -extension="opencv.so" +extension="your opencv.so path" ``` ## Example From 25c5f7f956a5ad9c8c768ae4d32e1d16aec84d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=B5=B7=E6=B5=A9?= Date: Tue, 2 Jan 2018 10:24:11 +0800 Subject: [PATCH 4/4] Update opencv_facerec.cc --- source/opencv2/face/opencv_facerec.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/source/opencv2/face/opencv_facerec.cc b/source/opencv2/face/opencv_facerec.cc index a7ba613..4d67570 100644 --- a/source/opencv2/face/opencv_facerec.cc +++ b/source/opencv2/face/opencv_facerec.cc @@ -159,6 +159,7 @@ const zend_function_entry opencv_lbph_face_recognizer_methods[] = { PHP_ME(opencv_lbph_face_recognizer, create, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_ME(opencv_lbph_face_recognizer, train, NULL, ZEND_ACC_PUBLIC) PHP_ME(opencv_lbph_face_recognizer, predict, NULL, ZEND_ACC_PUBLIC) + // todo PHP_ME(opencv_lbph_face_recognizer, predictConfidence, NULL, ZEND_ACC_PUBLIC) PHP_ME(opencv_lbph_face_recognizer, read, NULL, ZEND_ACC_PUBLIC) PHP_ME(opencv_lbph_face_recognizer, write, NULL, ZEND_ACC_PUBLIC)