generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3550 from JoeHowse:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-12-30 11:10:02 +00:00
commit 2fd01ee24e
5 changed files with 29419 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13319
data/haarcascades/haarcascade_frontalcatface.xml Normal file
View File

File diff suppressed because it is too large Load Diff

12750
data/haarcascades/haarcascade_frontalcatface_extended.xml Normal file
View File

File diff suppressed because it is too large Load Diff

3336
data/lbpcascades/lbpcascade_frontalcatface.xml Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -477,11 +477,11 @@ protected:
bool readCamerasParams();
double getDepthGeneratorProperty(int propIdx);
double getDepthGeneratorProperty(int propIdx) const;
bool setDepthGeneratorProperty(int propIdx, double propVal);
double getImageGeneratorProperty(int propIdx);
double getImageGeneratorProperty(int propIdx) const;
bool setImageGeneratorProperty(int propIdx, double propVal);
double getCommonProperty(int propIdx);
double getCommonProperty(int propIdx) const;
bool setCommonProperty(int propIdx, double propVal);
// OpenNI context
@ -820,7 +820,7 @@ bool CvCapture_OpenNI::setProperty( int propIdx, double propValue )
return isSet;
}
double CvCapture_OpenNI::getCommonProperty( int propIdx )
double CvCapture_OpenNI::getCommonProperty( int propIdx ) const
{
double propValue = 0;
@ -917,7 +917,7 @@ bool CvCapture_OpenNI::setCommonProperty( int propIdx, double propValue )
return isSet;
}
double CvCapture_OpenNI::getDepthGeneratorProperty( int propIdx )
double CvCapture_OpenNI::getDepthGeneratorProperty( int propIdx ) const
{
double propValue = 0;
if( !depthGenerator.IsValid() )
@ -953,7 +953,7 @@ double CvCapture_OpenNI::getDepthGeneratorProperty( int propIdx )
propValue = (double)depthFocalLength_VGA;
break;
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;
case CV_CAP_PROP_POS_MSEC :
propValue = (double)depthGenerator.GetTimestamp();
@ -1018,7 +1018,7 @@ bool CvCapture_OpenNI::setDepthGeneratorProperty( int propIdx, double propValue
return isSet;
}
double CvCapture_OpenNI::getImageGeneratorProperty( int propIdx )
double CvCapture_OpenNI::getImageGeneratorProperty( int propIdx ) const
{
double propValue = 0.;
if( !imageGenerator.IsValid() )

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

@ -124,11 +124,11 @@ protected:
bool readCamerasParams();
double getDepthGeneratorProperty(int propIdx);
double getDepthGeneratorProperty(int propIdx) const;
bool setDepthGeneratorProperty(int propIdx, double propVal);
double getImageGeneratorProperty(int propIdx);
double getImageGeneratorProperty(int propIdx) const;
bool setImageGeneratorProperty(int propIdx, double propVal);
double getCommonProperty(int propIdx);
double getCommonProperty(int propIdx) const;
bool setCommonProperty(int propIdx, double propVal);
// OpenNI context
@ -444,7 +444,7 @@ bool CvCapture_OpenNI2::setProperty( int propIdx, double propValue )
return isSet;
}
double CvCapture_OpenNI2::getCommonProperty( int propIdx )
double CvCapture_OpenNI2::getCommonProperty( int propIdx ) const
{
double propValue = 0;
@ -466,7 +466,7 @@ double CvCapture_OpenNI2::getCommonProperty( int propIdx )
propValue = getDepthGeneratorProperty( propIdx );
break;
case CV_CAP_PROP_OPENNI2_SYNC :
propValue = device.getDepthColorSyncEnabled();
propValue = const_cast<CvCapture_OpenNI2 *>(this)->device.getDepthColorSyncEnabled();
case CV_CAP_PROP_OPENNI2_MIRROR:
{
bool isMirroring = color.getMirroringEnabled() && depth.getMirroringEnabled();
@ -508,7 +508,7 @@ bool CvCapture_OpenNI2::setCommonProperty( int propIdx, double propValue )
return isSet;
}
double CvCapture_OpenNI2::getDepthGeneratorProperty( int propIdx )
double CvCapture_OpenNI2::getDepthGeneratorProperty( int propIdx ) const
{
double propValue = 0;
if( !depth.isValid() )
@ -608,7 +608,7 @@ bool CvCapture_OpenNI2::setDepthGeneratorProperty( int propIdx, double propValue
return isSet;
}
double CvCapture_OpenNI2::getImageGeneratorProperty( int propIdx )
double CvCapture_OpenNI2::getImageGeneratorProperty( int propIdx ) const
{
double propValue = 0.;
if( !color.isValid() )