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

* img_test is now tested for channel numbers instead of img

Browse Source 
* fixed indentation to use spaces and trailing spaces
This commit is contained in:
kobigurk 2013-02-13 13:33:07 +02:00
parent 9f80c6c989
commit 109e047a28
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/highgui/test/test_grfmt.cpp
View File

@ -124,7 +124,7 @@ public:
ts->set_failed_test_info(ts->FAIL_MISMATCH); ts->set_failed_test_info(ts->FAIL_MISMATCH);
} }
} }
if (ext == 3 /*TIFF*/) if (ext == 3 /*TIFF*/)
{ {
/* 4 channels should stay 4 channels */ /* 4 channels should stay 4 channels */
int num_channels = 4; int num_channels = 4;
@ -143,7 +143,7 @@ public:
CV_Assert(img.size() == img_test.size()); CV_Assert(img.size() == img_test.size());
CV_Assert(img.type() == img_test.type()); CV_Assert(img.type() == img_test.type());
CV_Assert(img.channels() == 4); CV_Assert(img_test.channels() == 4);
double n = norm(img, img_test); double n = norm(img, img_test);
if ( n > 1.0) if ( n > 1.0)
@ -153,7 +153,6 @@ public:
} }
} }
} }
#ifdef HAVE_JPEG #ifdef HAVE_JPEG