From ba1a1aecaad0ee27d960e7a242b64652bc626fb9 Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Tue, 9 Apr 2013 10:41:35 +0400
Subject: [PATCH] fixed gpu module compilation
---
modules/gpu/src/hough.cpp | 8 ++++----
modules/gpu/test/test_hough.cpp | 2 +-
samples/gpu/cascadeclassifier_nvidia_api.cpp | 10 +++++-----
samples/gpu/driver_api_stereo_multi.cpp | 4 ++--
samples/gpu/opticalflow_nvidia_api.cpp | 1 +
samples/gpu/stereo_multi.cpp | 4 ++--
6 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/modules/gpu/src/hough.cpp b/modules/gpu/src/hough.cpp
index dc6372b3a..0bdb28f2c 100644
--- a/modules/gpu/src/hough.cpp
+++ b/modules/gpu/src/hough.cpp
@@ -1334,19 +1334,19 @@ Ptr<GeneralizedHough_GPU> cv::gpu::GeneralizedHough_GPU::create(int method)
{
switch (method)
{
- case GHT_POSITION:
+ case cv::GeneralizedHough::GHT_POSITION:
CV_Assert( !GHT_Ballard_Pos_info_auto.name().empty() );
return new GHT_Ballard_Pos();
- case (GHT_POSITION | GHT_SCALE):
+ case (cv::GeneralizedHough::GHT_POSITION | cv::GeneralizedHough::GHT_SCALE):
CV_Assert( !GHT_Ballard_PosScale_info_auto.name().empty() );
return new GHT_Ballard_PosScale();
- case (GHT_POSITION | GHT_ROTATION):
+ case (cv::GeneralizedHough::GHT_POSITION | cv::GeneralizedHough::GHT_ROTATION):
CV_Assert( !GHT_Ballard_PosRotation_info_auto.name().empty() );
return new GHT_Ballard_PosRotation();
- case (GHT_POSITION | GHT_SCALE | GHT_ROTATION):
+ case (cv::GeneralizedHough::GHT_POSITION | cv::GeneralizedHough::GHT_SCALE | cv::GeneralizedHough::GHT_ROTATION):
CV_Assert( !GHT_Guil_Full_info_auto.name().empty() );
return new GHT_Guil_Full();
}
diff --git a/modules/gpu/test/test_hough.cpp b/modules/gpu/test/test_hough.cpp
index f876a7a2b..89f17573b 100644
--- a/modules/gpu/test/test_hough.cpp
+++ b/modules/gpu/test/test_hough.cpp
@@ -214,7 +214,7 @@ GPU_TEST_P(GeneralizedHough, POSITION)
templ.copyTo(imageROI);
}
- cv::Ptr<cv::gpu::GeneralizedHough_GPU> hough = cv::gpu::GeneralizedHough_GPU::create(cv::GHT_POSITION);
+ cv::Ptr<cv::gpu::GeneralizedHough_GPU> hough = cv::gpu::GeneralizedHough_GPU::create(cv::GeneralizedHough::GHT_POSITION);
hough->set("votesThreshold", 200);
hough->setTemplate(loadMat(templ, useRoi));
diff --git a/samples/gpu/cascadeclassifier_nvidia_api.cpp b/samples/gpu/cascadeclassifier_nvidia_api.cpp
index 99c95ab97..0c05499c8 100644
--- a/samples/gpu/cascadeclassifier_nvidia_api.cpp
+++ b/samples/gpu/cascadeclassifier_nvidia_api.cpp
@@ -27,7 +27,7 @@ int main( int, const char** )
const Size2i preferredVideoFrameSize(640, 480);
-const string wndTitle = "NVIDIA Computer Vision :: Haar Classifiers Cascade";
+const cv::String wndTitle = "NVIDIA Computer Vision :: Haar Classifiers Cascade";
static void matPrint(Mat &img, int lineOffsY, Scalar fontColor, const string &ss)
@@ -286,7 +286,7 @@ int main(int argc, const char** argv)
do
{
Mat gray;
- cvtColor((image.empty() ? frame : image), gray, CV_BGR2GRAY);
+ cvtColor((image.empty() ? frame : image), gray, cv::COLOR_BGR2GRAY);
//
// process
@@ -334,12 +334,12 @@ int main(int argc, const char** argv)
avgTime = (Ncv32f)ncvEndQueryTimerMs(timer);
- cvtColor(gray, frameDisp, CV_GRAY2BGR);
+ cvtColor(gray, frameDisp, cv::COLOR_GRAY2BGR);
displayState(frameDisp, bHelpScreen, bUseGPU, bLargestObject, bFilterRects, 1000.0f / avgTime);
imshow(wndTitle, frameDisp);
//handle input
- switch (cvWaitKey(3))
+ switch (cv::waitKey(3))
{
case ' ':
bUseGPU = !bUseGPU;
@@ -372,7 +372,7 @@ int main(int argc, const char** argv)
}
} while (!bQuit);
- cvDestroyWindow(wndTitle.c_str());
+ cv::destroyWindow(wndTitle);
return 0;
}
diff --git a/samples/gpu/driver_api_stereo_multi.cpp b/samples/gpu/driver_api_stereo_multi.cpp
index 338ef0ef6..d3dbf5809 100644
--- a/samples/gpu/driver_api_stereo_multi.cpp
+++ b/samples/gpu/driver_api_stereo_multi.cpp
@@ -124,12 +124,12 @@ int main(int argc, char** argv)
{
if (string(argv[i]) == "--left")
{
- left = imread(argv[++i], CV_LOAD_IMAGE_GRAYSCALE);
+ left = imread(argv[++i], cv::IMREAD_GRAYSCALE);
CV_Assert(!left.empty());
}
else if (string(argv[i]) == "--right")
{
- right = imread(argv[++i], CV_LOAD_IMAGE_GRAYSCALE);
+ right = imread(argv[++i], cv::IMREAD_GRAYSCALE);
CV_Assert(!right.empty());
}
else if (string(argv[i]) == "--help")
diff --git a/samples/gpu/opticalflow_nvidia_api.cpp b/samples/gpu/opticalflow_nvidia_api.cpp
index 05a37ef69..10663ce45 100644
--- a/samples/gpu/opticalflow_nvidia_api.cpp
+++ b/samples/gpu/opticalflow_nvidia_api.cpp
@@ -13,6 +13,7 @@
#include <iomanip>
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui/highgui_c.h"
#ifdef HAVE_CUDA
#include "NPP_staging/NPP_staging.hpp"
diff --git a/samples/gpu/stereo_multi.cpp b/samples/gpu/stereo_multi.cpp
index 7489ec060..2a3dec358 100644
--- a/samples/gpu/stereo_multi.cpp
+++ b/samples/gpu/stereo_multi.cpp
@@ -93,12 +93,12 @@ int main(int argc, char** argv)
{
if (string(argv[i]) == "--left")
{
- left = imread(argv[++i], CV_LOAD_IMAGE_GRAYSCALE);
+ left = imread(argv[++i], cv::IMREAD_GRAYSCALE);
CV_Assert(!left.empty());
}
else if (string(argv[i]) == "--right")
{
- right = imread(argv[++i], CV_LOAD_IMAGE_GRAYSCALE);
+ right = imread(argv[++i], cv::IMREAD_GRAYSCALE);
CV_Assert(!right.empty());
}
else if (string(argv[i]) == "--help")