Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

switching to CV_HAAR_SCALE_IMAGE mode, enabling test

Browse Source
pull/2454/head
Andrey Pavlenko 11 years ago
parent ba4513503e
commit 640e180efe
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      modules/ocl/perf/perf_haar.cpp

12
modules/ocl/perf/perf_haar.cpp
Unescape View File

@ -92,12 +92,12 @@ PERF_TEST(HaarFixture, Haar)
typedef std::tr1::tuple<std::string, std::string, int> Cascade_Image_MinSize_t; typedef std::tr1::tuple<std::string, std::string, int> Cascade_Image_MinSize_t;
typedef perf::TestBaseWithParam<Cascade_Image_MinSize_t> Cascade_Image_MinSize; typedef perf::TestBaseWithParam<Cascade_Image_MinSize_t> Cascade_Image_MinSize;
OCL_PERF_TEST_P(Cascade_Image_MinSize, DISABLED_CascadeClassifier, OCL_PERF_TEST_P(Cascade_Image_MinSize, CascadeClassifier,
testing::Combine(testing::Values( string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt.xml"), testing::Combine(testing::Values( string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt.xml"),
string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt2.xml") ), string("cv/cascadeandhog/cascades/haarcascade_frontalface_alt2.xml") ),
testing::Values(string("cv/shared/lena.png"), testing::Values( string("cv/shared/lena.png"),
string("cv/cascadeandhog/images/bttf301.png")/*, string("cv/cascadeandhog/images/bttf301.png"),
string("cv/cascadeandhog/images/class57.png")*/ ), string("cv/cascadeandhog/images/class57.png") ),
testing::Values(30, 64, 90))) testing::Values(30, 64, 90)))
{ {
const string cascasePath = get<0>(GetParam()); const string cascasePath = get<0>(GetParam());
@ -121,7 +121,7 @@ OCL_PERF_TEST_P(Cascade_Image_MinSize, DISABLED_CascadeClassifier,
faces.clear(); faces.clear();
startTimer(); startTimer();
cc.detectMultiScale(img, faces, 1.1, 3, 0, minSize); cc.detectMultiScale(img, faces, 1.1, 3, CV_HAAR_SCALE_IMAGE, minSize);
stopTimer(); stopTimer();
} }
} }
@ -137,7 +137,7 @@ OCL_PERF_TEST_P(Cascade_Image_MinSize, DISABLED_CascadeClassifier,
ocl::finish(); ocl::finish();
startTimer(); startTimer();
cc.detectMultiScale(uimg, faces, 1.1, 3, 0, minSize); cc.detectMultiScale(uimg, faces, 1.1, 3, CV_HAAR_SCALE_IMAGE, minSize);
stopTimer(); stopTimer();
} }
} }

Write Preview
Loading…
Cancel
Save