[trunk] Make sure that opj_decompress only output a single component

Update issue 110

diff --git a/tests/nonregression/md5refs.txt b/tests/nonregression/md5refs.txt
index 1bfadb4be1a56fb0ba81f5d696927056de6597e0..8dfb9126045f208e14b47528cbda838a2af95eb5 100644 (file)
--- a/tests/nonregression/md5refs.txt
+++ b/tests/nonregression/md5refs.txt
@@ -16,18 +16,17 @@ b8f473c07ba5ebfc195bdd53c3b3b97f  buxR.j2k_0.pgx
 2813bd6fdc2c306b91b3da3688b8bf49  file409752.jp2_1.pgx
 e273e2aaea4a4fc1b2cf7c09c53c3cc6  file409752.jp2_2.pgx
 05c062aca83d13b8095460f38a690a08  illegalcolortransform.j2k_0.pgx
-cb28787aa7c223f03e6acad71e244108  issue104_jpxstream.jp2_0.pgx
+cccccccccccccccccccccccccccccccc  issue104_jpxstream.jp2_0.pgx
 c74edbb49e132b2cfc1eaf7908197b17  issue134.jp2_0.pgx
 16fe8ed450da10a6aaae4cf6f467fc21  issue134.jp2_1.pgx
 c6091c07bf0ff221008dfb60d893cdff  issue134.jp2_2.pgx
 12a8a4668315d9ae27969991251ce853  issue135.j2k_0.pgx
 56d0b0c547d6d5bb12f0c36e88722b13  issue135.j2k_1.pgx
 48ba092fb40090c160bbd08bdf7bdbf3  issue135.j2k_2.pgx
-cb28787aa7c223f03e6acad71e244108  issue104_jpxstream.jp2_1.pgx
 619694e5674992b3286244bf13058f7c  issue142.j2k_0.pgx
 c675c4b77dc3cc2a0d6542a32b438a48  issue142.j2k_1.pgx
 663ebdd12dd6a36915ea1152c43cb69a  issue142.j2k_2.pgx
-cb28787aa7c223f03e6acad71e244108  issue104_jpxstream.jp2_2.pgx
+cb28787aa7c223f03e6acad71e244108  issue110.jp2_0.pgx
 adda4f5e46845b96dd3df14a76aa7229  issue188_beach_64bitsbox.jp2_0.pgx
 90a9709c166019d1e101e7b96d257ed9  issue188_beach_64bitsbox.jp2_1.pgx
 37e23d2df06ee60bf0f9f5e1c16054d8  issue188_beach_64bitsbox.jp2_2.pgx

diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
index a3409e365660ec92f433c832a555d0fa60571524..029df97418aba8a738f3e96fb50dbd89f328e11b 100644 (file)
--- a/tests/nonregression/test_suite.ctest.in
+++ b/tests/nonregression/test_suite.ctest.in
@@ -82,7 +82,7 @@ opj_decompress -i  @INPUT_NR_PATH@/pacs.ge.j2k -o @TEMP_PATH@/pacs.ge.j2k.pgx
 # related to issue 135 
 opj_decompress -i  @INPUT_NR_PATH@/kodak_2layers_lrcp.j2c -o @TEMP_PATH@/kodak_2layers_lrcp.j2c.pgx
 opj_decompress -i  @INPUT_NR_PATH@/kodak_2layers_lrcp.j2c -o @TEMP_PATH@/kodak_2layers_lrcp.j2c.pgx -l 2
-# related to issue 104 which is closed
+# related to issue 104 and 110
 opj_decompress -i  @INPUT_NR_PATH@/issue104_jpxstream.jp2 -o @TEMP_PATH@/issue104_jpxstream.jp2.pgx
 # File not supported by kakadu (Malformed PCLR box) and not supoprter by openjpeg (problem with value of TPSot)
 !opj_decompress -i  @INPUT_NR_PATH@/mem-b2ace68c-1381.jp2 -o @TEMP_PATH@/mem-b2ace68c-1381.jp2.pgx