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

fixed "shadow" warnings in NVIDIA tests

Browse Source
This commit is contained in:
Marina Kolpakova 2012-06-15 13:13:36 +00:00
parent 2e2bd55729
commit f33d90220d
11 changed files with 73 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gpu/test/nvidia/NCVAutoTestLister.hpp
View File

@ -26,11 +26,11 @@ class NCVAutoTestLister
{ {
public: public:
NCVAutoTestLister(std::string testSuiteName, OutputLevel outputLevel = OutputLevelCompact, NcvBool bStopOnFirstFail=false) NCVAutoTestLister(std::string testSuiteName_, OutputLevel outputLevel_ = OutputLevelCompact, NcvBool bStopOnFirstFail_=false)
: :
testSuiteName(testSuiteName), testSuiteName(testSuiteName_),
outputLevel(outputLevel), outputLevel(outputLevel_),
bStopOnFirstFail(bStopOnFirstFail) bStopOnFirstFail(bStopOnFirstFail_)
{ {
} }

4
modules/gpu/test/nvidia/NCVTest.hpp
View File

@ -46,9 +46,9 @@ class NCVTestProvider : public INCVTest
{ {
public: public:
NCVTestProvider(std::string testName) NCVTestProvider(std::string testName_)
: :
testName(testName) testName(testName_)
{ {
int devId; int devId;
ncvAssertPrintReturn(cudaSuccess == cudaGetDevice(&devId), "Error returned from cudaGetDevice", ); ncvAssertPrintReturn(cudaSuccess == cudaGetDevice(&devId), "Error returned from cudaGetDevice", );

14
modules/gpu/test/nvidia/TestCompact.cpp
View File

@ -12,14 +12,14 @@
#include "TestCompact.h" #include "TestCompact.h"
TestCompact::TestCompact(std::string testName, NCVTestSourceProvider<Ncv32u> &src, TestCompact::TestCompact(std::string testName_, NCVTestSourceProvider<Ncv32u> &src_,
Ncv32u length, Ncv32u badElem, Ncv32u badElemPercentage) Ncv32u length_, Ncv32u badElem_, Ncv32u badElemPercentage_)
: :
NCVTestProvider(testName), NCVTestProvider(testName_),
src(src), src(src_),
length(length), length(length_),
badElem(badElem), badElem(badElem_),
badElemPercentage(badElemPercentage > 100 ? 100 : badElemPercentage) badElemPercentage(badElemPercentage_ > 100 ? 100 : badElemPercentage_)
{ {
} }

19
modules/gpu/test/nvidia/TestDrawRects.cpp
View File

@ -14,16 +14,17 @@
template <class T> template <class T>
TestDrawRects<T>::TestDrawRects(std::string testName, NCVTestSourceProvider<T> &src, NCVTestSourceProvider<Ncv32u> &src32u, TestDrawRects<T>::TestDrawRects(std::string testName_, NCVTestSourceProvider<T> &src_,
Ncv32u width, Ncv32u height, Ncv32u numRects, T color) NCVTestSourceProvider<Ncv32u> &src32u_,
Ncv32u width_, Ncv32u height_, Ncv32u numRects_, T color_)
: :
NCVTestProvider(testName), NCVTestProvider(testName_),
src(src), src(src_),
src32u(src32u), src32u(src32u_),
width(width), width(width_),
height(height), height(height_),
numRects(numRects), numRects(numRects_),
color(color) color(color_)
{ {
} }

14
modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp
View File

@ -19,14 +19,14 @@
#include "NCVHaarObjectDetection.hpp" #include "NCVHaarObjectDetection.hpp"
TestHaarCascadeApplication::TestHaarCascadeApplication(std::string testName, NCVTestSourceProvider<Ncv8u> &src, TestHaarCascadeApplication::TestHaarCascadeApplication(std::string testName_, NCVTestSourceProvider<Ncv8u> &src_,
std::string cascadeName, Ncv32u width, Ncv32u height) std::string cascadeName_, Ncv32u width_, Ncv32u height_)
: :
NCVTestProvider(testName), NCVTestProvider(testName_),
src(src), src(src_),
cascadeName(cascadeName), cascadeName(cascadeName_),
width(width), width(width_),
height(height) height(height_)
{ {
} }

6
modules/gpu/test/nvidia/TestHaarCascadeLoader.cpp
View File

@ -13,10 +13,10 @@
#include "NCVHaarObjectDetection.hpp" #include "NCVHaarObjectDetection.hpp"
TestHaarCascadeLoader::TestHaarCascadeLoader(std::string testName, std::string cascadeName) TestHaarCascadeLoader::TestHaarCascadeLoader(std::string testName_, std::string cascadeName_)
: :
NCVTestProvider(testName), NCVTestProvider(testName_),
cascadeName(cascadeName) cascadeName(cascadeName_)
{ {
} }

24
modules/gpu/test/nvidia/TestHypothesesGrow.cpp
View File

@ -13,19 +13,19 @@
#include "NCVHaarObjectDetection.hpp" #include "NCVHaarObjectDetection.hpp"
TestHypothesesGrow::TestHypothesesGrow(std::string testName, NCVTestSourceProvider<Ncv32u> &src, TestHypothesesGrow::TestHypothesesGrow(std::string testName_, NCVTestSourceProvider<Ncv32u> &src_,
Ncv32u rectWidth, Ncv32u rectHeight, Ncv32f rectScale, Ncv32u rectWidth_, Ncv32u rectHeight_, Ncv32f rectScale_,
Ncv32u maxLenSrc, Ncv32u lenSrc, Ncv32u maxLenDst, Ncv32u lenDst) Ncv32u maxLenSrc_, Ncv32u lenSrc_, Ncv32u maxLenDst_, Ncv32u lenDst_)
: :
NCVTestProvider(testName), NCVTestProvider(testName_),
src(src), src(src_),
rectWidth(rectWidth), rectWidth(rectWidth_),
rectHeight(rectHeight), rectHeight(rectHeight_),
rectScale(rectScale), rectScale(rectScale_),
maxLenSrc(maxLenSrc), maxLenSrc(maxLenSrc_),
lenSrc(lenSrc), lenSrc(lenSrc_),
maxLenDst(maxLenDst), maxLenDst(maxLenDst_),
lenDst(lenDst) lenDst(lenDst_)
{ {
} }

12
modules/gpu/test/nvidia/TestIntegralImage.cpp
View File

@ -14,13 +14,13 @@
template <class T_in, class T_out> template <class T_in, class T_out>
TestIntegralImage<T_in, T_out>::TestIntegralImage(std::string testName, NCVTestSourceProvider<T_in> &src, TestIntegralImage<T_in, T_out>::TestIntegralImage(std::string testName_, NCVTestSourceProvider<T_in> &src_,
Ncv32u width, Ncv32u height) Ncv32u width_, Ncv32u height_)
: :
NCVTestProvider(testName), NCVTestProvider(testName_),
src(src), src(src_),
width(width), width(width_),
height(height) height(height_)
{ {
} }

12
modules/gpu/test/nvidia/TestIntegralImageSquared.cpp
View File

@ -12,13 +12,13 @@
#include "TestIntegralImageSquared.h" #include "TestIntegralImageSquared.h"
TestIntegralImageSquared::TestIntegralImageSquared(std::string testName, NCVTestSourceProvider<Ncv8u> &src, TestIntegralImageSquared::TestIntegralImageSquared(std::string testName_, NCVTestSourceProvider<Ncv8u> &src_,
Ncv32u width, Ncv32u height) Ncv32u width_, Ncv32u height_)
: :
NCVTestProvider(testName), NCVTestProvider(testName_),
src(src), src(src_),
width(width), width(width_),
height(height) height(height_)
{ {
} }

20
modules/gpu/test/nvidia/TestRectStdDev.cpp
View File

@ -14,17 +14,17 @@
#include "TestRectStdDev.h" #include "TestRectStdDev.h"
TestRectStdDev::TestRectStdDev(std::string testName, NCVTestSourceProvider<Ncv8u> &src, TestRectStdDev::TestRectStdDev(std::string testName_, NCVTestSourceProvider<Ncv8u> &src_,
Ncv32u width, Ncv32u height, NcvRect32u rect, Ncv32f scaleFactor, Ncv32u width_, Ncv32u height_, NcvRect32u rect_, Ncv32f scaleFactor_,
NcvBool bTextureCache) NcvBool bTextureCache_)
: :
NCVTestProvider(testName), NCVTestProvider(testName_),
src(src), src(src_),
width(width), width(width_),
height(height), height(height_),
rect(rect), rect(rect_),
scaleFactor(scaleFactor), scaleFactor(scaleFactor_),
bTextureCache(bTextureCache) bTextureCache(bTextureCache_)
{ {
} }

12
modules/gpu/test/nvidia/TestTranspose.cpp
View File

@ -15,13 +15,13 @@
template <class T> template <class T>
TestTranspose<T>::TestTranspose(std::string testName, NCVTestSourceProvider<T> &src, TestTranspose<T>::TestTranspose(std::string testName_, NCVTestSourceProvider<T> &src_,
Ncv32u width, Ncv32u height) Ncv32u width_, Ncv32u height_)
: :
NCVTestProvider(testName), NCVTestProvider(testName_),
src(src), src(src_),
width(width), width(width_),
height(height) height(height_)
{ {
} }