[trunk] merge r1234 from branch 1.5 over to trunk

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

diff --git a/tests/conformance/CMakeLists.txt b/tests/conformance/CMakeLists.txt
index 1dcfe23464f74b0f1ac35641b7bab1d16dc54fef..d23cdb1d15ef1214429b6d00cbe8e60feb88d74b 100644 (file)
--- a/tests/conformance/CMakeLists.txt
+++ b/tests/conformance/CMakeLists.txt
@@ -416,6 +416,55 @@ FOREACH(numFileC1P1 RANGE 1 7)
                        
 ENDFOREACH(numFileC1P1)
 
+#--------------------------------------------------------------------------
+# Tests about JP2 file
+# try to decode
+# compare to ref file
+# non regression comparison
+
+# Tolerances given by Table G.1
+
+FOREACH(numFileJP2 RANGE 1 9) 
+
+  # Build filenames
+  SET( filenameInput "file${numFileJP2}.jp2" )
+  SET( filenameRef   jp2_${numFileJP2}.tif )
+  
+  # Get corresponding tests parameters
+  list(GET JP2_PEAK_list ${numFileJP2}  PEAK_limit)
+  
+  ADD_TEST(ETS-JP2-${filenameInput}-decode
+      ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image 
+      -i ${INPUT_CONF}/${filenameInput}
+      -o ${TEMP}/${filenameInput}.tif
+      )
+#
+# FIXME: Need to implement a compare tif images function
+#  
+#  ADD_TEST(ETS-JP2-${filenameInput}-compare2ref
+#      ${EXECUTABLE_OUTPUT_PATH}/compareTIFimages
+#     -b ${BASELINE_CONF}/${filenameRef_tif}
+#     -t ${TEMP}/${filenameInput}.pgx
+#     -p 4
+#     )
+#      
+#  SET_TESTS_PROPERTIES(ETS-JP2-${filenameInput}-compare2ref  
+#                       PROPERTIES DEPENDS 
+#                       ETS-JP2-${filenameInput}-decode)
+#                       
+#  ADD_TEST(NR-JP2-${filenameInput}-compare2base
+#      ${EXECUTABLE_OUTPUT_PATH}/compareTIFimages
+#     -b ${BASELINE_NR}/opj_${filenameRef}
+#     -t ${TEMP}/${filenameInput}.tif
+#     -d 
+#     )
+#      
+#  SET_TESTS_PROPERTIES(NR-JP2-${filenameInput}-compare2base  
+#                       PROPERTIES DEPENDS 
+#                       ETS-JP2-${filenameInput}-decode)
+                       
+ENDFOREACH(numFileJP2)
+
 #--------------------------------------------------------------------------#
 #--------------------------------------------------------------------------#
 #--------------------------------------------------------------------------#
@@ -444,7 +493,7 @@ FOREACH(numFileP0 RANGE 1 16)
      
   ADD_TEST(NR-${filenameInput}-compare_dump2base
       ${EXECUTABLE_OUTPUT_PATH}/compare_dump_files
-     -b ${BASELINE_NR}/opj_${filenameRefSub}.txt
+     -b ${BASELINE_NR}/opj_v2_${filenameRefSub}.txt
      -t ${TEMP}/${filenameInput}.txt
      )
      
@@ -452,7 +501,7 @@ FOREACH(numFileP0 RANGE 1 16)
                        PROPERTIES DEPENDS 
                        NR-${filenameInput}-dump)
                        
-ENDFOREACH(numFileP0 RANGE 1 16) 
+ENDFOREACH(numFileP0) 
 
 #--------------------------------------------------------------------------
 # Tests about dump of profile 1 file
@@ -473,7 +522,36 @@ FOREACH(numFileP1 RANGE 1 7)
      
   ADD_TEST(NR-${filenameInput}-compare_dump2base
       ${EXECUTABLE_OUTPUT_PATH}/compare_dump_files
-     -b ${BASELINE_NR}/opj_${filenameInputSub}.txt
+     -b ${BASELINE_NR}/opj_v2_${filenameInputSub}.txt
+     -t ${TEMP}/${filenameInput}.txt
+     )
+     
+  SET_TESTS_PROPERTIES(NR-${filenameInput}-compare_dump2base
+                       PROPERTIES DEPENDS 
+                       NR-${filenameInput}-dump) 
+                       
+ENDFOREACH(numFileP1) 
+
+#--------------------------------------------------------------------------
+# Tests about dump of JP2 file
+# try to dump image and codestream informations into a file
+# non regression comparison this file to the baseline
+
+FOREACH(numFileJP2 RANGE 1 9) 
+
+  # Build filenames
+  SET( filenameInput "file${numFileJP2}.jp2" )
+  get_filename_component(filenameInputSub ${filenameInput} NAME_WE)
+
+  ADD_TEST(NR-${filenameInput}-dump
+      ${EXECUTABLE_OUTPUT_PATH}/j2k_dump
+     -i ${INPUT_CONF}/${filenameInput}
+     -o ${TEMP}/${filenameInput}.txt
+     )
+     
+  ADD_TEST(NR-${filenameInput}-compare_dump2base
+      ${EXECUTABLE_OUTPUT_PATH}/compare_dump_files
+     -b ${BASELINE_NR}/opj_v2_${filenameInputSub}.txt
      -t ${TEMP}/${filenameInput}.txt
      )
      
@@ -481,4 +559,4 @@ FOREACH(numFileP1 RANGE 1 7)
                        PROPERTIES DEPENDS 
                        NR-${filenameInput}-dump) 
                        
-ENDFOREACH(numFileP1 RANGE 1 7) 
+ENDFOREACH(numFileJP2) 
\ No newline at end of file