generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed gpu module compilation

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-04-09 10:41:35 +04:00
parent 913e6833d5
commit ba1a1aecaa
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/gpu/cascadeclassifier_nvidia_api.cpp
View File

@@ -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;
}

4
samples/gpu/driver_api_stereo_multi.cpp
View File

@@ -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")

1
samples/gpu/opticalflow_nvidia_api.cpp
View File

@@ -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"

4
samples/gpu/stereo_multi.cpp
View File

@@ -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")