Merge pull request #7180 from mrquorr:add_dcm_test

pull/7193/head
Maksim Shabunin 8 years ago
commit a21b8ed92c
  1. 11
      modules/imgcodecs/test/test_grfmt.cpp

@ -92,6 +92,12 @@ TEST(Imgcodecs_imread, regression)
{ {
#ifdef HAVE_JASPER #ifdef HAVE_JASPER
"Rome.jp2", "Rome.jp2",
#endif
#ifdef HAVE_GDCM
"int16-mono1.dcm",
"uint8-mono2.dcm",
"uint16-mono2.dcm",
"uint8-rgb.dcm",
#endif #endif
"color_palette_alpha.png", "color_palette_alpha.png",
"multipage.tif", "multipage.tif",
@ -111,9 +117,10 @@ TEST(Imgcodecs_imread, regression)
ASSERT_TRUE(imread_compare(path, IMREAD_COLOR)); ASSERT_TRUE(imread_compare(path, IMREAD_COLOR));
ASSERT_TRUE(imread_compare(path, IMREAD_ANYDEPTH)); ASSERT_TRUE(imread_compare(path, IMREAD_ANYDEPTH));
ASSERT_TRUE(imread_compare(path, IMREAD_ANYCOLOR)); ASSERT_TRUE(imread_compare(path, IMREAD_ANYCOLOR));
if (path.substr(path.length() - 3) != "hdr") const string ext = path.substr( path.length() - 3 );
if ( ext != "hdr" && ext != "dcm" )
{ {
// GDAL does not support hdr // GDAL does not support hdr nor dcm
ASSERT_TRUE(imread_compare(path, IMREAD_LOAD_GDAL)); ASSERT_TRUE(imread_compare(path, IMREAD_LOAD_GDAL));
} }
} }

Loading…
Cancel
Save