Merge pull request #17 from TishoTM/master

OpenCV 3 Support

README.md

@@ -0,0 +1,4 @@
+# PHP-Facedetect
+A simple OpenCV wrapper for PHP to detect faces on images
+
+OpenCV 3 Support

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/opencv/cv.h"
+  SEARCH_FOR="/include/opencv2/core/core_c.h"
 
   if test -r $PHP_FACEDETECT/$SEARCH_FOR; then
     FACEDETECT_DIR=$PHP_FACEDETECT
@@ -24,8 +24,10 @@ if test "$PHP_FACEDETECT" != "no"; then
 
   PHP_ADD_INCLUDE($FACEDETECT_DIR/include)
 
-  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))
+  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))
 
   PHP_CHECK_LIBRARY(opencv_core, cvLoad,
   [

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("opencv/cv.h", "CFLAGS_FFACEDETECT")) {
+		CHECK_HEADER_ADD_INCLUDE("opencv2/core/core_c.h", "CFLAGS_FFACEDETECT")) {
 
 		AC_DEFINE("HAVE_FACEDETECT", 1);
 

facedetect.c

@@ -21,8 +21,12 @@
 #include "ext/standard/info.h"
 #include "php_facedetect.h"
 
-#include <opencv/cv.h>
-#include <opencv/highgui.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"
 
 /* {{{ facedetect_functions[]
  *
@@ -71,6 +75,8 @@ PHP_MINFO_FUNCTION(facedetect)
 }
 /* }}} */
 
+IplImage* cvLoadImage(char *file, int number);
+
 static void php_facedetect(INTERNAL_FUNCTION_PARAMETERS, int return_type)
 {
 	char *file, *casc;