Merge pull request #1566 from SpecLad:Wshadow-openni

801054d6 · Roman Donchenko · OpenCV Buildbot · 46eeb106 · 3cfad385 · 801054d6
Commit 801054d6 authored Oct 07, 2013 by Roman Donchenko Committed by OpenCV Buildbot Oct 07, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

cap_openni.cpp modules/highgui/src/cap_openni.cpp +3 -3

No files found.
--- 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 );