fixed warnings and errors reported by VS2010

2010-11-26 18:25:30 +00:00
parent 1618ed0a37
commit 01c1003d51
15 changed files with 24 additions and 17 deletions
--- a/modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d/features2d.hpp
@@ -1803,7 +1803,7 @@ struct CV_EXPORTS L2
        ResultType result = ResultType();
        for( int i = 0; i < size; i++ )
        {
-            ResultType diff = a[i] - b[i];
+            ResultType diff = (ResultType)(a[i] - b[i]);
            result += diff*diff;
        }
        return (ResultType)sqrt((double)result);