Fix compiler errors

pull/707/head
peng xiao 12 years ago
parent 8ffc15371d
commit ad58c084a9
  1. 2
      modules/nonfree/src/surf.ocl.cpp
  2. 4
      modules/nonfree/test/test_surf.ocl.cpp

@ -43,7 +43,7 @@
//
//M*/
#include "precomp.hpp"
#include <cstring>
#include <cstdio>
#ifdef HAVE_OPENCV_OCL

@ -147,7 +147,7 @@ PARAM_TEST_CASE(SURF, HessianThreshold, Octaves, OctaveLayers, Extended, Upright
TEST_P(SURF, Detector)
{
// the data path should be opencv/samples
cv::Mat image = cv::imread(string(cvtest::TS::ptr()->get_data_path()) + "c/fruits.jpg", cv::IMREAD_GRAYSCALE);
cv::Mat image = cv::imread("../../../samples/c/fruits.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(image.empty());
cv::ocl::SURF_OCL surf;
@ -180,7 +180,7 @@ TEST_P(SURF, Detector)
TEST_P(SURF, Descriptor)
{
cv::Mat image = cv::imread(string(cvtest::TS::ptr()->get_data_path()) + "c/fruits.jpg", cv::IMREAD_GRAYSCALE);
cv::Mat image = cv::imread("../../../samples/c/fruits.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(image.empty());
cv::ocl::SURF_OCL surf;

Loading…
Cancel
Save