summaryrefslogtreecommitdiff
path: root/tests/conformance
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2014-03-04 09:14:47 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2014-03-04 09:14:47 +0000
commit0c80fcff2a880aef6bc2757fcb374ab57512d7eb (patch)
treef6b121ce1dccfd00229129e01d1b5098b6818719 /tests/conformance
parent51caff5dcfb8dced1677991610f739a7dde70a2e (diff)
[trunk] Add a TIFF compare function (PEAK/MSE)
Fixes issue 100
Diffstat (limited to 'tests/conformance')
-rw-r--r--tests/conformance/CMakeLists.txt59
1 files changed, 31 insertions, 28 deletions
diff --git a/tests/conformance/CMakeLists.txt b/tests/conformance/CMakeLists.txt
index 6f80cf12..57fd2568 100644
--- a/tests/conformance/CMakeLists.txt
+++ b/tests/conformance/CMakeLists.txt
@@ -438,34 +438,37 @@ foreach(numFileJP2 RANGE 1 9)
list(GET JP2_PEAK_list ${numFileJP2} PEAK_limit)
add_test(NAME ETS-JP2-${filenameInput}-decode
- COMMAND opj_decompress
- -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)
+ COMMAND opj_decompress
+ -i ${INPUT_CONF}/${filenameInput}
+ -o ${TEMP}/${filenameInput}.tif
+ )
+
+ add_test(NAME ETS-JP2-${filenameInput}-compare2ref
+ COMMAND comparePGXimages
+ -b ${BASELINE_CONF}/${filenameRef}
+ -t ${TEMP}/${filenameInput}.tif
+ -n 3
+ -p 4:4:4
+ -m 4:4:4
+ -s b_t_
+ )
+
+ set_tests_properties(ETS-JP2-${filenameInput}-compare2ref
+ PROPERTIES DEPENDS
+ ETS-JP2-${filenameInput}-decode)
+
+ add_test(NAME NR-JP2-${filenameInput}-compare2base
+ COMMAND comparePGXimages
+ -b ${BASELINE_NR}/opj_${filenameRef}
+ -t ${TEMP}/${filenameInput}.tif
+ -n 3
+ -d
+ -s b_t_
+ )
+
+ set_tests_properties(NR-JP2-${filenameInput}-compare2base
+ PROPERTIES DEPENDS
+ ETS-JP2-${filenameInput}-decode)
endforeach()