Fix some typos (found by `codespell` and `typos`)

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

diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
index 9f956b901fe6e6f839daebae17b088a66946e82f..c3b9578f6c89617449f30d90f822befde1a59bca 100644 (file)
--- a/tests/nonregression/CMakeLists.txt
+++ b/tests/nonregression/CMakeLists.txt
@@ -1,6 +1,6 @@
 # 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)
 
@@ -34,7 +34,6 @@ set(BLACKLIST_JPEG2000_TMP
     edf_c2_1178956.jp2
     edf_c2_1000290.jp2
     #edf_c2_1000691.jp2 # ok
-    #edf_c2_20.jp2 #looks ok as per kdu_jp2info
     edf_c2_1377017.jp2
     edf_c2_1002767.jp2
     edf_c2_10025.jp2
@@ -61,6 +60,7 @@ set(BLACKLIST_JPEG2000
     broken2.jp2
     broken3.jp2
     broken4.jp2
+    edf_c2_20.jp2 #may look ok as per kdu_jp2info, but inspection it reveals that the transformation value is out of range
     gdal_fuzzer_assert_in_opj_j2k_read_SQcd_SQcc.patch.jp2     
     gdal_fuzzer_check_comp_dx_dy.jp2
     gdal_fuzzer_check_number_of_tiles.jp2
@@ -82,6 +82,9 @@ set(BLACKLIST_JPEG2000
     issue475.jp2 #kdu_jp2info ok
     issue413.jp2 #kdu_jp2info ok
     issue823.jp2 #kdu_jp2info ok
+    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
@@ -89,6 +92,8 @@ 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"
      )
 
@@ -248,6 +253,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
@@ -320,8 +351,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}
@@ -344,7 +399,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