diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-10-09 13:25:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-09 13:25:27 +0200 |
| commit | 491299eb073c80602ca8ee333303a31a581d3fa8 (patch) | |
| tree | f464aca94231b459c62f774a6a956f3e73c2bbce /tests/nonregression/CMakeLists.txt | |
| parent | 65c8f577d2f057e80040e98958eae80ca76c6b94 (diff) | |
| parent | 1c5627ee7406f84cfb40809b7ac31c63342427df (diff) | |
Merge pull request #1253 from rouault/floating_point_irreversible_encoding
Single-threaded performance improvements in forward DWT for 5-3 and 9-7 (and other improvements)
Diffstat (limited to 'tests/nonregression/CMakeLists.txt')
| -rw-r--r-- | tests/nonregression/CMakeLists.txt | 53 |
1 files changed, 51 insertions, 2 deletions
diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt index b1303ad8..7cbe01e0 100644 --- a/tests/nonregression/CMakeLists.txt +++ b/tests/nonregression/CMakeLists.txt @@ -250,6 +250,32 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) list(REMOVE_AT CMD_ARG_LIST 0) + if(ENC_TEST_FOUND) + + # Parse lines like opj_compress lossy-check { -n 3 -m 0:0:0 -p 0:0:0 } ... + set(LOSSY_CHECK_ARG_LIST "") + list(GET CMD_ARG_LIST 0 NEXT_ARG) + string(REGEX MATCH "^lossy-check$" LOSSY_CHECK ${NEXT_ARG}) + if(LOSSY_CHECK) + list(REMOVE_AT CMD_ARG_LIST 0) + list(GET CMD_ARG_LIST 0 NEXT_ARG) + string(REGEX MATCH "^{$" FOUND_OPEN_CURL ${NEXT_ARG}) + if(NOT FOUND_OPEN_CURL) + message( FATAL_ERROR "'{' expected after lossy-check") + endif() + list(REMOVE_AT CMD_ARG_LIST 0) + while(TRUE) + list(GET CMD_ARG_LIST 0 NEXT_ARG) + list(REMOVE_AT CMD_ARG_LIST 0) + string(REGEX MATCH "^}$" FOUND_CLOSE_CURL ${NEXT_ARG}) + if(FOUND_CLOSE_CURL) + break() + endif() + list (APPEND LOSSY_CHECK_ARG_LIST ${NEXT_ARG}) + endwhile() + endif() + endif() + endif () # Parse the argument list to find the input filename and output filename @@ -322,8 +348,32 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) PROPERTIES DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-dump) + if(LOSSY_CHECK) + add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref + COMMAND opj_decompress + -i ${OUTPUT_FILENAME} + -o ${OUTPUT_FILENAME}.tif + ) + + set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref + PROPERTIES DEPENDS + NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode) + + # Compare the decoding file with original one, using tolerance + add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base + COMMAND compare_images + -b ${INPUT_FILENAME} + -t ${OUTPUT_FILENAME}.tif + -s bXtY + ${LOSSY_CHECK_ARG_LIST} + ) + + set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base + PROPERTIES DEPENDS + NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref) + # Decode the encoding file with kakadu expand command - if (KDU_EXPAND_EXECUTABLE) + elseif (KDU_EXPAND_EXECUTABLE) add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref COMMAND ${KDU_EXPAND_EXECUTABLE} -i ${OUTPUT_FILENAME} @@ -346,7 +396,6 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) PROPERTIES DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref) endif() - endif() # Test the encoded file is a valid JP2 file |