Add tests for TIFF input with Alpha channel

Update uclouvain/openjpeg#322

diff --git a/src/bin/jp2/converttif.c b/src/bin/jp2/converttif.c
index 21bb11f8068862b55a6d832295ae789d0585d212..d93e5f53db85aabe0ff931b4f363e0ad01425018 100644 (file)
--- a/src/bin/jp2/converttif.c
+++ b/src/bin/jp2/converttif.c
@@ -977,6 +977,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
        {
                planes[j] = image->comps[j].data;
        }
+       image->comps[numcomps - 1].alpha = (OPJ_UINT16)(1 - (numcomps & 1));
                
        strip_size = TIFFStripSize(tif);
        

diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
index 0a3645eb4efab9a7f5600f9095324f12b425befc..053d931864caf4ed00ba0eddefd9c161bd4dc40f 100644 (file)
--- a/tests/nonregression/test_suite.ctest.in
+++ b/tests/nonregression/test_suite.ctest.in
@@ -98,6 +98,9 @@ opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-10.tif -o @TEMP_PATH@/flower-r
 opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-12.tif -o @TEMP_PATH@/flower-rgb-planar-12.tif.jp2
 opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-14.tif -o @TEMP_PATH@/flower-rgb-planar-14.tif.jp2
 opj_compress -i @INPUT_NR_PATH@/flower-rgb-planar-16.tif -o @TEMP_PATH@/flower-rgb-planar-16.tif.jp2
+opj_compress -i @INPUT_NR_PATH@/basn6a08.tif -o @TEMP_PATH@/basn6a08.tif.jp2
+opj_compress -i @INPUT_NR_PATH@/basn4a08.tif -o @TEMP_PATH@/basn4a08.tif.jp2
+
 
 # DECODER TEST SUITE
 opj_decompress -i  @INPUT_NR_PATH@/Bretagne2.j2k -o @TEMP_PATH@/Bretagne2.j2k.pgx