Merge pull request #4186 from ultrafro:fix_setDepthGeneratorProperty_registration_flag_polarity

pull/4180/merge
Alexander Alekhin 9 years ago
commit f77926675f
  1. 4
      modules/videoio/src/cap_openni2.cpp

@ -567,13 +567,13 @@ bool CvCapture_OpenNI2::setDepthGeneratorProperty( int propIdx, double propValue
{ {
case CV_CAP_PROP_OPENNI_REGISTRATION: case CV_CAP_PROP_OPENNI_REGISTRATION:
{ {
if( propValue < 1.0 ) // "on" if( propValue != 0.0 ) // "on"
{ {
// if there isn't image generator (i.e. ASUS XtionPro doesn't have it) // if there isn't image generator (i.e. ASUS XtionPro doesn't have it)
// then the property isn't avaliable // then the property isn't avaliable
if ( color.isValid() ) if ( color.isValid() )
{ {
openni::ImageRegistrationMode mode = propValue < 1.0 ? openni::IMAGE_REGISTRATION_DEPTH_TO_COLOR : openni::IMAGE_REGISTRATION_OFF; openni::ImageRegistrationMode mode = propValue != 0.0 ? openni::IMAGE_REGISTRATION_DEPTH_TO_COLOR : openni::IMAGE_REGISTRATION_OFF;
if( !device.getImageRegistrationMode() == mode ) if( !device.getImageRegistrationMode() == mode )
{ {
if (device.isImageRegistrationModeSupported(mode)) if (device.isImageRegistrationModeSupported(mode))

Loading…
Cancel
Save