From 4de95f320f8127d2d1d35e594b53ecf53c4c6345 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Mon, 10 Mar 2014 13:51:16 +0000
Subject: [PATCH] [trunk] Run richter test suite, correct a regression
 introduced in r2668

---
 tests/compare_images.c           |  1 +
 tests/conformance/CMakeLists.txt | 61 ++++++++++++++++++++++++++++++--
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/tests/compare_images.c b/tests/compare_images.c
index 2e101246..a9a44ca7 100644
--- a/tests/compare_images.c
+++ b/tests/compare_images.c
@@ -135,6 +135,7 @@ static char* createMultiComponentsFilename(const char* inFilename, const int ind
   outFilename = (char*)malloc((posToken + 7) * sizeof(char)); /*6*/
 
   strncpy(outFilename, inFilename, posToken);
+  outFilename[posToken] = '\0';
   strcat(outFilename, separator);
   sprintf(s, "%i", indexF);
   strcat(outFilename, s);
diff --git a/tests/conformance/CMakeLists.txt b/tests/conformance/CMakeLists.txt
index fb29f27f..85c2cf86 100644
--- a/tests/conformance/CMakeLists.txt
+++ b/tests/conformance/CMakeLists.txt
@@ -515,9 +515,9 @@ foreach(kdu_file ${kdu_j2k_conf_files})
   )
 
   if("${kdu_file}" STREQUAL "a6_mono_colr")
-    set(kdu_test_args "-n 4 -s b_t_")
+    set(kdu_test_args -n 4 -s b_t_)
   else()
-    set(kdu_test_args "-n 1")
+    set(kdu_test_args -n 1)
   endif()
 
   add_test(NAME ETS-KDU-${filenameInput}-compare2ref
@@ -526,7 +526,7 @@ foreach(kdu_file ${kdu_j2k_conf_files})
     -t ${TEMP}/${filenameInput}.ppm
     ${kdu_test_args}
     -p 4:4:4
-    -m 4:4:4
+    -m 1:1:1
   )
 
   set_tests_properties(ETS-KDU-${filenameInput}-compare2ref
@@ -546,6 +546,61 @@ foreach(kdu_file ${kdu_j2k_conf_files})
     ETS-KDU-${filenameInput}-decode)
 endforeach()
 
+#--------------------------------------------------------------------------
+# Tests about Richter/J2K file
+# try to decode
+# compare to ref file
+# non regression comparison
+
+# Tolerances given by ???
+
+set(richter_jp2_conf_files
+  subsampling_1
+  subsampling_2
+  zoo1
+  zoo2
+)
+
+foreach(r_file ${richter_jp2_conf_files})
+
+  # Build filenames
+  set( filenameInput "${r_file}.jp2" )
+  set( filenameRef   "${r_file}.ppm" )
+
+  add_test(NAME ETS-RIC-${filenameInput}-decode
+    COMMAND opj_decompress
+    -i ${INPUT_CONF}/${filenameInput}
+    -o ${TEMP}/${filenameInput}.ppm
+  )
+
+  set(ric_test_args -n 1)
+
+  add_test(NAME ETS-RIC-${filenameInput}-compare2ref
+    COMMAND compare_images
+    -b ${BASELINE_CONF}/${filenameRef}
+    -t ${TEMP}/${filenameInput}.ppm
+    ${ric_test_args}
+    -p 4:4:4
+    -m 2:2:2
+  )
+
+  set_tests_properties(ETS-RIC-${filenameInput}-compare2ref
+    PROPERTIES DEPENDS
+    ETS-RIC-${filenameInput}-decode)
+
+  add_test(NAME NR-RIC-${filenameInput}-compare2base
+    COMMAND compare_images
+    -b ${BASELINE_NR}/opj_${filenameRef}
+    -t ${TEMP}/${filenameInput}.ppm
+    ${ric_test_args}
+    -d
+  )
+
+  set_tests_properties(NR-RIC-${filenameInput}-compare2base
+    PROPERTIES DEPENDS
+    ETS-RIC-${filenameInput}-decode)
+endforeach()
+
 #--------------------------------------------------------------------------#
 #--------------------------------------------------------------------------#
 #--------------------------------------------------------------------------#