fixed ~300 warnings under windows (had to hack gtest a bit)

2011-05-06 21:45:48 +00:00
parent c67f1a2551
commit 1c18e5fef9
25 changed files with 87 additions and 46 deletions
--- a/modules/contrib/src/chamfermatching.cpp
+++ b/modules/contrib/src/chamfermatching.cpp
@@ -1113,7 +1113,7 @@ ChamferMatcher::Match* ChamferMatcher::Matching::localChamferDistance(Point offs
 		}

 		if (cnt_orientation>0) {
-                        cost = beta*cost+alpha*(sum_orientation/(2*CV_PI))/cnt_orientation;
+                        cost = (float)(beta*cost+alpha*(sum_orientation/(2*CV_PI))/cnt_orientation);
 		}

 	}