Merge pull request #3521 from ana-GT:registration_openni2

cc1090cf · Vadim Pisarevsky · bd4580a2 · 1ad1b737 · cc1090cf
Commit cc1090cf authored Jan 21, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cap_openni2.cpp modules/videoio/src/cap_openni2.cpp +1 -1

No files found.
--- a/modules/videoio/src/cap_openni2.cpp
+++ b/modules/videoio/src/cap_openni2.cpp
@@ -573,7 +573,7 @@ bool CvCapture_OpenNI2::setDepthGeneratorProperty( int propIdx, double propValue
                // then the property isn't avaliable
                if ( color.isValid() )
                {
-                    openni::ImageRegistrationMode mode = propValue < 1.0 ? openni::IMAGE_REGISTRATION_OFF : openni::IMAGE_REGISTRATION_DEPTH_TO_COLOR;
+                    openni::ImageRegistrationMode mode = propValue < 1.0 ? openni::IMAGE_REGISTRATION_DEPTH_TO_COLOR : openni::IMAGE_REGISTRATION_OFF;
                    if( !device.getImageRegistrationMode() == mode )
                    {
                        if (device.isImageRegistrationModeSupported(mode))