From 2b106db02fcaf3b8cad46148210f788e6fae9202 Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Wed, 30 Oct 2013 13:34:27 +0100 Subject: [PATCH] Applied all fixes related to translating C to C++ code Also fixed some typos and code alignment Also adapted tutorial CPP samples Fixed some identation problems --- samples/cpp/3calibration.cpp | 2 +- .../OpenEXRimages_HDR_Retina_toneMapping.cpp | 6 +- ...EXRimages_HDR_Retina_toneMapping_video.cpp | 4 +- samples/cpp/Qt_sample/main.cpp | 55 +++++++++---------- samples/cpp/bagofwords_classification.cpp | 4 -- samples/cpp/bgfg_segm.cpp | 8 +-- samples/cpp/build3dmodel.cpp | 2 +- samples/cpp/calibration.cpp | 2 +- samples/cpp/camshiftdemo.cpp | 4 +- samples/cpp/chamfer.cpp | 2 +- samples/cpp/descriptor_extractor_matcher.cpp | 4 +- .../cpp/detection_based_tracker_sample.cpp | 2 +- samples/cpp/distrans.cpp | 2 +- samples/cpp/drawing.cpp | 4 +- samples/cpp/edge.cpp | 2 +- samples/cpp/em.cpp | 2 +- samples/cpp/fback.cpp | 6 +- samples/cpp/ffilldemo.cpp | 6 +- samples/cpp/generic_descriptor_match.cpp | 2 +- samples/cpp/grabcut.cpp | 8 +-- samples/cpp/houghcircles.cpp | 2 +- samples/cpp/houghlines.cpp | 2 +- samples/cpp/image.cpp | 2 +- samples/cpp/lkdemo.cpp | 2 +- samples/cpp/meanshift_segmentation.cpp | 2 +- samples/cpp/minarea.cpp | 2 +- samples/cpp/morphology2.cpp | 2 +- samples/cpp/pca.cpp | 2 +- samples/cpp/phase_corr.cpp | 2 +- samples/cpp/points_classifier.cpp | 14 ++--- samples/cpp/rgbdodometry.cpp | 4 +- samples/cpp/segment_objects.cpp | 2 - samples/cpp/stereo_calib.cpp | 4 +- .../HighGUI/BasicLinearTransformsTrackbar.cpp | 17 +++--- .../Histograms_Matching/EqualizeHist_Demo.cpp | 6 +- .../MatchTemplate_Demo.cpp | 4 +- .../calcBackProject_Demo1.cpp | 4 +- .../calcBackProject_Demo2.cpp | 4 +- .../Histograms_Matching/calcHist_Demo.cpp | 2 +- .../Histograms_Matching/compareHist_Demo.cpp | 46 ++++++++-------- .../tutorial_code/ImgProc/Morphology_1.cpp | 6 +- .../tutorial_code/ImgProc/Morphology_2.cpp | 10 ++-- .../cpp/tutorial_code/ImgProc/Pyramids.cpp | 2 +- .../cpp/tutorial_code/ImgProc/Smoothing.cpp | 4 +- .../cpp/tutorial_code/ImgProc/Threshold.cpp | 12 ++-- .../ImgTrans/CannyDetector_Demo.cpp | 4 +- .../ImgTrans/Geometric_Transforms_Demo.cpp | 6 +- .../ImgTrans/HoughCircle_Demo.cpp | 4 +- .../ImgTrans/HoughLines_Demo.cpp | 6 +- .../tutorial_code/ImgTrans/Laplace_Demo.cpp | 4 +- .../cpp/tutorial_code/ImgTrans/Remap_Demo.cpp | 2 +- .../cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp | 4 +- .../ImgTrans/copyMakeBorder_demo.cpp | 2 +- .../tutorial_code/ImgTrans/filter2D_demo.cpp | 2 +- .../ShapeDescriptors/findContours_demo.cpp | 6 +- .../generalContours_demo1.cpp | 6 +- .../generalContours_demo2.cpp | 6 +- .../ShapeDescriptors/hull_demo.cpp | 8 +-- .../ShapeDescriptors/moments_demo.cpp | 6 +- .../pointPolygonTest_demo.cpp | 4 +- .../TrackingMotion/cornerDetector_Demo.cpp | 6 +- .../TrackingMotion/cornerHarris_Demo.cpp | 6 +- .../TrackingMotion/cornerSubPix_Demo.cpp | 6 +- .../goodFeaturesToTrack_Demo.cpp | 6 +- .../camera_calibration/camera_calibration.cpp | 2 +- .../calib3d/stereoBM/SBM_Sample.cpp | 2 +- .../tutorial_code/core/Matrix/Drawing_1.cpp | 4 +- .../tutorial_code/core/Matrix/Drawing_2.cpp | 4 +- .../interoperability_with_OpenCV_1.cpp | 4 +- .../mat_mask_operations.cpp | 8 +-- .../features2D/SURF_Homography.cpp | 4 +- .../display_image/display_image.cpp | 2 +- .../windows_visual_studio_Opencv/Test.cpp | 10 ++-- .../objectDetection/objectDetection.cpp | 10 ++-- .../objectDetection/objectDetection2.cpp | 10 ++-- samples/cpp/video_dmtx.cpp | 2 +- samples/cpp/video_homography.cpp | 2 +- samples/cpp/watershed.cpp | 4 +- 78 files changed, 218 insertions(+), 230 deletions(-) diff --git a/samples/cpp/3calibration.cpp b/samples/cpp/3calibration.cpp index 061e977952..08ba397652 100644 --- a/samples/cpp/3calibration.cpp +++ b/samples/cpp/3calibration.cpp @@ -271,7 +271,7 @@ int main( int argc, char** argv ) { vector ptvec; imageSize = view.size(); - cvtColor(view, viewGray, CV_BGR2GRAY); + cvtColor(view, viewGray, COLOR_BGR2GRAY); bool found = findChessboardCorners( view, boardSize, ptvec, CV_CALIB_CB_ADAPTIVE_THRESH ); drawChessboardCorners( view, boardSize, Mat(ptvec), found ); diff --git a/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp b/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp index e89003d19a..be3dcd385a 100644 --- a/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp +++ b/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp @@ -1,10 +1,10 @@ //============================================================================ -// Name : HighDynamicRange_RetinaCompression.cpp +// Name : OpenEXRimages_HDR_Retina_toneMapping.cpp // Author : Alexandre Benoit (benoit.alexandre.vision@gmail.com) // Version : 0.1 // Copyright : Alexandre Benoit, LISTIC Lab, july 2011 -// Description : HighDynamicRange compression (tone mapping) with the help of the Gipsa/Listic's retina in C++, Ansi-style +// Description : HighDynamicRange retina tone mapping with the help of the Gipsa/Listic's retina in C++, Ansi-style //============================================================================ #include @@ -69,7 +69,7 @@ static void drawPlot(const cv::Mat curve, const std::string figureTitle, const i { cv::Mat rgbIntImg; outputMat.convertTo(rgbIntImg, CV_8UC3); - cvtColor(rgbIntImg, intGrayImage, CV_BGR2GRAY); + cvtColor(rgbIntImg, intGrayImage, cv::COLOR_BGR2GRAY); } // get histogram density probability in order to cut values under above edges limits (here 5-95%)... usefull for HDR pixel errors cancellation diff --git a/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp b/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp index fc3ac83672..509f3e8779 100644 --- a/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp +++ b/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp @@ -4,7 +4,7 @@ // Author : Alexandre Benoit (benoit.alexandre.vision@gmail.com) // Version : 0.2 // Copyright : Alexandre Benoit, LISTIC Lab, december 2011 -// Description : HighDynamicRange compression (tone mapping) for image sequences with the help of the Gipsa/Listic's retina in C++, Ansi-style +// Description : HighDynamicRange retina tone mapping for image sequences with the help of the Gipsa/Listic's retina in C++, Ansi-style // Known issues: the input OpenEXR sequences can have bad computed pixels that should be removed // => a simple method consists of cutting histogram edges (a slider for this on the UI is provided) // => however, in image sequences, this histogramm cut must be done in an elegant way from frame to frame... still not done... @@ -92,7 +92,7 @@ static void rescaleGrayLevelMat(const cv::Mat &inputMat, cv::Mat &outputMat, con { cv::Mat rgbIntImg; normalisedImage.convertTo(rgbIntImg, CV_8UC3); - cvtColor(rgbIntImg, intGrayImage, CV_BGR2GRAY); + cvtColor(rgbIntImg, intGrayImage, cv::COLOR_BGR2GRAY); } // get histogram density probability in order to cut values under above edges limits (here 5-95%)... usefull for HDR pixel errors cancellation diff --git a/samples/cpp/Qt_sample/main.cpp b/samples/cpp/Qt_sample/main.cpp index 105b973eb0..8794539408 100644 --- a/samples/cpp/Qt_sample/main.cpp +++ b/samples/cpp/Qt_sample/main.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #if defined WIN32 || defined _WIN32 || defined WINCE #include @@ -20,8 +20,7 @@ #include #endif -#include -#include +#include using namespace std; using namespace cv; @@ -111,12 +110,12 @@ static void initPOSIT(std::vector *modelPoints) modelPoints->push_back(cvPoint3D32f(0.0f, CUBE_SIZE, 0.0f)); } -static void foundCorners(vector *srcImagePoints,IplImage* source, IplImage* grayImage) +static void foundCorners(vector *srcImagePoints, const Mat& source, Mat& grayImage) { - cvCvtColor(source,grayImage,CV_RGB2GRAY); - cvSmooth( grayImage, grayImage,CV_GAUSSIAN,11); - cvNormalize(grayImage, grayImage, 0, 255, CV_MINMAX); - cvThreshold( grayImage, grayImage, 26, 255, CV_THRESH_BINARY_INV);//25 + cvtColor(source, grayImage, COLOR_RGB2GRAY); + GaussianBlur(grayImage, grayImage, Size(11,11), 0, 0); + normalize(grayImage, grayImage, 0, 255, NORM_MINMAX); + threshold(grayImage, grayImage, 26, 255, THRESH_BINARY_INV); //25 Mat MgrayImage = grayImage; //For debug @@ -189,8 +188,8 @@ static void foundCorners(vector *srcImagePoints,IplImage* source, for(size_t i = 0 ; iat(i),5,CV_RGB(255,0,0)); - putText( Msource, ss.str(), srcImagePoints->at(i),CV_FONT_HERSHEY_SIMPLEX,1,CV_RGB(255,0,0)); + circle(Msource,srcImagePoints->at(i),5,Scalar(0,0,255)); + putText(Msource,ss.str(),srcImagePoints->at(i),FONT_HERSHEY_SIMPLEX,1,Scalar(0,0,255)); ss.str(""); //new coordinate system in the middle of the frame and reversed (camera coordinate system) @@ -224,19 +223,19 @@ static void createOpenGLMatrixFrom(float *posePOSIT,const CvMatr32f &rotationMat int main(void) { help(); - CvCapture* video = cvCaptureFromFile("cube4.avi"); - CV_Assert(video); + VideoCapture video("cube4.avi"); + CV_Assert(video.isOpened()); - IplImage* source = cvCreateImage(cvGetSize(cvQueryFrame(video)),8,3); - IplImage* grayImage = cvCreateImage(cvGetSize(cvQueryFrame(video)),8,1); + Mat source, grayImage; - cvNamedWindow("original",CV_WINDOW_AUTOSIZE | CV_WINDOW_FREERATIO); - cvNamedWindow("POSIT",CV_WINDOW_AUTOSIZE | CV_WINDOW_FREERATIO); + video >> source; + + namedWindow("original", WINDOW_AUTOSIZE | CV_WINDOW_FREERATIO); + namedWindow("POSIT", WINDOW_AUTOSIZE | CV_WINDOW_FREERATIO); displayOverlay("POSIT", "We lost the 4 corners' detection quite often (the red circles disappear). This demo is only to illustrate how to use OpenGL callback.\n -- Press ESC to exit.", 10000); - //For debug - //cvNamedWindow("tempGray",CV_WINDOW_AUTOSIZE); + float OpenGLMatrix[]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; - cvSetOpenGlDrawCallback("POSIT",on_opengl,OpenGLMatrix); + setOpenGlDrawCallback("POSIT",on_opengl,OpenGLMatrix); vector modelPoints; initPOSIT(&modelPoints); @@ -251,26 +250,22 @@ int main(void) vector srcImagePoints(4,cvPoint2D32f(0,0)); - while(cvWaitKey(33) != 27) + while(waitKey(33) != 27) { - source=cvQueryFrame(video); - cvShowImage("original",source); + video >> source; + imshow("original",source); foundCorners(&srcImagePoints,source,grayImage); cvPOSIT( positObject, &srcImagePoints[0], FOCAL_LENGTH, criteria, rotation_matrix, translation_vector ); createOpenGLMatrixFrom(OpenGLMatrix,rotation_matrix,translation_vector); - cvShowImage("POSIT",source); - //For debug - //cvShowImage("tempGray",grayImage); + imshow("POSIT",source); - if (cvGetCaptureProperty(video,CV_CAP_PROP_POS_AVI_RATIO)>0.99) - cvSetCaptureProperty(video,CV_CAP_PROP_POS_AVI_RATIO,0); + if (VideoCapture::get(video,CV_CAP_PROP_POS_AVI_RATIO)>0.99) + VideoCapture::get(video,CV_CAP_PROP_POS_AVI_RATIO,0); } - cvDestroyAllWindows(); - cvReleaseImage(&grayImage); - cvReleaseCapture(&video); + destroyAllWindows(); cvReleasePOSITObject(&positObject); return 0; diff --git a/samples/cpp/bagofwords_classification.cpp b/samples/cpp/bagofwords_classification.cpp index e24a770f8e..39342c4d32 100644 --- a/samples/cpp/bagofwords_classification.cpp +++ b/samples/cpp/bagofwords_classification.cpp @@ -54,10 +54,6 @@ static void help(char** argv) << "\n"; } - - - - static void makeDir( const string& dir ) { #if defined WIN32 || defined _WIN32 diff --git a/samples/cpp/bgfg_segm.cpp b/samples/cpp/bgfg_segm.cpp index aff7d308e8..f0d313ef61 100644 --- a/samples/cpp/bgfg_segm.cpp +++ b/samples/cpp/bgfg_segm.cpp @@ -45,10 +45,10 @@ int main(int argc, const char** argv) return -1; } - namedWindow("image", CV_WINDOW_NORMAL); - namedWindow("foreground mask", CV_WINDOW_NORMAL); - namedWindow("foreground image", CV_WINDOW_NORMAL); - namedWindow("mean background image", CV_WINDOW_NORMAL); + namedWindow("image", WINDOW_NORMAL); + namedWindow("foreground mask", WINDOW_NORMAL); + namedWindow("foreground image", WINDOW_NORMAL); + namedWindow("mean background image", WINDOW_NORMAL); BackgroundSubtractorMOG2 bg_model;//(100, 3, 0.3, 5); diff --git a/samples/cpp/build3dmodel.cpp b/samples/cpp/build3dmodel.cpp index b896a39369..6700fcc6ba 100644 --- a/samples/cpp/build3dmodel.cpp +++ b/samples/cpp/build3dmodel.cpp @@ -418,7 +418,7 @@ static void build3dmodel( const Ptr& detector, for( size_t i = 0; i < nimages; i++ ) { Mat img = imread(imageList[i], 1), gray; - cvtColor(img, gray, CV_BGR2GRAY); + cvtColor(img, gray, COLOR_BGR2GRAY); vector keypoints; detector->detect(gray, keypoints); diff --git a/samples/cpp/calibration.cpp b/samples/cpp/calibration.cpp index f4ff81077b..2d2077646d 100644 --- a/samples/cpp/calibration.cpp +++ b/samples/cpp/calibration.cpp @@ -461,7 +461,7 @@ int main( int argc, char** argv ) flip( view, view, 0 ); vector pointbuf; - cvtColor(view, viewGray, CV_BGR2GRAY); + cvtColor(view, viewGray, COLOR_BGR2GRAY); bool found; switch( pattern ) diff --git a/samples/cpp/camshiftdemo.cpp b/samples/cpp/camshiftdemo.cpp index 0b17239edd..8a1ed19e7b 100644 --- a/samples/cpp/camshiftdemo.cpp +++ b/samples/cpp/camshiftdemo.cpp @@ -113,7 +113,7 @@ int main( int argc, const char** argv ) if( !paused ) { - cvtColor(image, hsv, CV_BGR2HSV); + cvtColor(image, hsv, COLOR_BGR2HSV); if( trackObject ) { @@ -163,7 +163,7 @@ int main( int argc, const char** argv ) } if( backprojMode ) - cvtColor( backproj, image, CV_GRAY2BGR ); + cvtColor( backproj, image, COLOR_GRAY2BGR ); ellipse( image, trackBox, Scalar(0,0,255), 3, CV_AA ); } } diff --git a/samples/cpp/chamfer.cpp b/samples/cpp/chamfer.cpp index 4be87cf768..f83a24f9cc 100644 --- a/samples/cpp/chamfer.cpp +++ b/samples/cpp/chamfer.cpp @@ -40,7 +40,7 @@ int main( int argc, const char** argv ) return -1; } Mat cimg; - cvtColor(img, cimg, CV_GRAY2BGR); + cvtColor(img, cimg, COLOR_GRAY2BGR); // if the image and the template are not edge maps but normal grayscale images, // you might want to uncomment the lines below to produce the maps. You can also diff --git a/samples/cpp/descriptor_extractor_matcher.cpp b/samples/cpp/descriptor_extractor_matcher.cpp index 7aa5299103..98c6452234 100644 --- a/samples/cpp/descriptor_extractor_matcher.cpp +++ b/samples/cpp/descriptor_extractor_matcher.cpp @@ -208,7 +208,7 @@ static void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective, matchesMask[i1] = 1; } // draw inliers - drawMatches( img1, keypoints1, img2, keypoints2, filteredMatches, drawImg, CV_RGB(0, 255, 0), CV_RGB(0, 0, 255), matchesMask + drawMatches( img1, keypoints1, img2, keypoints2, filteredMatches, drawImg, Scalar(0, 255, 0), Scalar(255, 0, 0), matchesMask #if DRAW_RICH_KEYPOINTS_MODE , DrawMatchesFlags::DRAW_RICH_KEYPOINTS #endif @@ -218,7 +218,7 @@ static void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective, // draw outliers for( size_t i1 = 0; i1 < matchesMask.size(); i1++ ) matchesMask[i1] = !matchesMask[i1]; - drawMatches( img1, keypoints1, img2, keypoints2, filteredMatches, drawImg, CV_RGB(0, 0, 255), CV_RGB(255, 0, 0), matchesMask, + drawMatches( img1, keypoints1, img2, keypoints2, filteredMatches, drawImg, Scalar(255, 0, 0), Scalar(0, 0, 255), matchesMask, DrawMatchesFlags::DRAW_OVER_OUTIMG | DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS ); #endif diff --git a/samples/cpp/detection_based_tracker_sample.cpp b/samples/cpp/detection_based_tracker_sample.cpp index 6aeb1b2454..4c922dee7c 100644 --- a/samples/cpp/detection_based_tracker_sample.cpp +++ b/samples/cpp/detection_based_tracker_sample.cpp @@ -116,7 +116,7 @@ static int test_FaceDetector(int argc, char *argv[]) LOGD("\n\nSTEP n=%d from prev step %f ms\n\n", n, t_ms); m=images[n-1]; CV_Assert(! m.empty()); - cvtColor(m, gray, CV_BGR2GRAY); + cvtColor(m, gray, COLOR_BGR2GRAY); fd.process(gray); diff --git a/samples/cpp/distrans.cpp b/samples/cpp/distrans.cpp index 4e3c3a2b0f..e10a963116 100644 --- a/samples/cpp/distrans.cpp +++ b/samples/cpp/distrans.cpp @@ -128,7 +128,7 @@ int main( int argc, const char** argv ) // Call to update the view onTrackbar(0, 0); - int c = cvWaitKey(0) & 255; + int c = waitKey(0) & 255; if( c == 27 ) break; diff --git a/samples/cpp/drawing.cpp b/samples/cpp/drawing.cpp index 5467463902..313f100ec8 100644 --- a/samples/cpp/drawing.cpp +++ b/samples/cpp/drawing.cpp @@ -157,14 +157,14 @@ int main() return 0; } - Size textsize = getTextSize("OpenCV forever!", CV_FONT_HERSHEY_COMPLEX, 3, 5, 0); + Size textsize = getTextSize("OpenCV forever!", FONT_HERSHEY_COMPLEX, 3, 5, 0); Point org((width - textsize.width)/2, (height - textsize.height)/2); Mat image2; for( i = 0; i < 255; i += 2 ) { image2 = image - Scalar::all(i); - putText(image2, "OpenCV forever!", org, CV_FONT_HERSHEY_COMPLEX, 3, + putText(image2, "OpenCV forever!", org, FONT_HERSHEY_COMPLEX, 3, Scalar(i, i, 255), 5, lineType); imshow(wndname, image2); diff --git a/samples/cpp/edge.cpp b/samples/cpp/edge.cpp index 6ff30a2cf9..f11d20fbb0 100644 --- a/samples/cpp/edge.cpp +++ b/samples/cpp/edge.cpp @@ -49,7 +49,7 @@ int main( int argc, const char** argv ) return -1; } cedge.create(image.size(), image.type()); - cvtColor(image, gray, CV_BGR2GRAY); + cvtColor(image, gray, COLOR_BGR2GRAY); // Create a window namedWindow("Edge map", 1); diff --git a/samples/cpp/em.cpp b/samples/cpp/em.cpp index 4c4664b8f8..ab7f27e835 100644 --- a/samples/cpp/em.cpp +++ b/samples/cpp/em.cpp @@ -59,7 +59,7 @@ int main( int /*argc*/, char** /*argv*/ ) params.cov_mat_type = CvEM::COV_MAT_DIAGONAL; params.start_step = CvEM::START_E_STEP; params.means = em_model.get_means(); - params.covs = (const CvMat**)em_model.get_covs(); + params.covs = em_model.get_covs(); params.weights = em_model.get_weights(); em_model2.train( samples, Mat(), params, &labels ); diff --git a/samples/cpp/fback.cpp b/samples/cpp/fback.cpp index 4923e8abcc..5293fd1f7f 100644 --- a/samples/cpp/fback.cpp +++ b/samples/cpp/fback.cpp @@ -42,13 +42,13 @@ int main(int, char**) for(;;) { cap >> frame; - cvtColor(frame, gray, CV_BGR2GRAY); + cvtColor(frame, gray, COLOR_BGR2GRAY); if( prevgray.data ) { calcOpticalFlowFarneback(prevgray, gray, flow, 0.5, 3, 15, 3, 5, 1.2, 0); - cvtColor(prevgray, cflow, CV_GRAY2BGR); - drawOptFlowMap(flow, cflow, 16, 1.5, CV_RGB(0, 255, 0)); + cvtColor(prevgray, cflow, COLOR_GRAY2BGR); + drawOptFlowMap(flow, cflow, 16, 1.5, Scalar(0, 255, 0)); imshow("flow", cflow); } if(waitKey(30)>=0) diff --git a/samples/cpp/ffilldemo.cpp b/samples/cpp/ffilldemo.cpp index a7fff778fd..fd697b23ae 100644 --- a/samples/cpp/ffilldemo.cpp +++ b/samples/cpp/ffilldemo.cpp @@ -81,7 +81,7 @@ int main( int argc, char** argv ) } help(); image0.copyTo(image); - cvtColor(image0, gray, CV_BGR2GRAY); + cvtColor(image0, gray, COLOR_BGR2GRAY); mask.create(image0.rows+2, image0.cols+2, CV_8UC1); namedWindow( "image", 0 ); @@ -106,7 +106,7 @@ int main( int argc, char** argv ) if( isColor ) { cout << "Grayscale mode is set\n"; - cvtColor(image0, gray, CV_BGR2GRAY); + cvtColor(image0, gray, COLOR_BGR2GRAY); mask = Scalar::all(0); isColor = false; } @@ -135,7 +135,7 @@ int main( int argc, char** argv ) case 'r': cout << "Original image is restored\n"; image0.copyTo(image); - cvtColor(image, gray, CV_BGR2GRAY); + cvtColor(image, gray, COLOR_BGR2GRAY); mask = Scalar::all(0); break; case 's': diff --git a/samples/cpp/generic_descriptor_match.cpp b/samples/cpp/generic_descriptor_match.cpp index c86fdeb351..1cb03c6a9c 100644 --- a/samples/cpp/generic_descriptor_match.cpp +++ b/samples/cpp/generic_descriptor_match.cpp @@ -79,7 +79,7 @@ Mat DrawCorrespondences(const Mat& img1, const vector& features1, cons for (size_t i = 0; i < features1.size(); i++) { - circle(img_corr, features1[i].pt, 3, CV_RGB(255, 0, 0)); + circle(img_corr, features1[i].pt, 3, Scalar(0, 0, 255)); } for (size_t i = 0; i < features2.size(); i++) diff --git a/samples/cpp/grabcut.cpp b/samples/cpp/grabcut.cpp index 40280e4570..b7d0d4dfd9 100644 --- a/samples/cpp/grabcut.cpp +++ b/samples/cpp/grabcut.cpp @@ -296,15 +296,15 @@ int main( int argc, char** argv ) help(); const string winName = "image"; - cvNamedWindow( winName.c_str(), CV_WINDOW_AUTOSIZE ); - cvSetMouseCallback( winName.c_str(), on_mouse, 0 ); + namedWindow( winName, WINDOW_AUTOSIZE ); + setMouseCallback( winName, on_mouse, 0 ); gcapp.setImageAndWinName( image, winName ); gcapp.showImage(); for(;;) { - int c = cvWaitKey(0); + int c = waitKey(0); switch( (char) c ) { case '\x1b': @@ -331,6 +331,6 @@ int main( int argc, char** argv ) } exit_main: - cvDestroyWindow( winName.c_str() ); + destroyWindow( winName ); return 0; } diff --git a/samples/cpp/houghcircles.cpp b/samples/cpp/houghcircles.cpp index bc53fd1249..a10e0d2d0e 100644 --- a/samples/cpp/houghcircles.cpp +++ b/samples/cpp/houghcircles.cpp @@ -27,7 +27,7 @@ int main(int argc, char** argv) Mat cimg; medianBlur(img, img, 5); - cvtColor(img, cimg, CV_GRAY2BGR); + cvtColor(img, cimg, COLOR_GRAY2BGR); vector circles; HoughCircles(img, circles, CV_HOUGH_GRADIENT, 1, 10, diff --git a/samples/cpp/houghlines.cpp b/samples/cpp/houghlines.cpp index 5ecc54ce18..681551acea 100644 --- a/samples/cpp/houghlines.cpp +++ b/samples/cpp/houghlines.cpp @@ -27,7 +27,7 @@ int main(int argc, char** argv) Mat dst, cdst; Canny(src, dst, 50, 200, 3); - cvtColor(dst, cdst, CV_GRAY2BGR); + cvtColor(dst, cdst, COLOR_GRAY2BGR); #if 0 vector lines; diff --git a/samples/cpp/image.cpp b/samples/cpp/image.cpp index 5647f1c785..41e2043c5e 100644 --- a/samples/cpp/image.cpp +++ b/samples/cpp/image.cpp @@ -109,7 +109,7 @@ int main( int argc, char** argv ) cvtColor(img_yuv, img, CV_YCrCb2BGR); // this is counterpart for cvNamedWindow - namedWindow("image with grain", CV_WINDOW_AUTOSIZE); + namedWindow("image with grain", WINDOW_AUTOSIZE); #if DEMO_MIXED_API_USE // this is to demonstrate that img and iplimg really share the data - the result of the above // processing is stored in img and thus in iplimg too. diff --git a/samples/cpp/lkdemo.cpp b/samples/cpp/lkdemo.cpp index bbb734cf3c..90078f3abf 100644 --- a/samples/cpp/lkdemo.cpp +++ b/samples/cpp/lkdemo.cpp @@ -71,7 +71,7 @@ int main( int argc, char** argv ) break; frame.copyTo(image); - cvtColor(image, gray, CV_BGR2GRAY); + cvtColor(image, gray, COLOR_BGR2GRAY); if( nightMode ) image = Scalar::all(0); diff --git a/samples/cpp/meanshift_segmentation.cpp b/samples/cpp/meanshift_segmentation.cpp index ce34f6ea7f..eb71619dad 100644 --- a/samples/cpp/meanshift_segmentation.cpp +++ b/samples/cpp/meanshift_segmentation.cpp @@ -65,7 +65,7 @@ int main(int argc, char** argv) colorRad = 10; maxPyrLevel = 1; - namedWindow( winName, CV_WINDOW_AUTOSIZE ); + namedWindow( winName, WINDOW_AUTOSIZE ); createTrackbar( "spatialRad", winName, &spatialRad, 80, meanShiftSegmentation ); createTrackbar( "colorRad", winName, &colorRad, 60, meanShiftSegmentation ); diff --git a/samples/cpp/minarea.cpp b/samples/cpp/minarea.cpp index 6056c39c45..c981c7faa3 100644 --- a/samples/cpp/minarea.cpp +++ b/samples/cpp/minarea.cpp @@ -54,7 +54,7 @@ int main( int /*argc*/, char** /*argv*/ ) imshow( "rect & circle", img ); - char key = (char)cvWaitKey(); + char key = (char)waitKey(); if( key == 27 || key == 'q' || key == 'Q' ) // 'ESC' break; } diff --git a/samples/cpp/morphology2.cpp b/samples/cpp/morphology2.cpp index d4ab351545..330f4e0643 100644 --- a/samples/cpp/morphology2.cpp +++ b/samples/cpp/morphology2.cpp @@ -79,7 +79,7 @@ int main( int argc, char** argv ) OpenClose(open_close_pos, 0); ErodeDilate(erode_dilate_pos, 0); - c = cvWaitKey(0); + c = waitKey(0); if( (char)c == 27 ) break; diff --git a/samples/cpp/pca.cpp b/samples/cpp/pca.cpp index ed23c7622b..be4e4a1086 100644 --- a/samples/cpp/pca.cpp +++ b/samples/cpp/pca.cpp @@ -159,7 +159,7 @@ int main(int argc, char** argv) // init highgui window string winName = "Reconstruction | press 'q' to quit"; - namedWindow(winName, CV_WINDOW_NORMAL); + namedWindow(winName, WINDOW_NORMAL); // params struct to pass to the trackbar handler params p; diff --git a/samples/cpp/phase_corr.cpp b/samples/cpp/phase_corr.cpp index e53f094311..8267d2ab3b 100644 --- a/samples/cpp/phase_corr.cpp +++ b/samples/cpp/phase_corr.cpp @@ -13,7 +13,7 @@ int main(int, char* []) do { video >> frame; - cvtColor(frame, curr, CV_RGB2GRAY); + cvtColor(frame, curr, COLOR_RGB2GRAY); if(prev.empty()) { diff --git a/samples/cpp/points_classifier.cpp b/samples/cpp/points_classifier.cpp index 8bc35e5541..e23b2768a9 100644 --- a/samples/cpp/points_classifier.cpp +++ b/samples/cpp/points_classifier.cpp @@ -7,7 +7,7 @@ using namespace std; using namespace cv; -const Scalar WHITE_COLOR = CV_RGB(255,255,255); +const Scalar WHITE_COLOR = Scalar(255,255,255); const string winName = "points"; const int testStep = 5; @@ -69,15 +69,15 @@ static void on_mouse( int event, int x, int y, int /*flags*/, void* ) // put the text stringstream text; text << "current class " << classColors.size()-1; - putText( img, text.str(), Point(10,25), CV_FONT_HERSHEY_SIMPLEX, 0.8f, WHITE_COLOR, 2 ); + putText( img, text.str(), Point(10,25), FONT_HERSHEY_SIMPLEX, 0.8f, WHITE_COLOR, 2 ); text.str(""); text << "total classes " << classColors.size(); - putText( img, text.str(), Point(10,50), CV_FONT_HERSHEY_SIMPLEX, 0.8f, WHITE_COLOR, 2 ); + putText( img, text.str(), Point(10,50), FONT_HERSHEY_SIMPLEX, 0.8f, WHITE_COLOR, 2 ); text.str(""); text << "total points " << trainedPoints.size(); - putText(img, text.str(), cvPoint(10,75), CV_FONT_HERSHEY_SIMPLEX, 0.8f, WHITE_COLOR, 2 ); + putText(img, text.str(), Point(10,75), FONT_HERSHEY_SIMPLEX, 0.8f, WHITE_COLOR, 2 ); // draw points for( size_t i = 0; i < trainedPoints.size(); i++ ) @@ -178,7 +178,7 @@ static void find_decision_boundary_SVM( CvSVMParams params ) for( int i = 0; i < svmClassifier.get_support_vector_count(); i++ ) { const float* supportVector = svmClassifier.get_support_vector(i); - circle( imgDst, Point(supportVector[0],supportVector[1]), 5, CV_RGB(255,255,255), -1 ); + circle( imgDst, Point(supportVector[0],supportVector[1]), 5, Scalar(255,255,255), -1 ); } } @@ -526,7 +526,7 @@ int main() { #if _NBC_ find_decision_boundary_NBC(); - cvNamedWindow( "NormalBayesClassifier", WINDOW_AUTOSIZE ); + namedWindow( "NormalBayesClassifier", WINDOW_AUTOSIZE ); imshow( "NormalBayesClassifier", imgDst ); #endif #if _KNN_ @@ -560,7 +560,7 @@ int main() params.C = 10; find_decision_boundary_SVM( params ); - cvNamedWindow( "classificationSVM2", WINDOW_AUTOSIZE ); + namedWindow( "classificationSVM2", WINDOW_AUTOSIZE ); imshow( "classificationSVM2", imgDst ); #endif diff --git a/samples/cpp/rgbdodometry.cpp b/samples/cpp/rgbdodometry.cpp index 660eb31d02..0db2fab847 100644 --- a/samples/cpp/rgbdodometry.cpp +++ b/samples/cpp/rgbdodometry.cpp @@ -125,8 +125,8 @@ int main(int argc, char** argv) } Mat grayImage0, grayImage1, depthFlt0, depthFlt1/*in meters*/; - cvtColor( colorImage0, grayImage0, CV_BGR2GRAY ); - cvtColor( colorImage1, grayImage1, CV_BGR2GRAY ); + cvtColor( colorImage0, grayImage0, COLOR_BGR2GRAY ); + cvtColor( colorImage1, grayImage1, COLOR_BGR2GRAY ); depth0.convertTo( depthFlt0, CV_32FC1, 1./1000 ); depth1.convertTo( depthFlt1, CV_32FC1, 1./1000 ); diff --git a/samples/cpp/segment_objects.cpp b/samples/cpp/segment_objects.cpp index 8195df65a3..6438b89492 100644 --- a/samples/cpp/segment_objects.cpp +++ b/samples/cpp/segment_objects.cpp @@ -95,8 +95,6 @@ int main(int argc, char** argv) if( !tmp_frame.data ) break; bgsubtractor(tmp_frame, bgmask, update_bg_model ? -1 : 0); - //CvMat _bgmask = bgmask; - //cvSegmentFGMask(&_bgmask); refineSegments(tmp_frame, bgmask, out_frame); imshow("video", tmp_frame); imshow("segmented", out_frame); diff --git a/samples/cpp/stereo_calib.cpp b/samples/cpp/stereo_calib.cpp index 92135d6eda..809f23bbda 100644 --- a/samples/cpp/stereo_calib.cpp +++ b/samples/cpp/stereo_calib.cpp @@ -118,7 +118,7 @@ StereoCalib(const vector& imagelist, Size boardSize, bool useCalibrated= { cout << filename << endl; Mat cimg, cimg1; - cvtColor(img, cimg, CV_GRAY2BGR); + cvtColor(img, cimg, COLOR_GRAY2BGR); drawChessboardCorners(cimg, boardSize, corners, found); double sf = 640./MAX(img.rows, img.cols); resize(cimg, cimg1, Size(), sf, sf); @@ -302,7 +302,7 @@ StereoCalib(const vector& imagelist, Size boardSize, bool useCalibrated= { Mat img = imread(goodImageList[i*2+k], 0), rimg, cimg; remap(img, rimg, rmap[k][0], rmap[k][1], CV_INTER_LINEAR); - cvtColor(rimg, cimg, CV_GRAY2BGR); + cvtColor(rimg, cimg, COLOR_GRAY2BGR); Mat canvasPart = !isVerticalStereo ? canvas(Rect(w*k, 0, w, h)) : canvas(Rect(0, h*k, w, h)); resize(cimg, canvasPart, canvasPart.size(), 0, 0, CV_INTER_AREA); if( useCalibrated ) diff --git a/samples/cpp/tutorial_code/HighGUI/BasicLinearTransformsTrackbar.cpp b/samples/cpp/tutorial_code/HighGUI/BasicLinearTransformsTrackbar.cpp index b344c96e04..88c1dd4968 100644 --- a/samples/cpp/tutorial_code/HighGUI/BasicLinearTransformsTrackbar.cpp +++ b/samples/cpp/tutorial_code/HighGUI/BasicLinearTransformsTrackbar.cpp @@ -24,17 +24,14 @@ Mat image; */ static void on_trackbar( int, void* ) { - Mat new_image = Mat::zeros( image.size(), image.type() ); + Mat new_image = Mat::zeros( image.size(), image.type() ); - for( int y = 0; y < image.rows; y++ ) - { for( int x = 0; x < image.cols; x++ ) - { for( int c = 0; c < 3; c++ ) - { - new_image.at(y,x)[c] = saturate_cast( alpha*( image.at(y,x)[c] ) + beta ); - } - } - } - imshow("New Image", new_image); + for( int y = 0; y < image.rows; y++ ) + for( int x = 0; x < image.cols; x++ ) + for( int c = 0; c < 3; c++ ) + new_image.at(y,x)[c] = saturate_cast( alpha*( image.at(y,x)[c] ) + beta ); + + imshow("New Image", new_image); } diff --git a/samples/cpp/tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp b/samples/cpp/tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp index 49e4be0e54..38a5839bb2 100644 --- a/samples/cpp/tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp +++ b/samples/cpp/tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp @@ -31,14 +31,14 @@ int main( int, char** argv ) } /// Convert to grayscale - cvtColor( src, src, CV_BGR2GRAY ); + cvtColor( src, src, COLOR_BGR2GRAY ); /// Apply Histogram Equalization equalizeHist( src, dst ); /// Display results - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); - namedWindow( equalized_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); + namedWindow( equalized_window, WINDOW_AUTOSIZE ); imshow( source_window, src ); imshow( equalized_window, dst ); diff --git a/samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp b/samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp index e3633576f8..ca318be552 100644 --- a/samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp +++ b/samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp @@ -33,8 +33,8 @@ int main( int, char** argv ) templ = imread( argv[2], 1 ); /// Create windows - namedWindow( image_window, CV_WINDOW_AUTOSIZE ); - namedWindow( result_window, CV_WINDOW_AUTOSIZE ); + namedWindow( image_window, WINDOW_AUTOSIZE ); + namedWindow( result_window, WINDOW_AUTOSIZE ); /// Create Trackbar const char* trackbar_label = "Method: \n 0: SQDIFF \n 1: SQDIFF NORMED \n 2: TM CCORR \n 3: TM CCORR NORMED \n 4: TM COEFF \n 5: TM COEFF NORMED"; diff --git a/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo1.cpp b/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo1.cpp index f422603749..86d2f2e154 100644 --- a/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo1.cpp +++ b/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo1.cpp @@ -28,7 +28,7 @@ int main( int, char** argv ) /// Read the image src = imread( argv[1], 1 ); /// Transform it to HSV - cvtColor( src, hsv, CV_BGR2HSV ); + cvtColor( src, hsv, COLOR_BGR2HSV ); /// Use only the Hue value hue.create( hsv.size(), hsv.depth() ); @@ -37,7 +37,7 @@ int main( int, char** argv ) /// Create Trackbar to enter the number of bins const char* window_image = "Source image"; - namedWindow( window_image, CV_WINDOW_AUTOSIZE ); + namedWindow( window_image, WINDOW_AUTOSIZE ); createTrackbar("* Hue bins: ", window_image, &bins, 180, Hist_and_Backproj ); Hist_and_Backproj(0, 0); diff --git a/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo2.cpp b/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo2.cpp index 42dd01a671..85f18db9f6 100644 --- a/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo2.cpp +++ b/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo2.cpp @@ -31,10 +31,10 @@ int main( int, char** argv ) /// Read the image src = imread( argv[1], 1 ); /// Transform it to HSV - cvtColor( src, hsv, CV_BGR2HSV ); + cvtColor( src, hsv, COLOR_BGR2HSV ); /// Show the image - namedWindow( window_image, CV_WINDOW_AUTOSIZE ); + namedWindow( window_image, WINDOW_AUTOSIZE ); imshow( window_image, src ); /// Set Trackbars for floodfill thresholds diff --git a/samples/cpp/tutorial_code/Histograms_Matching/calcHist_Demo.cpp b/samples/cpp/tutorial_code/Histograms_Matching/calcHist_Demo.cpp index d3af5e7a96..577c8a8b9c 100644 --- a/samples/cpp/tutorial_code/Histograms_Matching/calcHist_Demo.cpp +++ b/samples/cpp/tutorial_code/Histograms_Matching/calcHist_Demo.cpp @@ -71,7 +71,7 @@ int main( int, char** argv ) } /// Display - namedWindow("calcHist Demo", CV_WINDOW_AUTOSIZE ); + namedWindow("calcHist Demo", WINDOW_AUTOSIZE ); imshow("calcHist Demo", histImage ); waitKey(0); diff --git a/samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp b/samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp index b18aab2e8b..f4dd4e5e4e 100644 --- a/samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp +++ b/samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp @@ -22,24 +22,25 @@ int main( int argc, char** argv ) Mat src_test2, hsv_test2; Mat hsv_half_down; - /// Load three images with different environment settings - if( argc < 4 ) - { printf("** Error. Usage: ./compareHist_Demo \n"); - return -1; - } + /// Load three images with different environment settings + if( argc < 4 ) + { + printf("** Error. Usage: ./compareHist_Demo \n"); + return -1; + } - src_base = imread( argv[1], 1 ); - src_test1 = imread( argv[2], 1 ); - src_test2 = imread( argv[3], 1 ); + src_base = imread( argv[1], 1 ); + src_test1 = imread( argv[2], 1 ); + src_test2 = imread( argv[3], 1 ); - /// Convert to HSV - cvtColor( src_base, hsv_base, CV_BGR2HSV ); - cvtColor( src_test1, hsv_test1, CV_BGR2HSV ); - cvtColor( src_test2, hsv_test2, CV_BGR2HSV ); + /// Convert to HSV + cvtColor( src_base, hsv_base, COLOR_BGR2HSV ); + cvtColor( src_test1, hsv_test1, COLOR_BGR2HSV ); + cvtColor( src_test2, hsv_test2, COLOR_BGR2HSV ); - hsv_half_down = hsv_base( Range( hsv_base.rows/2, hsv_base.rows - 1 ), Range( 0, hsv_base.cols - 1 ) ); + hsv_half_down = hsv_base( Range( hsv_base.rows/2, hsv_base.rows - 1 ), Range( 0, hsv_base.cols - 1 ) ); - /// Using 30 bins for hue and 32 for saturation + /// Using 30 bins for hue and 32 for saturation int h_bins = 50; int s_bins = 60; int histSize[] = { h_bins, s_bins }; @@ -74,14 +75,15 @@ int main( int argc, char** argv ) /// Apply the histogram comparison methods for( int i = 0; i < 4; i++ ) - { int compare_method = i; - double base_base = compareHist( hist_base, hist_base, compare_method ); - double base_half = compareHist( hist_base, hist_half_down, compare_method ); - double base_test1 = compareHist( hist_base, hist_test1, compare_method ); - double base_test2 = compareHist( hist_base, hist_test2, compare_method ); - - printf( " Method [%d] Perfect, Base-Half, Base-Test(1), Base-Test(2) : %f, %f, %f, %f \n", i, base_base, base_half , base_test1, base_test2 ); - } + { + int compare_method = i; + double base_base = compareHist( hist_base, hist_base, compare_method ); + double base_half = compareHist( hist_base, hist_half_down, compare_method ); + double base_test1 = compareHist( hist_base, hist_test1, compare_method ); + double base_test2 = compareHist( hist_base, hist_test2, compare_method ); + + printf( " Method [%d] Perfect, Base-Half, Base-Test(1), Base-Test(2) : %f, %f, %f, %f \n", i, base_base, base_half , base_test1, base_test2 ); + } printf( "Done \n" ); diff --git a/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp b/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp index 47030fa4f4..13a96a1f51 100644 --- a/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp +++ b/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp @@ -37,9 +37,9 @@ int main( int, char** argv ) { return -1; } /// Create windows - namedWindow( "Erosion Demo", CV_WINDOW_AUTOSIZE ); - namedWindow( "Dilation Demo", CV_WINDOW_AUTOSIZE ); - cvMoveWindow( "Dilation Demo", src.cols, 0 ); + namedWindow( "Erosion Demo", WINDOW_AUTOSIZE ); + namedWindow( "Dilation Demo", WINDOW_AUTOSIZE ); + moveWindow( "Dilation Demo", src.cols, 0 ); /// Create Erosion Trackbar createTrackbar( "Element:\n 0: Rect \n 1: Cross \n 2: Ellipse", "Erosion Demo", diff --git a/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp b/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp index 2a1327d9df..a963bf83e6 100644 --- a/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp +++ b/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp @@ -39,20 +39,20 @@ int main( int, char** argv ) { return -1; } /// Create window - namedWindow( window_name, CV_WINDOW_AUTOSIZE ); + namedWindow( window_name, WINDOW_AUTOSIZE ); /// Create Trackbar to select Morphology operation createTrackbar("Operator:\n 0: Opening - 1: Closing \n 2: Gradient - 3: Top Hat \n 4: Black Hat", window_name, &morph_operator, max_operator, Morphology_Operations ); /// Create Trackbar to select kernel type createTrackbar( "Element:\n 0: Rect - 1: Cross - 2: Ellipse", window_name, - &morph_elem, max_elem, - Morphology_Operations ); + &morph_elem, max_elem, + Morphology_Operations ); /// Create Trackbar to choose kernel size createTrackbar( "Kernel size:\n 2n +1", window_name, - &morph_size, max_kernel_size, - Morphology_Operations ); + &morph_size, max_kernel_size, + Morphology_Operations ); /// Default start Morphology_Operations( 0, 0 ); diff --git a/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp b/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp index 0c90520956..fc98d1c21a 100644 --- a/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp +++ b/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp @@ -40,7 +40,7 @@ int main( void ) dst = tmp; /// Create window - namedWindow( window_name, CV_WINDOW_AUTOSIZE ); + namedWindow( window_name, WINDOW_AUTOSIZE ); imshow( window_name, dst ); /// Loop diff --git a/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp b/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp index 5f51d07d29..8513bcf76a 100644 --- a/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp +++ b/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp @@ -31,7 +31,7 @@ int display_dst( int delay ); */ int main( void ) { - namedWindow( window_name, CV_WINDOW_AUTOSIZE ); + namedWindow( window_name, WINDOW_AUTOSIZE ); /// Load the source image src = imread( "../images/lena.png", 1 ); @@ -89,7 +89,7 @@ int display_caption( const char* caption ) dst = Mat::zeros( src.size(), src.type() ); putText( dst, caption, Point( src.cols/4, src.rows/2), - CV_FONT_HERSHEY_COMPLEX, 1, Scalar(255, 255, 255) ); + FONT_HERSHEY_COMPLEX, 1, Scalar(255, 255, 255) ); imshow( window_name, dst ); int c = waitKey( DELAY_CAPTION ); diff --git a/samples/cpp/tutorial_code/ImgProc/Threshold.cpp b/samples/cpp/tutorial_code/ImgProc/Threshold.cpp index 7505ec297b..d98cc1182c 100644 --- a/samples/cpp/tutorial_code/ImgProc/Threshold.cpp +++ b/samples/cpp/tutorial_code/ImgProc/Threshold.cpp @@ -37,19 +37,19 @@ int main( int, char** argv ) src = imread( argv[1], 1 ); /// Convert the image to Gray - cvtColor( src, src_gray, CV_RGB2GRAY ); + cvtColor( src, src_gray, COLOR_RGB2GRAY ); /// Create a window to display results - namedWindow( window_name, CV_WINDOW_AUTOSIZE ); + namedWindow( window_name, WINDOW_AUTOSIZE ); /// Create Trackbar to choose type of Threshold createTrackbar( trackbar_type, - window_name, &threshold_type, - max_type, Threshold_Demo ); + window_name, &threshold_type, + max_type, Threshold_Demo ); createTrackbar( trackbar_value, - window_name, &threshold_value, - max_value, Threshold_Demo ); + window_name, &threshold_value, + max_value, Threshold_Demo ); /// Call the function to initialize Threshold_Demo( 0, 0 ); diff --git a/samples/cpp/tutorial_code/ImgTrans/CannyDetector_Demo.cpp b/samples/cpp/tutorial_code/ImgTrans/CannyDetector_Demo.cpp index c798f2fb42..7851c9f58b 100644 --- a/samples/cpp/tutorial_code/ImgTrans/CannyDetector_Demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/CannyDetector_Demo.cpp @@ -58,10 +58,10 @@ int main( int, char** argv ) dst.create( src.size(), src.type() ); /// Convert the image to grayscale - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); /// Create a window - namedWindow( window_name, CV_WINDOW_AUTOSIZE ); + namedWindow( window_name, WINDOW_AUTOSIZE ); /// Create a Trackbar for user to enter threshold createTrackbar( "Min Threshold:", window_name, &lowThreshold, max_lowThreshold, CannyThreshold ); diff --git a/samples/cpp/tutorial_code/ImgTrans/Geometric_Transforms_Demo.cpp b/samples/cpp/tutorial_code/ImgTrans/Geometric_Transforms_Demo.cpp index 2d18357202..0a2a2f5fa4 100644 --- a/samples/cpp/tutorial_code/ImgTrans/Geometric_Transforms_Demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/Geometric_Transforms_Demo.cpp @@ -65,13 +65,13 @@ int main( int, char** argv ) /// Show what you got - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); imshow( source_window, src ); - namedWindow( warp_window, CV_WINDOW_AUTOSIZE ); + namedWindow( warp_window, WINDOW_AUTOSIZE ); imshow( warp_window, warp_dst ); - namedWindow( warp_rotate_window, CV_WINDOW_AUTOSIZE ); + namedWindow( warp_rotate_window, WINDOW_AUTOSIZE ); imshow( warp_rotate_window, warp_rotate_dst ); /// Wait until user exits the program diff --git a/samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp b/samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp index 71d37fb7ac..da75026e4e 100644 --- a/samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp @@ -25,7 +25,7 @@ int main(int, char** argv) { return -1; } /// Convert it to gray - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); /// Reduce the noise so we avoid false circle detection GaussianBlur( src_gray, src_gray, Size(9, 9), 2, 2 ); @@ -47,7 +47,7 @@ int main(int, char** argv) } /// Show your results - namedWindow( "Hough Circle Transform Demo", CV_WINDOW_AUTOSIZE ); + namedWindow( "Hough Circle Transform Demo", WINDOW_AUTOSIZE ); imshow( "Hough Circle Transform Demo", src ); waitKey(0); diff --git a/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp b/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp index 561948a581..ee30771d50 100644 --- a/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp @@ -46,7 +46,7 @@ int main( int, char** argv ) } /// Pass the image to gray - cvtColor( src, src_gray, CV_RGB2GRAY ); + cvtColor( src, src_gray, COLOR_RGB2GRAY ); /// Apply Canny edge detector Canny( src_gray, edges, 50, 200, 3 ); @@ -55,10 +55,10 @@ int main( int, char** argv ) char thresh_label[50]; sprintf( thresh_label, "Thres: %d + input", min_threshold ); - namedWindow( standard_name, CV_WINDOW_AUTOSIZE ); + namedWindow( standard_name, WINDOW_AUTOSIZE ); createTrackbar( thresh_label, standard_name, &s_trackbar, max_trackbar, Standard_Hough); - namedWindow( probabilistic_name, CV_WINDOW_AUTOSIZE ); + namedWindow( probabilistic_name, WINDOW_AUTOSIZE ); createTrackbar( thresh_label, probabilistic_name, &p_trackbar, max_trackbar, Probabilistic_Hough); /// Initialize diff --git a/samples/cpp/tutorial_code/ImgTrans/Laplace_Demo.cpp b/samples/cpp/tutorial_code/ImgTrans/Laplace_Demo.cpp index 279dc6dcb6..f6dff102d8 100644 --- a/samples/cpp/tutorial_code/ImgTrans/Laplace_Demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/Laplace_Demo.cpp @@ -34,10 +34,10 @@ int main( int, char** argv ) GaussianBlur( src, src, Size(3,3), 0, 0, BORDER_DEFAULT ); /// Convert the image to grayscale - cvtColor( src, src_gray, CV_RGB2GRAY ); + cvtColor( src, src_gray, COLOR_RGB2GRAY ); /// Create window - namedWindow( window_name, CV_WINDOW_AUTOSIZE ); + namedWindow( window_name, WINDOW_AUTOSIZE ); /// Apply Laplace function Mat abs_dst; diff --git a/samples/cpp/tutorial_code/ImgTrans/Remap_Demo.cpp b/samples/cpp/tutorial_code/ImgTrans/Remap_Demo.cpp index 40e5118a6d..66ed0f387b 100644 --- a/samples/cpp/tutorial_code/ImgTrans/Remap_Demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/Remap_Demo.cpp @@ -34,7 +34,7 @@ int main( int, char** argv ) map_y.create( src.size(), CV_32FC1 ); /// Create window - namedWindow( remap_window, CV_WINDOW_AUTOSIZE ); + namedWindow( remap_window, WINDOW_AUTOSIZE ); /// Loop for(;;) diff --git a/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp b/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp index cbd03e8b98..f8c97c4117 100644 --- a/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp @@ -33,10 +33,10 @@ int main( int, char** argv ) GaussianBlur( src, src, Size(3,3), 0, 0, BORDER_DEFAULT ); /// Convert it to gray - cvtColor( src, src_gray, CV_RGB2GRAY ); + cvtColor( src, src_gray, COLOR_RGB2GRAY ); /// Create window - namedWindow( window_name, CV_WINDOW_AUTOSIZE ); + namedWindow( window_name, WINDOW_AUTOSIZE ); /// Generate grad_x and grad_y Mat grad_x, grad_y; diff --git a/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp b/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp index 0d84e738c5..0a441ccdfc 100644 --- a/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp @@ -43,7 +43,7 @@ int main( int, char** argv ) printf( " ** Press 'ESC' to exit the program \n"); /// Create window - namedWindow( window_name, CV_WINDOW_AUTOSIZE ); + namedWindow( window_name, WINDOW_AUTOSIZE ); /// Initialize arguments for the filter top = (int) (0.05*src.rows); bottom = (int) (0.05*src.rows); diff --git a/samples/cpp/tutorial_code/ImgTrans/filter2D_demo.cpp b/samples/cpp/tutorial_code/ImgTrans/filter2D_demo.cpp index 7a8dc768cf..86db4d8ed4 100644 --- a/samples/cpp/tutorial_code/ImgTrans/filter2D_demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/filter2D_demo.cpp @@ -35,7 +35,7 @@ int main ( int, char** argv ) { return -1; } /// Create window - namedWindow( window_name, CV_WINDOW_AUTOSIZE ); + namedWindow( window_name, WINDOW_AUTOSIZE ); /// Initialize arguments for the filter anchor = Point( -1, -1 ); diff --git a/samples/cpp/tutorial_code/ShapeDescriptors/findContours_demo.cpp b/samples/cpp/tutorial_code/ShapeDescriptors/findContours_demo.cpp index e301476ee7..bff125f2f0 100644 --- a/samples/cpp/tutorial_code/ShapeDescriptors/findContours_demo.cpp +++ b/samples/cpp/tutorial_code/ShapeDescriptors/findContours_demo.cpp @@ -30,12 +30,12 @@ int main( int, char** argv ) src = imread( argv[1], 1 ); /// Convert image to gray and blur it - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); blur( src_gray, src_gray, Size(3,3) ); /// Create Window const char* source_window = "Source"; - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); imshow( source_window, src ); createTrackbar( " Canny thresh:", "Source", &thresh, max_thresh, thresh_callback ); @@ -68,6 +68,6 @@ void thresh_callback(int, void* ) } /// Show in a window - namedWindow( "Contours", CV_WINDOW_AUTOSIZE ); + namedWindow( "Contours", WINDOW_AUTOSIZE ); imshow( "Contours", drawing ); } diff --git a/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo1.cpp b/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo1.cpp index b973cfd973..a752922736 100644 --- a/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo1.cpp +++ b/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo1.cpp @@ -30,12 +30,12 @@ int main( int, char** argv ) src = imread( argv[1], 1 ); /// Convert image to gray and blur it - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); blur( src_gray, src_gray, Size(3,3) ); /// Create Window const char* source_window = "Source"; - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); imshow( source_window, src ); createTrackbar( " Threshold:", "Source", &thresh, max_thresh, thresh_callback ); @@ -83,6 +83,6 @@ void thresh_callback(int, void* ) } /// Show in a window - namedWindow( "Contours", CV_WINDOW_AUTOSIZE ); + namedWindow( "Contours", WINDOW_AUTOSIZE ); imshow( "Contours", drawing ); } diff --git a/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo2.cpp b/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo2.cpp index 70d8663c9b..f21b7189fe 100644 --- a/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo2.cpp +++ b/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo2.cpp @@ -30,12 +30,12 @@ int main( int, char** argv ) src = imread( argv[1], 1 ); /// Convert image to gray and blur it - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); blur( src_gray, src_gray, Size(3,3) ); /// Create Window const char* source_window = "Source"; - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); imshow( source_window, src ); createTrackbar( " Threshold:", "Source", &thresh, max_thresh, thresh_callback ); @@ -85,6 +85,6 @@ void thresh_callback(int, void* ) } /// Show in a window - namedWindow( "Contours", CV_WINDOW_AUTOSIZE ); + namedWindow( "Contours", WINDOW_AUTOSIZE ); imshow( "Contours", drawing ); } diff --git a/samples/cpp/tutorial_code/ShapeDescriptors/hull_demo.cpp b/samples/cpp/tutorial_code/ShapeDescriptors/hull_demo.cpp index 8fe5d5b075..e38003e9a0 100644 --- a/samples/cpp/tutorial_code/ShapeDescriptors/hull_demo.cpp +++ b/samples/cpp/tutorial_code/ShapeDescriptors/hull_demo.cpp @@ -30,12 +30,12 @@ int main( int, char** argv ) src = imread( argv[1], 1 ); /// Convert image to gray and blur it - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); blur( src_gray, src_gray, Size(3,3) ); /// Create Window const char* source_window = "Source"; - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); imshow( source_window, src ); createTrackbar( " Threshold:", "Source", &thresh, max_thresh, thresh_callback ); @@ -62,7 +62,7 @@ void thresh_callback(int, void* ) findContours( threshold_output, contours, hierarchy, CV_RETR_TREE, CV_CHAIN_APPROX_SIMPLE, Point(0, 0) ); /// Find the convex hull object for each contour - vector >hull( contours.size() ); + vector >hull( contours.size() ); for( size_t i = 0; i < contours.size(); i++ ) { convexHull( Mat(contours[i]), hull[i], false ); } @@ -76,6 +76,6 @@ void thresh_callback(int, void* ) } /// Show in a window - namedWindow( "Hull demo", CV_WINDOW_AUTOSIZE ); + namedWindow( "Hull demo", WINDOW_AUTOSIZE ); imshow( "Hull demo", drawing ); } diff --git a/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp b/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp index 941edccd21..9f0d286b9e 100644 --- a/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp +++ b/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp @@ -30,12 +30,12 @@ int main( int, char** argv ) src = imread( argv[1], 1 ); /// Convert image to gray and blur it - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); blur( src_gray, src_gray, Size(3,3) ); /// Create Window const char* source_window = "Source"; - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); imshow( source_window, src ); createTrackbar( " Canny thresh:", "Source", &thresh, max_thresh, thresh_callback ); @@ -79,7 +79,7 @@ void thresh_callback(int, void* ) } /// Show in a window - namedWindow( "Contours", CV_WINDOW_AUTOSIZE ); + namedWindow( "Contours", WINDOW_AUTOSIZE ); imshow( "Contours", drawing ); /// Calculate the area with the moments 00 and compare with the result of the OpenCV function diff --git a/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp b/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp index 25195d3e49..f55f8f6879 100644 --- a/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp +++ b/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp @@ -71,9 +71,9 @@ int main( void ) /// Create Window and show your results const char* source_window = "Source"; - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); imshow( source_window, src ); - namedWindow( "Distance", CV_WINDOW_AUTOSIZE ); + namedWindow( "Distance", WINDOW_AUTOSIZE ); imshow( "Distance", drawing ); waitKey(0); diff --git a/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp b/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp index 5a37da4d4b..31c7004787 100644 --- a/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp +++ b/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp @@ -40,7 +40,7 @@ int main( int, char** argv ) { /// Load source image and convert it to gray src = imread( argv[1], 1 ); - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); /// Set some parameters int blockSize = 3; int apertureSize = 3; @@ -64,7 +64,7 @@ int main( int, char** argv ) minMaxLoc( Mc, &myHarris_minVal, &myHarris_maxVal, 0, 0, Mat() ); /* Create Window and Trackbar */ - namedWindow( myHarris_window, CV_WINDOW_AUTOSIZE ); + namedWindow( myHarris_window, WINDOW_AUTOSIZE ); createTrackbar( " Quality Level:", myHarris_window, &myHarris_qualityLevel, max_qualityLevel, myHarris_function ); myHarris_function( 0, 0 ); @@ -75,7 +75,7 @@ int main( int, char** argv ) minMaxLoc( myShiTomasi_dst, &myShiTomasi_minVal, &myShiTomasi_maxVal, 0, 0, Mat() ); /* Create Window and Trackbar */ - namedWindow( myShiTomasi_window, CV_WINDOW_AUTOSIZE ); + namedWindow( myShiTomasi_window, WINDOW_AUTOSIZE ); createTrackbar( " Quality Level:", myShiTomasi_window, &myShiTomasi_qualityLevel, max_qualityLevel, myShiTomasi_function ); myShiTomasi_function( 0, 0 ); diff --git a/samples/cpp/tutorial_code/TrackingMotion/cornerHarris_Demo.cpp b/samples/cpp/tutorial_code/TrackingMotion/cornerHarris_Demo.cpp index 667ad7e32a..e048f057b2 100644 --- a/samples/cpp/tutorial_code/TrackingMotion/cornerHarris_Demo.cpp +++ b/samples/cpp/tutorial_code/TrackingMotion/cornerHarris_Demo.cpp @@ -31,10 +31,10 @@ int main( int, char** argv ) { /// Load source image and convert it to gray src = imread( argv[1], 1 ); - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); /// Create a window and a trackbar - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); createTrackbar( "Threshold: ", source_window, &thresh, max_thresh, cornerHarris_demo ); imshow( source_window, src ); @@ -77,6 +77,6 @@ void cornerHarris_demo( int, void* ) } } /// Showing the result - namedWindow( corners_window, CV_WINDOW_AUTOSIZE ); + namedWindow( corners_window, WINDOW_AUTOSIZE ); imshow( corners_window, dst_norm_scaled ); } diff --git a/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp b/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp index 45da0f9559..f695a2830f 100644 --- a/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp +++ b/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp @@ -32,10 +32,10 @@ int main( int, char** argv ) { /// Load source image and convert it to gray src = imread( argv[1], 1 ); - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); /// Create Window - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); /// Create Trackbar to set the number of corners createTrackbar( "Max corners:", source_window, &maxCorners, maxTrackbar, goodFeaturesToTrack_Demo ); @@ -87,7 +87,7 @@ void goodFeaturesToTrack_Demo( int, void* ) { circle( copy, corners[i], r, Scalar(rng.uniform(0,255), rng.uniform(0,255), rng.uniform(0,255)), -1, 8, 0 ); } /// Show what you got - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); imshow( source_window, copy ); /// Set the neeed parameters to find the refined corners diff --git a/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp b/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp index f20669f2b2..b45d60a083 100644 --- a/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp +++ b/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp @@ -32,10 +32,10 @@ int main( int, char** argv ) { /// Load source image and convert it to gray src = imread( argv[1], 1 ); - cvtColor( src, src_gray, CV_BGR2GRAY ); + cvtColor( src, src_gray, COLOR_BGR2GRAY ); /// Create Window - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); /// Create Trackbar to set the number of corners createTrackbar( "Max corners:", source_window, &maxCorners, maxTrackbar, goodFeaturesToTrack_Demo ); @@ -87,6 +87,6 @@ void goodFeaturesToTrack_Demo( int, void* ) { circle( copy, corners[i], r, Scalar(rng.uniform(0,255), rng.uniform(0,255), rng.uniform(0,255)), -1, 8, 0 ); } /// Show what you got - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); imshow( source_window, copy ); } diff --git a/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp b/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp index 5cc15b3051..6df0c1677b 100644 --- a/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp +++ b/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp @@ -294,7 +294,7 @@ int main(int argc, char* argv[]) if( s.calibrationPattern == Settings::CHESSBOARD) { Mat viewGray; - cvtColor(view, viewGray, CV_BGR2GRAY); + cvtColor(view, viewGray, COLOR_BGR2GRAY); cornerSubPix( viewGray, pointBuf, Size(11,11), Size(-1,-1), TermCriteria( CV_TERMCRIT_EPS+CV_TERMCRIT_ITER, 30, 0.1 )); } diff --git a/samples/cpp/tutorial_code/calib3d/stereoBM/SBM_Sample.cpp b/samples/cpp/tutorial_code/calib3d/stereoBM/SBM_Sample.cpp index 13d5aa8708..9f87254769 100644 --- a/samples/cpp/tutorial_code/calib3d/stereoBM/SBM_Sample.cpp +++ b/samples/cpp/tutorial_code/calib3d/stereoBM/SBM_Sample.cpp @@ -56,7 +56,7 @@ int main( int argc, char** argv ) //-- 4. Display it as a CV_8UC1 image imgDisparity16S.convertTo( imgDisparity8U, CV_8UC1, 255/(maxVal - minVal)); - namedWindow( windowDisparity, CV_WINDOW_NORMAL ); + namedWindow( windowDisparity, WINDOW_NORMAL ); imshow( windowDisparity, imgDisparity8U ); //-- 5. Save the image diff --git a/samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp b/samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp index ef466e5f27..5cad99208c 100644 --- a/samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp +++ b/samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp @@ -64,9 +64,9 @@ int main( void ){ /// 3. Display your stuff! imshow( atom_window, atom_image ); - cvMoveWindow( atom_window, 0, 200 ); + moveWindow( atom_window, 0, 200 ); imshow( rook_window, rook_image ); - cvMoveWindow( rook_window, w, 200 ); + moveWindow( rook_window, w, 200 ); waitKey( 0 ); return(0); diff --git a/samples/cpp/tutorial_code/core/Matrix/Drawing_2.cpp b/samples/cpp/tutorial_code/core/Matrix/Drawing_2.cpp index c84eccb69e..844bcd27de 100644 --- a/samples/cpp/tutorial_code/core/Matrix/Drawing_2.cpp +++ b/samples/cpp/tutorial_code/core/Matrix/Drawing_2.cpp @@ -304,7 +304,7 @@ int Displaying_Random_Text( Mat image, char* window_name, RNG rng ) */ int Displaying_Big_End( Mat image, char* window_name, RNG ) { - Size textsize = getTextSize("OpenCV forever!", CV_FONT_HERSHEY_COMPLEX, 3, 5, 0); + Size textsize = getTextSize("OpenCV forever!", FONT_HERSHEY_COMPLEX, 3, 5, 0); Point org((window_width - textsize.width)/2, (window_height - textsize.height)/2); int lineType = 8; @@ -313,7 +313,7 @@ int Displaying_Big_End( Mat image, char* window_name, RNG ) for( int i = 0; i < 255; i += 2 ) { image2 = image - Scalar::all(i); - putText( image2, "OpenCV forever!", org, CV_FONT_HERSHEY_COMPLEX, 3, + putText( image2, "OpenCV forever!", org, FONT_HERSHEY_COMPLEX, 3, Scalar(i, i, 255), 5, lineType ); imshow( window_name, image2 ); diff --git a/samples/cpp/tutorial_code/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.cpp b/samples/cpp/tutorial_code/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.cpp index aeeaf21100..4a9be8dc1f 100644 --- a/samples/cpp/tutorial_code/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.cpp +++ b/samples/cpp/tutorial_code/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.cpp @@ -45,7 +45,7 @@ int main( int argc, char** argv ) // convert image to YUV color space. The output image will be created automatically. Mat I_YUV; - cvtColor(I, I_YUV, CV_BGR2YCrCb); + cvtColor(I, I_YUV, COLOR_BGR2YCrCb); vector planes; // Use the STL's vector structure to store multiple Mat objects split(I_YUV, planes); // split the image into separate color planes (Y U V) @@ -117,7 +117,7 @@ int main( int argc, char** argv ) cvtColor(I_YUV, I, CV_YCrCb2BGR); // and produce the output RGB image - namedWindow("image with grain", CV_WINDOW_AUTOSIZE); // use this to create images + namedWindow("image with grain", WINDOW_AUTOSIZE); // use this to create images #ifdef DEMO_MIXED_API_USE // this is to demonstrate that I and IplI really share the data - the result of the above diff --git a/samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp b/samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp index 555d668ece..a446cfd2b6 100644 --- a/samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp +++ b/samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp @@ -30,8 +30,8 @@ int main( int argc, char* argv[]) else I = imread( filename, CV_LOAD_IMAGE_COLOR); - namedWindow("Input", CV_WINDOW_AUTOSIZE); - namedWindow("Output", CV_WINDOW_AUTOSIZE); + namedWindow("Input", WINDOW_AUTOSIZE); + namedWindow("Output", WINDOW_AUTOSIZE); imshow("Input", I); double t = (double)getTickCount(); @@ -42,7 +42,7 @@ int main( int argc, char* argv[]) cout << "Hand written function times passed in seconds: " << t << endl; imshow("Output", J); - cvWaitKey(0); + waitKey(0); Mat kern = (Mat_(3,3) << 0, -1, 0, -1, 5, -1, @@ -54,7 +54,7 @@ int main( int argc, char* argv[]) imshow("Output", K); - cvWaitKey(0); + waitKey(0); return 0; } void Sharpen(const Mat& myImage,Mat& Result) diff --git a/samples/cpp/tutorial_code/features2D/SURF_Homography.cpp b/samples/cpp/tutorial_code/features2D/SURF_Homography.cpp index 506e3b44f2..4b29638a5f 100644 --- a/samples/cpp/tutorial_code/features2D/SURF_Homography.cpp +++ b/samples/cpp/tutorial_code/features2D/SURF_Homography.cpp @@ -95,8 +95,8 @@ int main( int argc, char** argv ) //-- Get the corners from the image_1 ( the object to be "detected" ) std::vector obj_corners(4); - obj_corners[0] = cvPoint(0,0); obj_corners[1] = cvPoint( img_object.cols, 0 ); - obj_corners[2] = cvPoint( img_object.cols, img_object.rows ); obj_corners[3] = cvPoint( 0, img_object.rows ); + obj_corners[0] = Point(0,0); obj_corners[1] = Point( img_object.cols, 0 ); + obj_corners[2] = Point( img_object.cols, img_object.rows ); obj_corners[3] = Point( 0, img_object.rows ); std::vector scene_corners(4); perspectiveTransform( obj_corners, scene_corners, H); diff --git a/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp b/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp index 8990bac28b..ef8abfd7f1 100644 --- a/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp +++ b/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp @@ -22,7 +22,7 @@ int main( int argc, char** argv ) return -1; } - namedWindow( "Display window", CV_WINDOW_AUTOSIZE );// Create a window for display. + namedWindow( "Display window", WINDOW_AUTOSIZE );// Create a window for display. imshow( "Display window", image ); // Show our image inside it. waitKey(0); // Wait for a keystroke in the window diff --git a/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp b/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp index cf35383560..240a2e198c 100644 --- a/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp +++ b/samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp @@ -74,10 +74,10 @@ int main(int argc, char *argv[]) const char* WIN_RF = "Reference"; // Windows - namedWindow(WIN_RF, CV_WINDOW_AUTOSIZE ); - namedWindow(WIN_UT, CV_WINDOW_AUTOSIZE ); - cvMoveWindow(WIN_RF, 400 , 0); //750, 2 (bernat =0) - cvMoveWindow(WIN_UT, refS.width, 0); //1500, 2 + namedWindow(WIN_RF, WINDOW_AUTOSIZE ); + namedWindow(WIN_UT, WINDOW_AUTOSIZE ); + moveWindow(WIN_RF, 400 , 0); //750, 2 (bernat =0) + moveWindow(WIN_UT, refS.width, 0); //1500, 2 cout << "Frame resolution: Width=" << refS.width << " Height=" << refS.height << " of nr#: " << captRefrnc.get(CV_CAP_PROP_FRAME_COUNT) << endl; @@ -124,7 +124,7 @@ int main(int argc, char *argv[]) imshow( WIN_RF, frameReference); imshow( WIN_UT, frameUnderTest); - c = (char)cvWaitKey(delay); + c = (char)waitKey(delay); if (c == 27) break; } diff --git a/samples/cpp/tutorial_code/objectDetection/objectDetection.cpp b/samples/cpp/tutorial_code/objectDetection/objectDetection.cpp index e20a7d4caa..c2465c40e1 100644 --- a/samples/cpp/tutorial_code/objectDetection/objectDetection.cpp +++ b/samples/cpp/tutorial_code/objectDetection/objectDetection.cpp @@ -30,7 +30,7 @@ RNG rng(12345); */ int main( void ) { - CvCapture* capture; + VideoCapture capture; Mat frame; //-- 1. Load the cascades @@ -38,12 +38,12 @@ int main( void ) if( !eyes_cascade.load( eyes_cascade_name ) ){ printf("--(!)Error loading\n"); return -1; }; //-- 2. Read the video stream - capture = cvCaptureFromCAM( -1 ); - if( capture ) + capture.open( -1 ); + if( capture.isOpened() ) { for(;;) { - frame = cvQueryFrame( capture ); + capture >> frame; //-- 3. Apply the classifier to the frame if( !frame.empty() ) @@ -67,7 +67,7 @@ void detectAndDisplay( Mat frame ) std::vector faces; Mat frame_gray; - cvtColor( frame, frame_gray, CV_BGR2GRAY ); + cvtColor( frame, frame_gray, COLOR_BGR2GRAY ); equalizeHist( frame_gray, frame_gray ); //-- Detect faces face_cascade.detectMultiScale( frame_gray, faces, 1.1, 2, 0|CV_HAAR_SCALE_IMAGE, Size(30, 30) ); diff --git a/samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp b/samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp index 75167f6128..bfa1f15388 100644 --- a/samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp +++ b/samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp @@ -30,7 +30,7 @@ RNG rng(12345); */ int main( void ) { - CvCapture* capture; + VideoCapture capture; Mat frame; //-- 1. Load the cascade @@ -38,12 +38,12 @@ int main( void ) if( !eyes_cascade.load( eyes_cascade_name ) ){ printf("--(!)Error loading\n"); return -1; }; //-- 2. Read the video stream - capture = cvCaptureFromCAM( -1 ); - if( capture ) + capture.open( -1 ); + if( capture.isOpened() ) { for(;;) { - frame = cvQueryFrame( capture ); + capture >> frame; //-- 3. Apply the classifier to the frame if( !frame.empty() ) @@ -67,7 +67,7 @@ void detectAndDisplay( Mat frame ) std::vector faces; Mat frame_gray; - cvtColor( frame, frame_gray, CV_BGR2GRAY ); + cvtColor( frame, frame_gray, COLOR_BGR2GRAY ); equalizeHist( frame_gray, frame_gray ); //-- Detect faces diff --git a/samples/cpp/video_dmtx.cpp b/samples/cpp/video_dmtx.cpp index 4d36a38139..01eadd42cd 100644 --- a/samples/cpp/video_dmtx.cpp +++ b/samples/cpp/video_dmtx.cpp @@ -52,7 +52,7 @@ namespace if (frame.empty()) break; cv::Mat gray; - cv::cvtColor(frame,gray,CV_RGB2GRAY); + cv::cvtColor(frame,gray,COLOR_RGB2GRAY); vector codes; Mat corners; findDataMatrix(gray, codes, corners); diff --git a/samples/cpp/video_homography.cpp b/samples/cpp/video_homography.cpp index 01af565c46..c8388007dd 100644 --- a/samples/cpp/video_homography.cpp +++ b/samples/cpp/video_homography.cpp @@ -161,7 +161,7 @@ int main(int ac, char ** av) if (frame.empty()) break; - cvtColor(frame, gray, CV_RGB2GRAY); + cvtColor(frame, gray, COLOR_RGB2GRAY); detector.detect(gray, query_kpts); //Find interest points diff --git a/samples/cpp/watershed.cpp b/samples/cpp/watershed.cpp index de7f5256f9..e251d5c4f9 100644 --- a/samples/cpp/watershed.cpp +++ b/samples/cpp/watershed.cpp @@ -58,8 +58,8 @@ int main( int argc, char** argv ) namedWindow( "image", 1 ); img0.copyTo(img); - cvtColor(img, markerMask, CV_BGR2GRAY); - cvtColor(markerMask, imgGray, CV_GRAY2BGR); + cvtColor(img, markerMask, COLOR_BGR2GRAY); + cvtColor(markerMask, imgGray, COLOR_GRAY2BGR); markerMask = Scalar::all(0); imshow( "image", img ); setMouseCallback( "image", onMouse, 0 );