fix warnings under win
authormarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 24 Dec 2012 11:28:05 +0000 (15:28 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 24 Dec 2012 11:28:05 +0000 (15:28 +0400)
modules/gpu/perf/perf_core.cpp
modules/gpu/perf/perf_imgproc.cpp

index ad722fa..c78bfd6 100644 (file)
@@ -1708,7 +1708,8 @@ PERF_TEST_P(Sz_Depth_Cn, Core_Sum, Combine(
         TEST_CYCLE() dst = cv::sum(src);
     }
 
-    SANITY_CHECK(dst, 1e-6);
+    double error = (depth == CV_32F) ? 3e+1 : 1e-6;
+    SANITY_CHECK(dst,  error);
 }
 
 //////////////////////////////////////////////////////////////////////
index ee09684..c10572d 100644 (file)
@@ -1805,8 +1805,8 @@ PERF_TEST_P(Image, ImgProc_HoughLinesP, testing::Values("cv/shared/pic5.png", "s
 
     std::string fileName = getDataPath(GetParam());
 
-    const double rho = 1.0f;
-    const double theta = CV_PI / 180.0;
+    const float rho = 1.f;
+    const float theta = float(CV_PI) / 180.f;
     const int threshold = 100;
     const int minLineLenght = 50;
     const int maxLineGap = 5;