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

Jasper unit-tests and removed a superfluous assertion.

Browse Source
This commit is contained in:
Ashod Nakashian 2015-02-11 21:28:44 -05:00
parent 03ea24f298
commit 6fd2fdc2e6
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/libjasper/jas_cm.c vendored
View File

@ -842,7 +842,6 @@ static int jas_cmshapmat_apply(jas_cmpxform_t *pxform, jas_cmreal_t *in,
*dst++ = a2; *dst++ = a2;
} }
} else { } else {
assert(0);
while (--cnt >= 0) { while (--cnt >= 0) {
a0 = *src++; a0 = *src++;
src++; src++;

13
modules/imgcodecs/test/test_grfmt.cpp
View File

@ -87,6 +87,9 @@ TEST(Imgcodecs_imread, regression)
{ {
const char* const filenames[] = const char* const filenames[] =
{ {
#ifdef HAVE_JASPER
"Rome.jp2",
#endif
"color_palette_alpha.png", "color_palette_alpha.png",
"multipage.tif", "multipage.tif",
"rle.hdr", "rle.hdr",
@ -109,6 +112,16 @@ TEST(Imgcodecs_imread, regression)
} }
} }
#ifdef HAVE_JASPER
TEST(Imgcodecs_jasper, regression)
{
const string folder = string(cvtest::TS::ptr()->get_data_path()) + "/readwrite/";
ASSERT_TRUE(imread_compare(folder + "Bretagne2.jp2", IMREAD_UNCHANGED));
ASSERT_TRUE(imread_compare(folder + "Bretagne2.jp2", IMREAD_GRAYSCALE));
}
#endif
class CV_GrfmtWriteBigImageTest : public cvtest::BaseTest class CV_GrfmtWriteBigImageTest : public cvtest::BaseTest
{ {
public: public: