Skip to content

Commit 2d0f612

Browse files
blowekampdzenanz
authored andcommitted
ENH: Add test for libtiff with AdobeDeflate compression
1 parent c40cd4a commit 2d0f612

File tree

5 files changed

+16
-1
lines changed

5 files changed

+16
-1
lines changed

Modules/IO/TIFF/src/itkTIFFImageIO.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@ TIFFImageIO::InternalWrite(const void * buffer)
710710
break;
711711
case TIFFImageIO::Deflate:
712712
compression = COMPRESSION_DEFLATE;
713+
break;
713714
case TIFFImageIO::AdobeDeflate:
714715
compression = COMPRESSION_ADOBE_DEFLATE;
715716
break;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bafkreicpqiqyrcg6bio22phi2z6x2ntuyakrfmt6breeuej3vxqwnioily
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bafkreifhgko3jbmnao3xblusn5gqxwvuvtcuqmeoxycvwecjvoslw5m2xq

Modules/IO/TIFF/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ set_tests_properties(itkTIFFImageIOInfoTest3 PROPERTIES PASS_REGULAR_EXPRESSION
395395
######################
396396
# Test Compression
397397

398-
set(Compression "NoCompression;LZW;JPEG;PackBits;Deflate")
398+
set(Compression "NoCompression;LZW;JPEG;PackBits;Deflate;AdobeDeflate")
399399
set(CompressionFiles "cthead1;RGBTestImageJPEG")
400400
foreach(f ${CompressionFiles})
401401
foreach(c ${Compression})

Modules/IO/TIFF/test/itkTIFFImageIOCompressionTest.cxx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ itkTIFFImageIOCompressionTestHelper(int, char * argv[], int JPEGQuality)
6060
ITK_TRY_EXPECT_NO_EXCEPTION(imageIO->SetCompressor("Deflate"));
6161
ITK_TEST_EXPECT_EQUAL(imageIO->GetCompressor(), "Deflate");
6262

63+
ITK_TRY_EXPECT_NO_EXCEPTION(imageIO->SetCompressor("AdobeDeflate"));
64+
ITK_TEST_EXPECT_EQUAL(imageIO->GetCompressor(), "AdobeDeflate");
65+
66+
6367
imageIO->SetCompressionLevel(2);
6468
ITK_TEST_EXPECT_EQUAL(imageIO->GetCompressionLevel(), 2);
6569

@@ -86,6 +90,14 @@ itkTIFFImageIOCompressionTestHelper(int, char * argv[], int JPEGQuality)
8690
ITK_TEST_EXPECT_EQUAL(compression, io->GetCompressor());
8791
ITK_TEST_EXPECT_TRUE(io->GetUseCompression());
8892
}
93+
else if (compression == "AdobeDeflate")
94+
{
95+
std::cout << "Using AdobeDeflate\n";
96+
io->SetCompressionToAdobeDeflate();
97+
98+
ITK_TEST_EXPECT_EQUAL(compression, io->GetCompressor());
99+
ITK_TEST_EXPECT_TRUE(io->GetUseCompression());
100+
}
89101
else if (compression == "LZW")
90102
{
91103
io->SetCompressionToLZW();

0 commit comments

Comments
 (0)