projects
/
profile
/
ivi
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small fix for ocl_resize
[profile/ivi/opencv.git]
/
modules
/
imgproc
/
test
/
ocl
/
test_warp.cpp
diff --git
a/modules/imgproc/test/ocl/test_warp.cpp
b/modules/imgproc/test/ocl/test_warp.cpp
index
f9ccef8
..
3067aba
100644
(file)
--- a/
modules/imgproc/test/ocl/test_warp.cpp
+++ b/
modules/imgproc/test/ocl/test_warp.cpp
@@
-51,7
+51,7
@@
//
//M*/
//
//M*/
-#include "test_precomp.hpp"
+#include "
../
test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL
@@
-158,9
+158,10
@@
OCL_TEST_P(WarpPerspective, Mat)
/////////////////////////////////////////////////////////////////////////////////////////////////
//// resize
/////////////////////////////////////////////////////////////////////////////////////////////////
//// resize
-PARAM_TEST_CASE(Resize, MatType, double, double, Interpolation, bool)
+PARAM_TEST_CASE(Resize, MatType, double, double, Interpolation, bool
, int
)
{
int type, interpolation;
{
int type, interpolation;
+ int widthMultiple;
double fx, fy;
bool useRoi;
double fx, fy;
bool useRoi;
@@
-174,13
+175,16
@@
PARAM_TEST_CASE(Resize, MatType, double, double, Interpolation, bool)
fy = GET_PARAM(2);
interpolation = GET_PARAM(3);
useRoi = GET_PARAM(4);
fy = GET_PARAM(2);
interpolation = GET_PARAM(3);
useRoi = GET_PARAM(4);
+ widthMultiple = GET_PARAM(5);
}
void random_roi()
{
CV_Assert(fx > 0 && fy > 0);
}
void random_roi()
{
CV_Assert(fx > 0 && fy > 0);
- Size srcRoiSize = randomSize(1, MAX_VALUE), dstRoiSize;
+ Size srcRoiSize = randomSize(10, MAX_VALUE), dstRoiSize;
+ // Make sure the width is a multiple of the requested value, and no more
+ srcRoiSize.width += widthMultiple - 1 - (srcRoiSize.width - 1) % widthMultiple;
dstRoiSize.width = cvRound(srcRoiSize.width * fx);
dstRoiSize.height = cvRound(srcRoiSize.height * fy);
dstRoiSize.width = cvRound(srcRoiSize.width * fx);
dstRoiSize.height = cvRound(srcRoiSize.height * fy);
@@
-211,7
+215,7
@@
OCL_TEST_P(Resize, Mat)
for (int j = 0; j < test_loop_times; j++)
{
int depth = CV_MAT_DEPTH(type);
for (int j = 0; j < test_loop_times; j++)
{
int depth = CV_MAT_DEPTH(type);
- double eps = depth <= CV_32S ? 1 :
1
e-2;
+ double eps = depth <= CV_32S ? 1 :
5
e-2;
random_roi();
random_roi();
@@
-263,7
+267,7
@@
PARAM_TEST_CASE(Remap, MatDepth, Channels, std::pair<MatType, MatType>, BorderTy
Border map1Border = randomBorder(0, useRoi ? MAX_VALUE : 0);
randomSubMat(map1, map1_roi, dstROISize, map1Border, map1Type, -mapMaxValue, mapMaxValue);
Border map1Border = randomBorder(0, useRoi ? MAX_VALUE : 0);
randomSubMat(map1, map1_roi, dstROISize, map1Border, map1Type, -mapMaxValue, mapMaxValue);
- Border map2Border = randomBorder(0, useRoi ? MAX_VALUE : 0);
+ Border map2Border = randomBorder(0, useRoi ? MAX_VALUE
+ 1
: 0);
if (map2Type != noType)
{
int mapMinValue = -mapMaxValue;
if (map2Type != noType)
{
int mapMinValue = -mapMaxValue;
@@
-334,14
+338,16
@@
OCL_INSTANTIATE_TEST_CASE_P(ImgprocWarp, Resize, Combine(
Values(0.5, 1.5, 2.0, 0.2),
Values(0.5, 1.5, 2.0, 0.2),
Values((Interpolation)INTER_NEAREST, (Interpolation)INTER_LINEAR),
Values(0.5, 1.5, 2.0, 0.2),
Values(0.5, 1.5, 2.0, 0.2),
Values((Interpolation)INTER_NEAREST, (Interpolation)INTER_LINEAR),
- Bool()));
+ Bool(),
+ Values(1, 16)));
OCL_INSTANTIATE_TEST_CASE_P(ImgprocWarpResizeArea, Resize, Combine(
Values((MatType)CV_8UC1, CV_8UC4, CV_32FC1, CV_32FC4),
Values(0.7, 0.4, 0.5),
Values(0.3, 0.6, 0.5),
Values((Interpolation)INTER_AREA),
OCL_INSTANTIATE_TEST_CASE_P(ImgprocWarpResizeArea, Resize, Combine(
Values((MatType)CV_8UC1, CV_8UC4, CV_32FC1, CV_32FC4),
Values(0.7, 0.4, 0.5),
Values(0.3, 0.6, 0.5),
Values((Interpolation)INTER_AREA),
- Bool()));
+ Bool(),
+ Values(1, 16)));
OCL_INSTANTIATE_TEST_CASE_P(ImgprocWarp, Remap_INTER_LINEAR, Combine(
Values(CV_8U, CV_16U, CV_32F),
OCL_INSTANTIATE_TEST_CASE_P(ImgprocWarp, Remap_INTER_LINEAR, Combine(
Values(CV_8U, CV_16U, CV_32F),