Update convert for PNG output

Update uclouvain/openjpeg#264

2 files changed, 129 insertions, 52 deletions

diff --git a/tests/nonregression/md5refs.txt b/tests/nonregression/md5refs.txt
index 07f89de0..1e26e768 100644
--- a/tests/nonregression/md5refs.txt
+++ b/tests/nonregression/md5refs.txt
@@ -94,58 +94,58 @@ fdad26b1e078aa32bd4b77a5f44da43c  orb-blue10-lin-jp2.jp2_2.pgx
 7442756e83571c0e87493e03f12b2d34  orb-blue10-win-jp2.jp2_1.pgx
 5f99ff2aeb17e167fe7049bcf339d0b3  orb-blue10-win-jp2.jp2_2.pgx
 fe028d56d6c7aaee87239a115093412a  orb-blue10-win-jp2.jp2_3.pgx
-dc78dd4b7739c92cd5291b043cc232ed  p0_04_1.j2k.png
-e157ce3ec092931d48cdaf275180ed34  p0_04_2.j2k.png
-0f0a9b3b8b41f2afaf5d80bf2f36f68c  p0_04_3.j2k.png
-f78b09250d08365b836654f717ec798c  p0_04_4.j2k.png
-d7243f4004a30d8856ef4dfa0b9f4bc8  p0_04_5.j2k.png
-344233bbe643ad651f82d4e8aaa3be54  p0_04_6_1.j2k.png
-d105747d8fb755ef18b37ef83832f7d3  p0_04_6_2.j2k.png
-89000c4cb8a83fcb4166624055905258  p0_04_6_3.j2k.png
-af2a3ce7be9c8fb2db66ddbceff1dd53  p0_04_6_4.j2k.png
-757340902e8dc6d5baa4f8f4628e2bc4  p0_04_6_5.j2k.png
-4ec7002317a835f71630a7787cbff30a  p0_04_6.j2k.png
-d7ed089096806af2f1bf687e1adb427f  p0_04.j2k.png
-4fecc6d5ebdc2db3bf3ef6bbbbb5b031  p1_04_10.j2k.png
-ab969b1d17341d062a6f4d6966a1f221  p1_04_11.j2k.png
-70fd9d6f155585258b13cb4b6c469e3f  p1_04_12.j2k.png
-38f9113129eed30445266dd67ac8ad7d  p1_04_13.j2k.png
-92945201639e6d8718dc474058f63e45  p1_04_14.j2k.png
-bf7b8807d1617b8baa1cbd11af727061  p1_04_15.j2k.png
-22afbf50bda7cd1ad562e6c0601c759a  p1_04_16.j2k.png
-d41f829c40140ec9972edf86681ee53a  p1_04_17_t63.j2k.png
-70fd9d6f155585258b13cb4b6c469e3f  p1_04_17_t63_r2.j2k.png
-80bde56ea4d1a5c2b81f3c4227ef754c  p1_04_18.t12.j2k.png
-5bb3e76ec9d742ec742959f3bb865018  p1_04_19_t12_r1.j2k.png
-ef287e72806290a81f61e3d271bdb1dc  p1_04_1.j2k.png
-d41f829c40140ec9972edf86681ee53a  p1_04_2.j2k.png
-4dd2a41c60bcf71b8c410833b12706cf  p1_04_3.j2k.png
-75b9b427ddded86219e361206669482a  p1_04_4.j2k.png
-de2e66f82b9da9bc2dabda183a455b2f  p1_04_5.j2k.png
-d12b3c90d4b1cf78f0ad23eedcabe0ea  p1_04_6.j2k.png
-b3fccf3cbb7186841ba7b86e34cac0c2  p1_04.j2k.png
-071597783b2141a12db1765b85943c1d  p1_06_10_1.j2k.png
-6778de9e9236144747fe4542d03bf6e5  p1_06_10_2.j2k.png
-af083204299bbdd993286892b4c9cd29  p1_06_10.j2k.png
-af083204299bbdd993286892b4c9cd29  p1_06_11.j2k.png
-72a7f65be34450c9ec126fbc58399354  p1_06_1.j2k.png
-85b4f3b8f7b987f83972a820d34372a7  p1_06_2.j2k.png
-d4fc3ff73e8b5eafbcc2a111b97d362b  p1_06_3.j2k.png
-a954722553fb25692556cfa87a26bc1a  p1_06_4.j2k.png
-a62bb79d066e230ea7b34e24681de189  p1_06_5.j2k.png
-13d78a5091b06239c2b2012f7927dce8  p1_06_6.j2k.png
-da21d175c4dcb03ce1f0a227f49ed7b8  p1_06_7_1.j2k.png
-5c434a489375fc9624bab49679cdec76  p1_06_7_2.j2k.png
-ce2de61ad83a71c9b13ca5df0a987a69  p1_06_7_3.j2k.png
-18f9fbfb0d29e83f697fa93523c53a2b  p1_06_7_4.j2k.png
-66ede889502134412872b9d8b1e40887  p1_06_7_5.j2k.png
-071597783b2141a12db1765b85943c1d  p1_06_7_6.j2k.png
-85a2b9a1324d72a8cec7041f80529242  p1_06_7.j2k.png
-7045c8722e92fb2d447a6dc235a3c619  p1_06_9_1.j2k.png
-d41856648d936229f1e3e2cf7d7c7a4d  p1_06_9_2.j2k.png
-85b4f3b8f7b987f83972a820d34372a7  p1_06_9_3.j2k.png
-5fa6e85d6cfa0ed51e5933b2e35f4854  p1_06_9.j2k.png
-2e80dbe4a6af432b7f1b54dfa4e164ae  p1_06.j2k.png
+03bd6de1f4e9924f2dcff8d4edaab718  p0_04_1.j2k.png
+7898b580781d69fda800016378bab80c  p0_04_2.j2k.png
+e7cde963434e37ba00e128efb7e5c5c3  p0_04_3.j2k.png
+a486db59bf5e7c39275aaf62304cf0b7  p0_04_4.j2k.png
+59a08fe073e52a778128f22feffcdaf8  p0_04_5.j2k.png
+c6f01ceef58442fed6a6af181b27ff06  p0_04_6_1.j2k.png
+c3cbab7a2a5bf6b10f67afdd4e125120  p0_04_6_2.j2k.png
+04457ca5d9bde5700140cedf8cf2aeea  p0_04_6_3.j2k.png
+dac32a0a17d0cc4e4f67d49767fc54c1  p0_04_6_4.j2k.png
+ef27ff4ff2f6d7d3919808d7378bf119  p0_04_6_5.j2k.png
+44ac3a7d98c90f5ab24b6801a601faa9  p0_04_6.j2k.png
+bd0f12125f8e3f367dae1c6179f52212  p0_04.j2k.png
+ff00bc86aa73a8266e381c5428c17c28  p1_04_10.j2k.png
+72a6b3b455c6b3397f95cdf40ead75a0  p1_04_11.j2k.png
+060809d8a5969f162f3b662adc3cbccb  p1_04_12.j2k.png
+92d8168db18cf51d108b0fc1a4f0aeea  p1_04_13.j2k.png
+bd5650ff4c977e42e4d84304c92222a0  p1_04_14.j2k.png
+3920307d5b6cb855065f144b7683609b  p1_04_15.j2k.png
+1e94024252ca36e86b09e37370005ad0  p1_04_16.j2k.png
+d271f149dc89c4d897fbd935189b159b  p1_04_17_t63.j2k.png
+060809d8a5969f162f3b662adc3cbccb  p1_04_17_t63_r2.j2k.png
+c92cb973e7dc716830ddf3d257e93fb3  p1_04_18.t12.j2k.png
+c9b66b78895609fb0250ca5bd2e89c1d  p1_04_19_t12_r1.j2k.png
+68e1408710e68669f434937714fd5623  p1_04_1.j2k.png
+d271f149dc89c4d897fbd935189b159b  p1_04_2.j2k.png
+9583a4c09567d8b67d23c5857ca10dc5  p1_04_3.j2k.png
+6f405d502508b37f6133342ab2e7876c  p1_04_4.j2k.png
+4f084579cba30bec1cc9d89e55e99c5a  p1_04_5.j2k.png
+cd5326c62fa50d68b0d8f08bc3da617c  p1_04_6.j2k.png
+e50b0e1c1d28f0a40ad9d5c64a4b1cf4  p1_04.j2k.png
+b367ad625d2a44a066b3cdd291da619c  p1_06_10_1.j2k.png
+0bc2db37548e0f6e342af2ea86380300  p1_06_10_2.j2k.png
+32415e97cb64b4fda976c883bbb16103  p1_06_10.j2k.png
+32415e97cb64b4fda976c883bbb16103  p1_06_11.j2k.png
+3a99df46b0fbf7a9e7703d2b0e7355a5  p1_06_1.j2k.png
+2702da6fca94765767365c7d80933ee2  p1_06_2.j2k.png
+bb8d24257705393e5536fa77bdeb362c  p1_06_3.j2k.png
+9add0b9211f51ae2da1d01588ed3f9cf  p1_06_4.j2k.png
+5d037fefa22029a90d8e3ac82246a2e1  p1_06_5.j2k.png
+821d1c176a2908136f5246599a47c462  p1_06_6.j2k.png
+9d4cf96edeae63e461bff66d8c0b7b82  p1_06_7_1.j2k.png
+6d6713374c1e443539a02f82baad5c98  p1_06_7_2.j2k.png
+8317d23c60a0e891405339e0d9848efa  p1_06_7_3.j2k.png
+aa4a63ad4322a92c7f4d5a7f29ad0723  p1_06_7_4.j2k.png
+e8748d54c7696069e14501c85d6f6638  p1_06_7_5.j2k.png
+b367ad625d2a44a066b3cdd291da619c  p1_06_7_6.j2k.png
+93c72c4eaffdf0c3081a00e1d21829f6  p1_06_7.j2k.png
+024d2b209513c21438f9b5c60b7d945d  p1_06_9_1.j2k.png
+c3f42d42eef90d42a98ad27d0612af9f  p1_06_9_2.j2k.png
+2702da6fca94765767365c7d80933ee2  p1_06_9_3.j2k.png
+695444198428363c61871586add6d666  p1_06_9.j2k.png
+c494419005e8aae82f46d3f48da6caf1  p1_06.j2k.png
 371aa0a7ff40a73b45f1fa41e210d1db  pacs.ge.j2k_0.pgx
 6ae110e1fb5a869af3dbc5fbc735b0bd  relax.jp2_0.pgx
 518a8f28dacc034982507f43763b88dd  relax.jp2_1.pgx
@@ -221,3 +221,39 @@ b6f71c941e3a5b8d2547792ccec58d54  p0_14_tif-4.tif
 dd15b3d487d36a3682be0679300a4319  issue235.jp2_0.pgx
 b9cd6dc76b141fb1fec15f50c1f70e01  issue235.jp2_1.pgx
 3edef2ae197ef30b08deda1b28825399  issue235.jp2_2.pgx
+b6a84b3215333efc80326715f9078c58  a1_mono_png-1.png
+88f96456667b8b3fd69c406fe40636b5  a1_mono_png-10.png
+077148452a9506a2337afa2777c57834  a1_mono_png-12.png
+c4eee75c1da8d43e1510cb36326f948b  a1_mono_png-14.png
+b22b7badb943c5c375b7c55032f49def  a1_mono_png-16.png
+c7e209abe0d4c5ec1407bfe2cfa932de  a1_mono_png-2.png
+313d1e2d0d41231003587d3061b6119f  a1_mono_png-4.png
+d92241d97e8603509027176dd3b3168a  a1_mono_png-6.png
+a86b3b0720229491ce82556d3fc97bf3  a1_mono_png-8.png
+159d1413263e2183e50ecc8dc7487b98  basn4a08_png-1.png
+cc501ac5219200ed5d7d33df907d3390  basn4a08_png-10.png
+9006ec767be7645c1808eef4e8c6ee7a  basn4a08_png-12.png
+df3484a4ecfaddc1f62d4bf202944ad5  basn4a08_png-14.png
+699c25624e99c72fd45cfdb5660920c2  basn4a08_png-16.png
+95090b2194e811e8c490e12632e8a5f3  basn4a08_png-2.png
+c66f969b198eff8ddf663a3ccbb8e272  basn4a08_png-4.png
+02484627d57e7bcb45d3c1bff11a4687  basn4a08_png-6.png
+3bf91c974abc17e520c6a5efa883a58a  basn4a08_png-8.png
+cd6b948268967b1e9b54d60607b8de0a  basn6a08_png-1.png
+549e7a5566f37f7e08030cfa2aee8994  basn6a08_png-10.png
+d9e6472bc020607327cd082464d03616  basn6a08_png-12.png
+54e9b4d5e3fadd939a54722f05cadbe9  basn6a08_png-14.png
+94bba5bebc9e9209f2af13c6dd5a2c12  basn6a08_png-16.png
+16a9287d409a1c80158973f95eb3c04e  basn6a08_png-2.png
+4065c615d124289bd06cd9c9bfb4adab  basn6a08_png-4.png
+3235c0b759dd47e0c2df5bc9ac827e70  basn6a08_png-6.png
+0db8bf6fa69191c20936701ef365b82a  basn6a08_png-8.png
+d3c82c8552f2e47c179372933725c8d7  p0_14_png-1.png
+7bce012868556bd04e5c0567b67d2896  p0_14_png-10.png
+d66fe6bbe653a18e60416e0cda1b1949  p0_14_png-12.png
+b3f01308ae57518ff157c926563b01b2  p0_14_png-14.png
+629bc0a76c5454e875eab9cacc653dfd  p0_14_png-16.png
+fc2844a9f3c8e924e349180ba9e122dd  p0_14_png-2.png
+428c7a19b9df4120d35b5df7fafdf253  p0_14_png-4.png
+0c1cc85c051dd95394d06103c8d9bbef  p0_14_png-6.png
+230e4968cb445b222ee2095014ba1d26  p0_14_png-8.png
diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
index 31244add..f78f4973 100644
--- a/tests/nonregression/test_suite.ctest.in
+++ b/tests/nonregression/test_suite.ctest.in
@@ -447,3 +447,44 @@ opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_tif-16.ti
 #issue 235 CMAP outside jp2h box. CMAP is buggy
 opj_decompress -i @INPUT_NR_PATH@/issue235.jp2 -o @TEMP_PATH@/issue235.jp2.pgx
 
+# issue 264, add checks for png
+# GRAYSCALE 
+opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-1.png -p 1S
+opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-2.png -p 2S
+opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-4.png -p 4S
+opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-6.png -p 6S
+opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-8.png -p 8S
+opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-10.png -p 10S
+opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-12.png -p 12S
+opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-14.png -p 14S
+opj_decompress -i @INPUT_CONF_PATH@/a1_mono.j2c -o @TEMP_PATH@/a1_mono_png-16.png -p 16S
+# GRAYSCALE ALPHA
+opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-1.png -p 1S
+opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-2.png -p 2S
+opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-4.png -p 4S
+opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-6.png -p 6S
+opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-8.png -p 8S
+opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-10.png -p 10S
+opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-12.png -p 12S
+opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-14.png -p 14S
+opj_decompress -i @INPUT_NR_PATH@/basn4a08.jp2 -o @TEMP_PATH@/basn4a08_png-16.png -p 16S
+# RGB
+opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-1.png -p 1S
+opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-2.png -p 2S
+opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-4.png -p 4S
+opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-6.png -p 6S
+opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-8.png -p 8S
+opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-10.png -p 10S
+opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-12.png -p 12S
+opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-14.png -p 14S
+opj_decompress -i @INPUT_CONF_PATH@/p0_14.j2k -o @TEMP_PATH@/p0_14_png-16.png -p 16S
+# RGBA
+opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-1.png -p 1S
+opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-2.png -p 2S
+opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-4.png -p 4S
+opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-6.png -p 6S
+opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-8.png -p 8S
+opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-10.png -p 10S
+opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-12.png -p 12S
+opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-14.png -p 14S
+opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-16.png -p 16S