Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3550 from JoeHowse:master

Browse Source
pull/3509/merge
Vadim Pisarevsky 10 years ago
parent 61991a3330 2d16026df6
commit 2fd01ee24e
5 changed files with 29419 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13319
      data/haarcascades/haarcascade_frontalcatface.xml
  2. 12750
      data/haarcascades/haarcascade_frontalcatface_extended.xml
  3. 3336
      data/lbpcascades/lbpcascade_frontalcatface.xml
  4. 14
      modules/videoio/src/cap_openni.cpp
  5. 14
      modules/videoio/src/cap_openni2.cpp

13319
data/haarcascades/haarcascade_frontalcatface.xml
View File

File diff suppressed because it is too large Load Diff

12750
data/haarcascades/haarcascade_frontalcatface_extended.xml
View File

File diff suppressed because it is too large Load Diff

3336
data/lbpcascades/lbpcascade_frontalcatface.xml
View File

File diff suppressed because it is too large Load Diff

14
modules/videoio/src/cap_openni.cpp
Unescape View File

@ -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 )
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 )
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 )
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
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() )

14
modules/videoio/src/cap_openni2.cpp
Unescape View File

@ -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 )
return isSet; return isSet;
} }
double CvCapture_OpenNI2::getCommonProperty( int propIdx ) double CvCapture_OpenNI2::getCommonProperty( int propIdx ) const
{ {
double propValue = 0; double propValue = 0;
@ -466,7 +466,7 @@ double CvCapture_OpenNI2::getCommonProperty( int propIdx )
propValue = getDepthGeneratorProperty( propIdx ); propValue = getDepthGeneratorProperty( propIdx );
break; break;
case CV_CAP_PROP_OPENNI2_SYNC : case CV_CAP_PROP_OPENNI2_SYNC :
propValue = device.getDepthColorSyncEnabled(); propValue = const_cast<CvCapture_OpenNI2 *>(this)->device.getDepthColorSyncEnabled();
case CV_CAP_PROP_OPENNI2_MIRROR: case CV_CAP_PROP_OPENNI2_MIRROR:
{ {
bool isMirroring = color.getMirroringEnabled() && depth.getMirroringEnabled(); bool isMirroring = color.getMirroringEnabled() && depth.getMirroringEnabled();
@ -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
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() )

Write Preview
Loading…
Cancel
Save