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

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

Browse Source
This commit is contained in:
Olexa Bilaniuk
2014-12-29 20:55:24 -05:00
parent bcc630a8dc 61991a3330
commit 46631c4b18
169 changed files with 4747 additions and 3490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/calib3d/include/opencv2/calib3d.hpp
View File

@@ -1855,4 +1855,8 @@ namespace fisheye
} // cv
#ifndef DISABLE_OPENCV_24_COMPATIBILITY
#include "opencv2/calib3d/calib3d_c.h"
#endif
#endif