# NON-REGRESSION TESTS ON THIS DATASET LOCATED ${OPJ_DATA_ROOT}/input/nonregression
-cmake_minimum_required(VERSION 2.8.7)
+cmake_minimum_required(VERSION 3.5)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary)
issue475.jp2 #kdu_jp2info ok
issue413.jp2 #kdu_jp2info ok
issue823.jp2 #kdu_jp2info ok
- issue826.jp2 #inspection reveales that the transformation value is out of range
- oss-fuzz2785.jp2 #inspection reveales that the transformation value is out of range
+ issue826.jp2 #inspection reveals that the transformation value is out of range
+ oss-fuzz2785.jp2 #inspection reveals that the transformation value is out of range
+ issue1438.j2k
)
file(GLOB_RECURSE OPJ_DATA_NR_LIST
"${INPUT_NR}/*.j2c"
"${INPUT_NR}/*.jp2"
"${INPUT_NR}/*.jpc"
+ "${INPUT_NR}/*.jph"
+ "${INPUT_NR}/*.jhc"
#"${INPUT_NR}/*.jpx"
)
else ()
# Check if the first argument is equal to opj_compress
- string(REGEX MATCH "^opj_compress$|^opj_decompress$" EXE_NAME_FOUND ${EXE_NAME})
+ string(REGEX MATCH "^opj_compress$|^opj_compress_no_raw$|^opj_compress_no_raw_lossless$|^opj_decompress$" EXE_NAME_FOUND ${EXE_NAME})
if(EXE_NAME_FOUND)
- string(REGEX MATCH "opj_compress" ENC_TEST_FOUND ${EXE_NAME})
+ string(REGEX MATCH "^opj_compress$|^opj_compress_no_raw$|^opj_compress_no_raw_lossless$" ENC_TEST_FOUND ${EXE_NAME})
+ string(REGEX MATCH "^opj_compress_no_raw$|^opj_compress_no_raw_lossless$" NO_RAW ${EXE_NAME})
+ string(REGEX MATCH "opj_compress_no_raw_lossless" LOSSLESS ${EXE_NAME})
else()
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
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}
PROPERTIES DEPENDS
NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode)
- # Compare the decoding file with baseline generated from the kdu_expand and baseline.j2k
- add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base
- COMMAND compare_raw_files
- -b ${BASELINE_NR}/opj_${OUTPUT_FILENAME_NAME_WE}-ENC-${IT_TEST_ENC}.raw
- -t ${OUTPUT_FILENAME}.raw
- )
-
- 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)
+ if(NOT NO_RAW)
+ # Compare the decoding file with baseline generated from the kdu_expand and baseline.j2k
+ add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base
+ COMMAND compare_raw_files
+ -b ${BASELINE_NR}/opj_${OUTPUT_FILENAME_NAME_WE}-ENC-${IT_TEST_ENC}.raw
+ -t ${OUTPUT_FILENAME}.raw
+ )
+ 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)
+ endif()
endif()
# Test the encoded file is a valid JP2 file
# If lossless compression (simple test is 4 arguments), decompress & compare
list(LENGTH CMD_ARG_LIST_2 ARG_COUNT)
- if (ARG_COUNT EQUAL 4)
+ if ((ARG_COUNT EQUAL 4) OR LOSSLESS)
# can we compare with the input image ?
if (${INPUT_FILENAME_NAME} MATCHES "\\.tif$")
add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode
projects / openjpeg.git / blobdiff