From 3cfad385ec2687c71b462cba91e0fba5a2349b7e Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Fri, 4 Oct 2013 14:23:06 +0400 Subject: [PATCH] Fix a -Wshadow warning in cap_openni.cpp. --- modules/highgui/src/cap_openni.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/highgui/src/cap_openni.cpp b/modules/highgui/src/cap_openni.cpp index 59e19d14a3..51877128a3 100644 --- a/modules/highgui/src/cap_openni.cpp +++ b/modules/highgui/src/cap_openni.cpp @@ -310,15 +310,15 @@ private: class TBBApproximateSynchronizer: public ApproximateSynchronizerBase { public: - TBBApproximateSynchronizer( ApproximateSyncGrabber& approxSyncGrabber ) : - ApproximateSynchronizerBase(approxSyncGrabber) + TBBApproximateSynchronizer( ApproximateSyncGrabber& _approxSyncGrabber ) : + ApproximateSynchronizerBase(_approxSyncGrabber) { setMaxBufferSize(); } void setMaxBufferSize() { - int maxBufferSize = ApproximateSynchronizerBase::approxSyncGrabber.getMaxBufferSize(); + int maxBufferSize = approxSyncGrabber.getMaxBufferSize(); if( maxBufferSize >= 0 ) { depthQueue.set_capacity( maxBufferSize );