fix warnings under win

pull/258/merge
marina.kolpakova 12 years ago
parent 15e7712a26
commit 2128bd25e4
  1. 3
      modules/gpu/perf/perf_core.cpp
  2. 4
      modules/gpu/perf/perf_imgproc.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);
}
//////////////////////////////////////////////////////////////////////

@ -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;

Loading…
Cancel
Save