From d65b3e06170e906a68d5f370501facf5ffaacd30 Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Wed, 5 Sep 2012 10:48:07 +0400 Subject: [PATCH] fix warning in CUDA samples --- modules/gpu/src/cuda/bf_knnmatch.cu | 2 +- modules/gpu/src/nvidia/core/NCV.hpp | 2 +- samples/gpu/cascadeclassifier_nvidia_api.cpp | 8 ++++---- samples/gpu/opticalflow_nvidia_api.cpp | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/gpu/src/cuda/bf_knnmatch.cu b/modules/gpu/src/cuda/bf_knnmatch.cu index 6a77873..b31f25c 100644 --- a/modules/gpu/src/cuda/bf_knnmatch.cu +++ b/modules/gpu/src/cuda/bf_knnmatch.cu @@ -1034,7 +1034,7 @@ namespace cv { namespace gpu { namespace device cudaSafeCall( cudaDeviceSynchronize() ); } - void findKnnMatchDispatcher(int k, const PtrStepSzb& trainIdx, const PtrStepSzb& distance, const PtrStepSzf& allDist, int cc, cudaStream_t stream) + void findKnnMatchDispatcher(int k, const PtrStepSzb& trainIdx, const PtrStepSzb& distance, const PtrStepSzf& allDist, int /*cc*/, cudaStream_t stream) { findKnnMatch<256>(k, static_cast(trainIdx), static_cast(distance), allDist, stream); } diff --git a/modules/gpu/src/nvidia/core/NCV.hpp b/modules/gpu/src/nvidia/core/NCV.hpp index ddac47c..26b1d4e 100644 --- a/modules/gpu/src/nvidia/core/NCV.hpp +++ b/modules/gpu/src/nvidia/core/NCV.hpp @@ -288,7 +288,7 @@ NCV_EXPORTS void ncvSetDebugOutputHandler(NCVDebugOutputHandler* func); do \ { \ cudaError_t res = cudacall; \ - ncvAssertPrintReturn(cudaSuccess==res, "cudaError_t=" << res, errCode); \ + ncvAssertPrintReturn(cudaSuccess==res, "cudaError_t=" << (int)res, errCode); \ } while (0) diff --git a/samples/gpu/cascadeclassifier_nvidia_api.cpp b/samples/gpu/cascadeclassifier_nvidia_api.cpp index da98643..99c95ab 100644 --- a/samples/gpu/cascadeclassifier_nvidia_api.cpp +++ b/samples/gpu/cascadeclassifier_nvidia_api.cpp @@ -30,7 +30,7 @@ const Size2i preferredVideoFrameSize(640, 480); const string wndTitle = "NVIDIA Computer Vision :: Haar Classifiers Cascade"; -void matPrint(Mat &img, int lineOffsY, Scalar fontColor, const string &ss) +static void matPrint(Mat &img, int lineOffsY, Scalar fontColor, const string &ss) { int fontFace = FONT_HERSHEY_DUPLEX; double fontScale = 0.8; @@ -45,7 +45,7 @@ void matPrint(Mat &img, int lineOffsY, Scalar fontColor, const string &ss) } -void displayState(Mat &canvas, bool bHelp, bool bGpu, bool bLargestFace, bool bFilter, double fps) +static void displayState(Mat &canvas, bool bHelp, bool bGpu, bool bLargestFace, bool bFilter, double fps) { Scalar fontColorRed = CV_RGB(255,0,0); Scalar fontColorNV = CV_RGB(118,185,0); @@ -74,7 +74,7 @@ void displayState(Mat &canvas, bool bHelp, bool bGpu, bool bLargestFace, bool bF } -NCVStatus process(Mat *srcdst, +static NCVStatus process(Mat *srcdst, Ncv32u width, Ncv32u height, NcvBool bFilterRects, NcvBool bLargestFace, HaarClassifierCascadeDescriptor &haar, @@ -281,7 +281,7 @@ int main(int argc, const char** argv) //============================================================================== namedWindow(wndTitle, 1); - Mat gray, frameDisp; + Mat frameDisp; do { diff --git a/samples/gpu/opticalflow_nvidia_api.cpp b/samples/gpu/opticalflow_nvidia_api.cpp index 8a149d7..05a37ef 100644 --- a/samples/gpu/opticalflow_nvidia_api.cpp +++ b/samples/gpu/opticalflow_nvidia_api.cpp @@ -59,7 +59,7 @@ public: class RgbToR { public: - float operator ()(unsigned char b, unsigned char g, unsigned char r) + float operator ()(unsigned char /*b*/, unsigned char /*g*/, unsigned char r) { return static_cast(r)/255.0f; } @@ -69,7 +69,7 @@ public: class RgbToG { public: - float operator ()(unsigned char b, unsigned char g, unsigned char r) + float operator ()(unsigned char /*b*/, unsigned char g, unsigned char /*r*/) { return static_cast(g)/255.0f; } @@ -78,7 +78,7 @@ public: class RgbToB { public: - float operator ()(unsigned char b, unsigned char g, unsigned char r) + float operator ()(unsigned char b, unsigned char /*g*/, unsigned char /*r*/) { return static_cast(b)/255.0f; } @@ -135,7 +135,7 @@ NCVStatus CopyData(const IplImage *image, const NCVMatrixAlloc &dst) return NCV_SUCCESS; } -NCVStatus LoadImages (const char *frame0Name, +static NCVStatus LoadImages (const char *frame0Name, const char *frame1Name, int &width, int &height, @@ -186,7 +186,7 @@ inline T MapValue (T x, T a, T b, T c, T d) return c + (d - c) * (x - a) / (b - a); } -NCVStatus ShowFlow (NCVMatrixAlloc &u, NCVMatrixAlloc &v, const char *name) +static NCVStatus ShowFlow (NCVMatrixAlloc &u, NCVMatrixAlloc &v, const char *name) { IplImage *flowField; @@ -246,7 +246,7 @@ NCVStatus ShowFlow (NCVMatrixAlloc &u, NCVMatrixAlloc &v, const return NCV_SUCCESS; } -IplImage *CreateImage (NCVMatrixAlloc &h_r, NCVMatrixAlloc &h_g, NCVMatrixAlloc &h_b) +static IplImage *CreateImage (NCVMatrixAlloc &h_r, NCVMatrixAlloc &h_g, NCVMatrixAlloc &h_b) { CvSize imageSize = cvSize (h_r.width (), h_r.height ()); IplImage *image = cvCreateImage (imageSize, IPL_DEPTH_8U, 4); @@ -270,7 +270,7 @@ IplImage *CreateImage (NCVMatrixAlloc &h_r, NCVMatrixAlloc &h_g, return image; } -void PrintHelp () +static void PrintHelp () { std::cout << "Usage help:\n"; std::cout << std::setiosflags(std::ios::left); @@ -286,7 +286,7 @@ void PrintHelp () std::cout << "\t" << std::setw(15) << PARAM_HELP << " - display this help message\n"; } -int ProcessCommandLine(int argc, char **argv, +static int ProcessCommandLine(int argc, char **argv, Ncv32f &timeStep, char *&frame0Name, char *&frame1Name, -- 2.7.4