potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #462 from kobigurk:master

Browse Source
This commit is contained in:
Andrey Kamaev
2013-02-28 00:38:20 +04:00
committed by OpenCV Buildbot
parent d620ef0d55 18a5b8dfc6
commit 68bb317ce1
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/test/test_grfmt.cpp
+5 -1
View File
@@ -99,8 +99,11 @@ public:
{
if(ext_from_int(ext).empty())
continue;
for (int num_channels = 1; num_channels <= 3; num_channels+=2)
for (int num_channels = 1; num_channels <= 4; num_channels++)
{
if (num_channels == 2) continue;
if (num_channels == 4 && ext!=3 /*TIFF*/) continue;
ts->printf(ts->LOG, "image type depth:%d channels:%d ext: %s\n", CV_8U, num_channels, ext_from_int(ext).c_str());
Mat img(img_r * k, img_c * k, CV_MAKETYPE(CV_8U, num_channels), Scalar::all(0));
circle(img, Point2i((img_c * k) / 2, (img_r * k) / 2), std::min((img_r * k), (img_c * k)) / 4 , Scalar::all(255));
@@ -116,6 +119,7 @@ public:
CV_Assert(img.size() == img_test.size());
CV_Assert(img.type() == img_test.type());
CV_Assert(num_channels == img_test.channels());
double n = norm(img, img_test);
if ( n > 1.0)