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/ts/src/ts_func.cpp
+++ b/modules/ts/src/ts_func.cpp
@@ -2712,7 +2712,7 @@ Mat calcLaplaceKernel2D( int aperture_size )
    
    for( int i = 0; i < ksize; i++ )
        for( int j = 0; j < ksize; j++ )
-            kernel.at<float>(i, j) = kx[j]*ky[i] + kx[i]*ky[j];
+            kernel.at<float>(i, j) = (float)(kx[j]*ky[i] + kx[i]*ky[j]);
    
    return kernel;
 }