From: marina.kolpakova Date: Mon, 24 Dec 2012 11:28:05 +0000 (+0400) Subject: fix warnings under win X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~1219 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2128bd25e46e86e3dc49f2175db7bd018322800a;p=profile%2Fivi%2Fopencv.git fix warnings under win --- diff --git a/modules/gpu/perf/perf_core.cpp b/modules/gpu/perf/perf_core.cpp index ad722fa..c78bfd6 100644 --- a/modules/gpu/perf/perf_core.cpp +++ b/modules/gpu/perf/perf_core.cpp @@ -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); } ////////////////////////////////////////////////////////////////////// diff --git a/modules/gpu/perf/perf_imgproc.cpp b/modules/gpu/perf/perf_imgproc.cpp index ee09684..c10572d 100644 --- a/modules/gpu/perf/perf_imgproc.cpp +++ b/modules/gpu/perf/perf_imgproc.cpp @@ -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;