Commit 6fd2fdc2 authored by Ashod Nakashian's avatar Ashod Nakashian

Jasper unit-tests and removed a superfluous assertion.

parent 03ea24f2
...@@ -842,7 +842,6 @@ static int jas_cmshapmat_apply(jas_cmpxform_t *pxform, jas_cmreal_t *in, ...@@ -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++;
......
...@@ -87,6 +87,9 @@ TEST(Imgcodecs_imread, regression) ...@@ -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) ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment