From f33d90220d3deb2bc5e0e6404d947cb5fe5b2fb0 Mon Sep 17 00:00:00 2001 From: Marina Kolpakova Date: Fri, 15 Jun 2012 13:13:36 +0000 Subject: [PATCH] fixed "shadow" warnings in NVIDIA tests --- modules/gpu/test/nvidia/NCVAutoTestLister.hpp | 8 +++---- modules/gpu/test/nvidia/NCVTest.hpp | 4 ++-- modules/gpu/test/nvidia/TestCompact.cpp | 14 +++++------ modules/gpu/test/nvidia/TestDrawRects.cpp | 19 ++++++++------- .../nvidia/TestHaarCascadeApplication.cpp | 14 +++++------ .../gpu/test/nvidia/TestHaarCascadeLoader.cpp | 6 ++--- .../gpu/test/nvidia/TestHypothesesGrow.cpp | 24 +++++++++---------- modules/gpu/test/nvidia/TestIntegralImage.cpp | 12 +++++----- .../test/nvidia/TestIntegralImageSquared.cpp | 12 +++++----- modules/gpu/test/nvidia/TestRectStdDev.cpp | 20 ++++++++-------- modules/gpu/test/nvidia/TestTranspose.cpp | 12 +++++----- 11 files changed, 73 insertions(+), 72 deletions(-) diff --git a/modules/gpu/test/nvidia/NCVAutoTestLister.hpp b/modules/gpu/test/nvidia/NCVAutoTestLister.hpp index 72eb8affad..798c503335 100644 --- a/modules/gpu/test/nvidia/NCVAutoTestLister.hpp +++ b/modules/gpu/test/nvidia/NCVAutoTestLister.hpp @@ -26,11 +26,11 @@ class NCVAutoTestLister { public: - NCVAutoTestLister(std::string testSuiteName, OutputLevel outputLevel = OutputLevelCompact, NcvBool bStopOnFirstFail=false) + NCVAutoTestLister(std::string testSuiteName_, OutputLevel outputLevel_ = OutputLevelCompact, NcvBool bStopOnFirstFail_=false) : - testSuiteName(testSuiteName), - outputLevel(outputLevel), - bStopOnFirstFail(bStopOnFirstFail) + testSuiteName(testSuiteName_), + outputLevel(outputLevel_), + bStopOnFirstFail(bStopOnFirstFail_) { } diff --git a/modules/gpu/test/nvidia/NCVTest.hpp b/modules/gpu/test/nvidia/NCVTest.hpp index 94ec46ce6f..ada6c188d9 100644 --- a/modules/gpu/test/nvidia/NCVTest.hpp +++ b/modules/gpu/test/nvidia/NCVTest.hpp @@ -46,9 +46,9 @@ class NCVTestProvider : public INCVTest { public: - NCVTestProvider(std::string testName) + NCVTestProvider(std::string testName_) : - testName(testName) + testName(testName_) { int devId; ncvAssertPrintReturn(cudaSuccess == cudaGetDevice(&devId), "Error returned from cudaGetDevice", ); diff --git a/modules/gpu/test/nvidia/TestCompact.cpp b/modules/gpu/test/nvidia/TestCompact.cpp index 2882f7cad2..92ca73508c 100644 --- a/modules/gpu/test/nvidia/TestCompact.cpp +++ b/modules/gpu/test/nvidia/TestCompact.cpp @@ -12,14 +12,14 @@ #include "TestCompact.h" -TestCompact::TestCompact(std::string testName, NCVTestSourceProvider &src, - Ncv32u length, Ncv32u badElem, Ncv32u badElemPercentage) +TestCompact::TestCompact(std::string testName_, NCVTestSourceProvider &src_, + Ncv32u length_, Ncv32u badElem_, Ncv32u badElemPercentage_) : - NCVTestProvider(testName), - src(src), - length(length), - badElem(badElem), - badElemPercentage(badElemPercentage > 100 ? 100 : badElemPercentage) + NCVTestProvider(testName_), + src(src_), + length(length_), + badElem(badElem_), + badElemPercentage(badElemPercentage_ > 100 ? 100 : badElemPercentage_) { } diff --git a/modules/gpu/test/nvidia/TestDrawRects.cpp b/modules/gpu/test/nvidia/TestDrawRects.cpp index b86ac58b15..b063293317 100644 --- a/modules/gpu/test/nvidia/TestDrawRects.cpp +++ b/modules/gpu/test/nvidia/TestDrawRects.cpp @@ -14,16 +14,17 @@ template -TestDrawRects::TestDrawRects(std::string testName, NCVTestSourceProvider &src, NCVTestSourceProvider &src32u, - Ncv32u width, Ncv32u height, Ncv32u numRects, T color) +TestDrawRects::TestDrawRects(std::string testName_, NCVTestSourceProvider &src_, + NCVTestSourceProvider &src32u_, + Ncv32u width_, Ncv32u height_, Ncv32u numRects_, T color_) : - NCVTestProvider(testName), - src(src), - src32u(src32u), - width(width), - height(height), - numRects(numRects), - color(color) + NCVTestProvider(testName_), + src(src_), + src32u(src32u_), + width(width_), + height(height_), + numRects(numRects_), + color(color_) { } diff --git a/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp b/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp index 1879b62dd3..1e8eaead03 100644 --- a/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp +++ b/modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp @@ -19,14 +19,14 @@ #include "NCVHaarObjectDetection.hpp" -TestHaarCascadeApplication::TestHaarCascadeApplication(std::string testName, NCVTestSourceProvider &src, - std::string cascadeName, Ncv32u width, Ncv32u height) +TestHaarCascadeApplication::TestHaarCascadeApplication(std::string testName_, NCVTestSourceProvider &src_, + std::string cascadeName_, Ncv32u width_, Ncv32u height_) : - NCVTestProvider(testName), - src(src), - cascadeName(cascadeName), - width(width), - height(height) + NCVTestProvider(testName_), + src(src_), + cascadeName(cascadeName_), + width(width_), + height(height_) { } diff --git a/modules/gpu/test/nvidia/TestHaarCascadeLoader.cpp b/modules/gpu/test/nvidia/TestHaarCascadeLoader.cpp index 8991e69cd8..ad1c953a63 100644 --- a/modules/gpu/test/nvidia/TestHaarCascadeLoader.cpp +++ b/modules/gpu/test/nvidia/TestHaarCascadeLoader.cpp @@ -13,10 +13,10 @@ #include "NCVHaarObjectDetection.hpp" -TestHaarCascadeLoader::TestHaarCascadeLoader(std::string testName, std::string cascadeName) +TestHaarCascadeLoader::TestHaarCascadeLoader(std::string testName_, std::string cascadeName_) : - NCVTestProvider(testName), - cascadeName(cascadeName) + NCVTestProvider(testName_), + cascadeName(cascadeName_) { } diff --git a/modules/gpu/test/nvidia/TestHypothesesGrow.cpp b/modules/gpu/test/nvidia/TestHypothesesGrow.cpp index 3ca076c973..2b0c34a15d 100644 --- a/modules/gpu/test/nvidia/TestHypothesesGrow.cpp +++ b/modules/gpu/test/nvidia/TestHypothesesGrow.cpp @@ -13,19 +13,19 @@ #include "NCVHaarObjectDetection.hpp" -TestHypothesesGrow::TestHypothesesGrow(std::string testName, NCVTestSourceProvider &src, - Ncv32u rectWidth, Ncv32u rectHeight, Ncv32f rectScale, - Ncv32u maxLenSrc, Ncv32u lenSrc, Ncv32u maxLenDst, Ncv32u lenDst) +TestHypothesesGrow::TestHypothesesGrow(std::string testName_, NCVTestSourceProvider &src_, + Ncv32u rectWidth_, Ncv32u rectHeight_, Ncv32f rectScale_, + Ncv32u maxLenSrc_, Ncv32u lenSrc_, Ncv32u maxLenDst_, Ncv32u lenDst_) : - NCVTestProvider(testName), - src(src), - rectWidth(rectWidth), - rectHeight(rectHeight), - rectScale(rectScale), - maxLenSrc(maxLenSrc), - lenSrc(lenSrc), - maxLenDst(maxLenDst), - lenDst(lenDst) + NCVTestProvider(testName_), + src(src_), + rectWidth(rectWidth_), + rectHeight(rectHeight_), + rectScale(rectScale_), + maxLenSrc(maxLenSrc_), + lenSrc(lenSrc_), + maxLenDst(maxLenDst_), + lenDst(lenDst_) { } diff --git a/modules/gpu/test/nvidia/TestIntegralImage.cpp b/modules/gpu/test/nvidia/TestIntegralImage.cpp index 47de70cb13..bff2aa53ae 100644 --- a/modules/gpu/test/nvidia/TestIntegralImage.cpp +++ b/modules/gpu/test/nvidia/TestIntegralImage.cpp @@ -14,13 +14,13 @@ template -TestIntegralImage::TestIntegralImage(std::string testName, NCVTestSourceProvider &src, - Ncv32u width, Ncv32u height) +TestIntegralImage::TestIntegralImage(std::string testName_, NCVTestSourceProvider &src_, + Ncv32u width_, Ncv32u height_) : - NCVTestProvider(testName), - src(src), - width(width), - height(height) + NCVTestProvider(testName_), + src(src_), + width(width_), + height(height_) { } diff --git a/modules/gpu/test/nvidia/TestIntegralImageSquared.cpp b/modules/gpu/test/nvidia/TestIntegralImageSquared.cpp index ec245934fd..0277f5e2e3 100644 --- a/modules/gpu/test/nvidia/TestIntegralImageSquared.cpp +++ b/modules/gpu/test/nvidia/TestIntegralImageSquared.cpp @@ -12,13 +12,13 @@ #include "TestIntegralImageSquared.h" -TestIntegralImageSquared::TestIntegralImageSquared(std::string testName, NCVTestSourceProvider &src, - Ncv32u width, Ncv32u height) +TestIntegralImageSquared::TestIntegralImageSquared(std::string testName_, NCVTestSourceProvider &src_, + Ncv32u width_, Ncv32u height_) : - NCVTestProvider(testName), - src(src), - width(width), - height(height) + NCVTestProvider(testName_), + src(src_), + width(width_), + height(height_) { } diff --git a/modules/gpu/test/nvidia/TestRectStdDev.cpp b/modules/gpu/test/nvidia/TestRectStdDev.cpp index 40a1ad7dac..f75433d8ed 100644 --- a/modules/gpu/test/nvidia/TestRectStdDev.cpp +++ b/modules/gpu/test/nvidia/TestRectStdDev.cpp @@ -14,17 +14,17 @@ #include "TestRectStdDev.h" -TestRectStdDev::TestRectStdDev(std::string testName, NCVTestSourceProvider &src, - Ncv32u width, Ncv32u height, NcvRect32u rect, Ncv32f scaleFactor, - NcvBool bTextureCache) +TestRectStdDev::TestRectStdDev(std::string testName_, NCVTestSourceProvider &src_, + Ncv32u width_, Ncv32u height_, NcvRect32u rect_, Ncv32f scaleFactor_, + NcvBool bTextureCache_) : - NCVTestProvider(testName), - src(src), - width(width), - height(height), - rect(rect), - scaleFactor(scaleFactor), - bTextureCache(bTextureCache) + NCVTestProvider(testName_), + src(src_), + width(width_), + height(height_), + rect(rect_), + scaleFactor(scaleFactor_), + bTextureCache(bTextureCache_) { } diff --git a/modules/gpu/test/nvidia/TestTranspose.cpp b/modules/gpu/test/nvidia/TestTranspose.cpp index aa131f867b..b4c65ea66d 100644 --- a/modules/gpu/test/nvidia/TestTranspose.cpp +++ b/modules/gpu/test/nvidia/TestTranspose.cpp @@ -15,13 +15,13 @@ template -TestTranspose::TestTranspose(std::string testName, NCVTestSourceProvider &src, - Ncv32u width, Ncv32u height) +TestTranspose::TestTranspose(std::string testName_, NCVTestSourceProvider &src_, + Ncv32u width_, Ncv32u height_) : - NCVTestProvider(testName), - src(src), - width(width), - height(height) + NCVTestProvider(testName_), + src(src_), + width(width_), + height(height_) { }