Merge remote-tracking branch 'upstream/master' into rho

This commit is contained in:
Olexa Bilaniuk
2014-12-05 15:56:33 -05:00
176 changed files with 15736 additions and 2133 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -50,6 +50,10 @@
extern "C" {
#endif
/** @addtogroup calib3d_c
@{
*/
/****************************************************************************************\
* Camera Calibration, Pose Estimation and Stereo *
\****************************************************************************************/
@@ -371,6 +375,8 @@ CVAPI(void) cvReprojectImageTo3D( const CvArr* disparityImage,
CvArr* _3dImage, const CvMat* Q,
int handleMissingValues CV_DEFAULT(0) );
/** @} calib3d_c */
#ifdef __cplusplus
} // extern "C"