generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Android build warnings in new imgproc tests

Browse Source
This commit is contained in:
Andrey Kamaev 2012-09-10 20:33:35 +04:00
parent dd1091bbe1
commit b1b5e392e6
1 changed files with 95 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/imgproc/test/test_imgwarp_strict.cpp
View File

@ -749,7 +749,7 @@ void CV_Remap_Test::convert_maps()
if (interpolation == INTER_NEAREST) if (interpolation == INTER_NEAREST)
mapy = Mat(); mapy = Mat();
CV_Assert((interpolation == INTER_NEAREST && !mapy.data || mapy.type() == CV_16UC1 || CV_Assert(( (interpolation == INTER_NEAREST && !mapy.data) || mapy.type() == CV_16UC1 ||
mapy.type() == CV_16SC1) && mapx.type() == CV_16SC2); mapy.type() == CV_16SC1) && mapx.type() == CV_16SC2);
} }
@ -857,7 +857,8 @@ void CV_Remap_Test::remap_generic(const Mat& _src, Mat& _dst)
else if (interpolation == INTER_LANCZOS4) else if (interpolation == INTER_LANCZOS4)
ksize = 8; ksize = 8;
else else
assert(0); ksize = 0;
assert(ksize);
int ofs = (ksize / 2) - 1; int ofs = (ksize / 2) - 1;
CV_Assert(_src.depth() == CV_32F && _dst.type() == _src.type()); CV_Assert(_src.depth() == CV_32F && _dst.type() == _src.type());
@ -1073,7 +1074,7 @@ void CV_WarpAffine_Test::warpAffine(const Mat& _src, Mat& _dst)
} }
} }
CV_Assert(mapx.type() == CV_16SC2 && (inter == INTER_NEAREST && !mapy.data || mapy.type() == CV_16SC1)); CV_Assert(mapx.type() == CV_16SC2 && ((inter == INTER_NEAREST && !mapy.data) || mapy.type() == CV_16SC1));
cv::remap(_src, _dst, mapx, mapy, inter, borderType, borderValue); cv::remap(_src, _dst, mapx, mapy, inter, borderType, borderValue);
} }
@ -1199,7 +1200,7 @@ void CV_WarpPerspective_Test::warpPerspective(const Mat& _src, Mat& _dst)
} }
} }
CV_Assert(mapx.type() == CV_16SC2 && (inter == INTER_NEAREST && !mapy.data || mapy.type() == CV_16SC1)); CV_Assert(mapx.type() == CV_16SC2 && ((inter == INTER_NEAREST && !mapy.data) || mapy.type() == CV_16SC1));
cv::remap(_src, _dst, mapx, mapy, inter, borderType, borderValue); cv::remap(_src, _dst, mapx, mapy, inter, borderType, borderValue);
} }