1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
From f84448f210b7999fd94a6dd76ee2eec0f2eab600 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Thu, 7 Apr 2016 06:40:27 +0200
Subject: [PATCH] Revert "opencv3 support"
This reverts commit 2a5056742a038f0de419376738fef81a184323a0.
Until OpenCV 3 is in sid
---
config.m4 | 8 +++-----
config.w32 | 2 +-
facedetect.c | 10 ++--------
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/config.m4 b/config.m4
index 9bb60d8..1b58b07 100644
--- a/config.m4
+++ b/config.m4
@@ -2,7 +2,7 @@ PHP_ARG_WITH(facedetect, for facedetect support, [ --with-facedetect Enable
if test "$PHP_FACEDETECT" != "no"; then
SEARCH_PATH="/usr/local /usr /opt/local"
- SEARCH_FOR="/include/opencv2/core/core_c.h"
+ SEARCH_FOR="/include/opencv/cv.h"
if test -r $PHP_FACEDETECT/$SEARCH_FOR; then
FACEDETECT_DIR=$PHP_FACEDETECT
@@ -24,10 +24,8 @@ if test "$PHP_FACEDETECT" != "no"; then
PHP_ADD_INCLUDE($FACEDETECT_DIR/include)
- AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv2/core/core_c.h], [], AC_MSG_ERROR('opencv/core/core_c.h' header not found))
- AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv2/imgproc/imgproc_c.h], [], AC_MSG_ERROR('opencv/imgproc/imgproc_c.h' header not found))
- AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv2/photo/photo_c.h], [], AC_MSG_ERROR('opencv/photo/photo_c.h' header not found))
- AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv2/objdetect/objdetect_c.h], [], AC_MSG_ERROR('opencv/objdetect/objdetect_c.h' header not found))
+ AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv/cv.h], [], AC_MSG_ERROR('opencv/cv.h' header not found))
+ AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv/highgui.h], [], AC_MSG_ERROR('opencv/highgui.h' header not found))
PHP_CHECK_LIBRARY(opencv_core, cvLoad,
[
diff --git a/config.w32 b/config.w32
index 78306d1..1a79f55 100644
--- a/config.w32
+++ b/config.w32
@@ -8,7 +8,7 @@ if (PHP_FACEDETECT == "yes") {
CHECK_LIB("opencv_core*.lib", "facedetect", PHP_FACEDETECT) &&
CHECK_LIB("opencv_imgproc*.lib", "facedetect", PHP_FACEDETECT) &&
CHECK_LIB("opencv_highgui*.lib", "facedetect", PHP_FACEDETECT) &&
- CHECK_HEADER_ADD_INCLUDE("opencv2/core/core_c.h", "CFLAGS_FFACEDETECT")) {
+ CHECK_HEADER_ADD_INCLUDE("opencv/cv.h", "CFLAGS_FFACEDETECT")) {
AC_DEFINE("HAVE_FACEDETECT", 1);
diff --git a/facedetect.c b/facedetect.c
index 6bc73f6..32aa860 100644
--- a/facedetect.c
+++ b/facedetect.c
@@ -21,12 +21,8 @@
#include "ext/standard/info.h"
#include "php_facedetect.h"
-#include "opencv2/core/core_c.h"
-#include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/photo/photo_c.h"
-#include "opencv2/objdetect/objdetect_c.h"
-
-#include "opencv2/core/version.hpp"
+#include <opencv/cv.h>
+#include <opencv/highgui.h>
/* {{{ facedetect_functions[]
*
@@ -75,8 +71,6 @@ PHP_MINFO_FUNCTION(facedetect)
}
/* }}} */
-IplImage* cvLoadImage(char *file, int number);
-
static void php_facedetect(INTERNAL_FUNCTION_PARAMETERS, int return_type)
{
char *file, *casc;
--
2.8.0.rc3
|
