Make imgproc.hpp independent from C API
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#include <opencv2/imgproc/imgproc_c.h>
|
||||
#include <opencv2/legacy/legacy.hpp>
|
||||
#include "opencv2/highgui/highgui.hpp"
|
||||
#include <opencv2/highgui/highgui_c.h>
|
||||
#include <opencv2/legacy.hpp>
|
||||
|
||||
#include <stdio.h>
|
||||
static void help( void )
|
||||
|
||||
@@ -207,7 +207,7 @@ void detectAndDraw( Mat& img, CascadeClassifier& cascade,
|
||||
CV_RGB(255,0,255)} ;
|
||||
Mat gray, smallImg( cvRound (img.rows/scale), cvRound(img.cols/scale), CV_8UC1 );
|
||||
|
||||
cvtColor( img, gray, CV_BGR2GRAY );
|
||||
cvtColor( img, gray, COLOR_BGR2GRAY );
|
||||
resize( gray, smallImg, smallImg.size(), 0, 0, INTER_LINEAR );
|
||||
equalizeHist( smallImg, smallImg );
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#include "opencv2/imgproc/imgproc.hpp"
|
||||
#include "opencv2/highgui/highgui.hpp"
|
||||
|
||||
#include "opencv2/imgproc/imgproc_c.h"
|
||||
#include "opencv2/highgui/highgui_c.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#include "opencv2/imgproc/imgproc.hpp"
|
||||
#include "opencv2/highgui/highgui.hpp"
|
||||
#include "opencv2/imgproc/imgproc_c.h"
|
||||
#include "opencv2/legacy/legacy.hpp"
|
||||
#include "opencv2/highgui/highgui_c.h"
|
||||
#include "opencv2/legacy.hpp"
|
||||
#include <stdio.h>
|
||||
|
||||
static void help(void)
|
||||
|
||||
@@ -167,7 +167,7 @@ void detectAndDraw( Mat& img, CascadeClassifier& cascade,
|
||||
CV_RGB(255,0,255)} ;
|
||||
Mat gray, smallImg( cvRound (img.rows/scale), cvRound(img.cols/scale), CV_8UC1 );
|
||||
|
||||
cvtColor( img, gray, CV_BGR2GRAY );
|
||||
cvtColor( img, gray, COLOR_BGR2GRAY );
|
||||
resize( gray, smallImg, smallImg.size(), 0, 0, INTER_LINEAR );
|
||||
equalizeHist( smallImg, smallImg );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user