opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-19 19:44:14 +08:00
Code Issues Releases Wiki Activity

Enclose code in ccalib namespace. Switch defines to consts.

Browse Source
This commit is contained in:
Daniel Angelov
2014-09-05 15:38:35 +03:00
parent 9fb1a6dbc4
commit c5b57d0c58
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@
#include <vector>
namespace cv{
namespace cv{ namespace ccalib{
class CV_EXPORTS CustomPattern : public Algorithm
{
@@ -144,6 +144,6 @@ private:
void refineKeypointsPos(const Mat& img, std::vector<KeyPoint>& kp);
};
} // cv
}} // namespace ccalib, cv
#endif

18
modules/ccalib/src/ccalib.cpp
View File

@@ -55,17 +55,17 @@
#include <vector>
#include <cstring>
namespace cv{ namespace ccalib{
using namespace std;
#define MIN_CONTOUR_AREA_PX 100
#define MIN_CONTOUR_AREA_RATIO 0.2
#define MAX_CONTOUR_AREA_RATIO 5
const int MIN_CONTOUR_AREA_PX = 100;
const float MIN_CONTOUR_AREA_RATIO = 0.2;
const float MAX_CONTOUR_AREA_RATIO = 5.0;
#define MIN_POINTS_FOR_H 10
const int MIN_POINTS_FOR_H = 10;
#define MAX_PROJ_ERROR_PX 5.0
namespace cv{
const float MAX_PROJ_ERROR_PX = 5.0;
CustomPattern::CustomPattern()
{
@@ -487,8 +487,8 @@ void CustomPattern::drawOrientation(InputOutputArray image, InputArray tvec, Inp
img.copyTo(image);
}
} // namespace cv
}} // namespace ccalib, cv
#endif //_CPP
#endif // __OPENCV_CCALIB_CPP__
#endif // cplusplus