Skip to content

O
opencv
Commit b7a3204c authored by Joe Howse's avatar Joe Howse
Browse files
Options

const correctness in OpenNI and OpenNI2 getProperty

parent a963ade0
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
modules/videoio/src/cap_openni.cpp
View file @ b7a3204c
...@@ -477,11 +477,11 @@ protected: ...@@ -477,11 +477,11 @@ protected:
bool readCamerasParams(); bool readCamerasParams();
double getDepthGeneratorProperty(int propIdx); double getDepthGeneratorProperty(int propIdx) const;
bool setDepthGeneratorProperty(int propIdx, double propVal); bool setDepthGeneratorProperty(int propIdx, double propVal);
double getImageGeneratorProperty(int propIdx); double getImageGeneratorProperty(int propIdx) const;
bool setImageGeneratorProperty(int propIdx, double propVal); bool setImageGeneratorProperty(int propIdx, double propVal);
double getCommonProperty(int propIdx); double getCommonProperty(int propIdx) const;
bool setCommonProperty(int propIdx, double propVal); bool setCommonProperty(int propIdx, double propVal);
// OpenNI context // OpenNI context
...@@ -820,7 +820,7 @@ bool CvCapture_OpenNI::setProperty( int propIdx, double propValue ) ...@@ -820,7 +820,7 @@ bool CvCapture_OpenNI::setProperty( int propIdx, double propValue )
return isSet; return isSet;
} }
double CvCapture_OpenNI::getCommonProperty( int propIdx ) double CvCapture_OpenNI::getCommonProperty( int propIdx ) const
{ {
double propValue = 0; double propValue = 0;
...@@ -917,7 +917,7 @@ bool CvCapture_OpenNI::setCommonProperty( int propIdx, double propValue ) ...@@ -917,7 +917,7 @@ bool CvCapture_OpenNI::setCommonProperty( int propIdx, double propValue )
return isSet; return isSet;
} }
double CvCapture_OpenNI::getDepthGeneratorProperty( int propIdx ) double CvCapture_OpenNI::getDepthGeneratorProperty( int propIdx ) const
{ {
double propValue = 0; double propValue = 0;
if( !depthGenerator.IsValid() ) if( !depthGenerator.IsValid() )
...@@ -953,7 +953,7 @@ double CvCapture_OpenNI::getDepthGeneratorProperty( int propIdx ) ...@@ -953,7 +953,7 @@ double CvCapture_OpenNI::getDepthGeneratorProperty( int propIdx )
propValue = (double)depthFocalLength_VGA; propValue = (double)depthFocalLength_VGA;
break; break;
case CV_CAP_PROP_OPENNI_REGISTRATION : case CV_CAP_PROP_OPENNI_REGISTRATION :
propValue = depthGenerator.GetAlternativeViewPointCap().IsViewPointAs(imageGenerator) ? 1.0 : 0.0; propValue = depthGenerator.GetAlternativeViewPointCap().IsViewPointAs(const_cast<CvCapture_OpenNI *>(this)->imageGenerator) ? 1.0 : 0.0;
break; break;
case CV_CAP_PROP_POS_MSEC : case CV_CAP_PROP_POS_MSEC :
propValue = (double)depthGenerator.GetTimestamp(); propValue = (double)depthGenerator.GetTimestamp();
...@@ -1018,7 +1018,7 @@ bool CvCapture_OpenNI::setDepthGeneratorProperty( int propIdx, double propValue ...@@ -1018,7 +1018,7 @@ bool CvCapture_OpenNI::setDepthGeneratorProperty( int propIdx, double propValue
return isSet; return isSet;
} }
double CvCapture_OpenNI::getImageGeneratorProperty( int propIdx ) double CvCapture_OpenNI::getImageGeneratorProperty( int propIdx ) const
{ {
double propValue = 0.; double propValue = 0.;
if( !imageGenerator.IsValid() ) if( !imageGenerator.IsValid() )
......
modules/videoio/src/cap_openni2.cpp
View file @ b7a3204c
...@@ -124,11 +124,11 @@ protected: ...@@ -124,11 +124,11 @@ protected:
bool readCamerasParams(); bool readCamerasParams();
double getDepthGeneratorProperty(int propIdx); double getDepthGeneratorProperty(int propIdx) const;
bool setDepthGeneratorProperty(int propIdx, double propVal); bool setDepthGeneratorProperty(int propIdx, double propVal);
double getImageGeneratorProperty(int propIdx); double getImageGeneratorProperty(int propIdx) const;
bool setImageGeneratorProperty(int propIdx, double propVal); bool setImageGeneratorProperty(int propIdx, double propVal);
double getCommonProperty(int propIdx); double getCommonProperty(int propIdx) const;
bool setCommonProperty(int propIdx, double propVal); bool setCommonProperty(int propIdx, double propVal);
// OpenNI context // OpenNI context
...@@ -444,7 +444,7 @@ bool CvCapture_OpenNI2::setProperty( int propIdx, double propValue ) ...@@ -444,7 +444,7 @@ bool CvCapture_OpenNI2::setProperty( int propIdx, double propValue )
return isSet; return isSet;
} }
double CvCapture_OpenNI2::getCommonProperty( int propIdx ) double CvCapture_OpenNI2::getCommonProperty( int propIdx ) const
{ {
double propValue = 0; double propValue = 0;
...@@ -508,7 +508,7 @@ bool CvCapture_OpenNI2::setCommonProperty( int propIdx, double propValue ) ...@@ -508,7 +508,7 @@ bool CvCapture_OpenNI2::setCommonProperty( int propIdx, double propValue )
return isSet; return isSet;
} }
double CvCapture_OpenNI2::getDepthGeneratorProperty( int propIdx ) double CvCapture_OpenNI2::getDepthGeneratorProperty( int propIdx ) const
{ {
double propValue = 0; double propValue = 0;
if( !depth.isValid() ) if( !depth.isValid() )
...@@ -608,7 +608,7 @@ bool CvCapture_OpenNI2::setDepthGeneratorProperty( int propIdx, double propValue ...@@ -608,7 +608,7 @@ bool CvCapture_OpenNI2::setDepthGeneratorProperty( int propIdx, double propValue
return isSet; return isSet;
} }
double CvCapture_OpenNI2::getImageGeneratorProperty( int propIdx ) double CvCapture_OpenNI2::getImageGeneratorProperty( int propIdx ) const
{ {
double propValue = 0.; double propValue = 0.;
if( !color.isValid() ) if( !color.isValid() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment