[trunk] added option to force rgb output in opj_decompress (fixes issue 282 , fixes...

[openjpeg.git] / tests / conformance / CMakeLists.txt

diff --git a/tests/conformance/CMakeLists.txt b/tests/conformance/CMakeLists.txt
index bd40328bcc252d4eadcfd608a297e0ed121edafc..157c46d1e6b1a9b322f26ba4ecd6fc3bdd4730a9 100644 (file)
--- a/tests/conformance/CMakeLists.txt
+++ b/tests/conformance/CMakeLists.txt
@@ -439,6 +439,8 @@ foreach(numFileJP2 RANGE 1 9)
     COMMAND opj_decompress
     -i ${INPUT_CONF}/${filenameInput}
     -o ${TEMP}/${filenameInput}.tif
+    -p 8S
+    -force-rgb
   )
 
   add_test(NAME ETS-JP2-${filenameInput}-compare2ref
@@ -515,9 +517,11 @@ foreach(kdu_file ${kdu_j2k_conf_files})
   )
 
   if("${kdu_file}" STREQUAL "a6_mono_colr")
-    set(kdu_test_args -n 4 -s b_t_ -p 4:4:4:4 -m 1:1:1:1)
+    set(kdu_test_args -n 4 -s b_t_ )
+    set(kdu_test_args_tol -p 4:4:4:4 -m 1:1:1:1)
   else()
-    set(kdu_test_args -n 1 -p 4:4:4 -m 1:1:1)
+    set(kdu_test_args -n 1 )
+    set(kdu_test_args_tol -p 4:4:4 -m 1:1:1)
   endif()
 
   add_test(NAME ETS-KDU-${filenameInput}-compare2ref
@@ -525,6 +529,7 @@ foreach(kdu_file ${kdu_j2k_conf_files})
     -b ${BASELINE_CONF}/${filenameRef}
     -t ${TEMP}/${filenameInput}.ppm
     ${kdu_test_args}
+    ${kdu_test_args_tol}
   )
 
   set_tests_properties(ETS-KDU-${filenameInput}-compare2ref