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

added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-07-19 12:27:07 +00:00
parent 6bb1c07fd4
commit ff5e97c8e4
48 changed files with 443 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/contrib/src/chamfermatching.cpp
View File

@@ -736,7 +736,7 @@ float ChamferMatcher::Matching::getAngle(coordinate_t a, coordinate_t b, int& dx
void ChamferMatcher::Matching::findContourOrientations(const template_coords_t& coords, template_orientations_t& orientations)
{
const int M = 5;
int coords_size = coords.size();
int coords_size = (int)coords.size();
std::vector<float> angles(2*M);
orientations.insert(orientations.begin(), coords_size, float(-3*CV_PI)); // mark as invalid in the beginning
@@ -808,11 +808,12 @@ ChamferMatcher::Template::Template(Mat& edge_image, float scale_) : addr_width(-
size.width = max.x - min.x;
size.height = max.y - min.y;
int coords_size = (int)coords.size();
center.x /= (coords.size()==0?1:coords.size());
center.y /= (coords.size()==0?1:coords.size());
center.x /= MAX(coords_size, 1);
center.y /= MAX(coords_size, 1);
for (size_t i=0;i<coords.size();++i) {
for (int i=0;i<coords_size;++i) {
coords[i].first -= center.x;
coords[i].second -= center.y;
}