X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=tests%2Fnonregression%2FCMakeLists.txt;h=bd336a97f8d46e5b06747c4b01a1966871d79409;hb=2e977fac16acc6b1994e37b4de9271b710bc5129;hp=242e52fe2464f3371e9290c8269438d7d8b00509;hpb=8397eac3823b92e4cf6d6ba14570ca50a0cf5b3a;p=openjpeg.git

diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
index 242e52fe..bd336a97 100644
--- a/tests/nonregression/CMakeLists.txt
+++ b/tests/nonregression/CMakeLists.txt
@@ -1,5 +1,7 @@
 # NON-REGRESSION TESTS ON THIS DATASET LOCATED ${OPJ_DATA_ROOT}/input/nonregression
 
+cmake_minimum_required(VERSION 2.8.7)
+
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary)
 
 set(TEMP ${CMAKE_CURRENT_BINARY_DIR}/Temporary)
@@ -13,6 +15,8 @@ set(INPUT_CONF_PATH ${OPJ_DATA_ROOT}/input/conformance)
 
 # need kdu_expand if possible
 find_package(KAKADU)
+# need jpylyzer if possible
+find_package(JPYLYZER)
 
 #########################################################################
 # GENERATION OF THE TEST SUITE (DUMP)
@@ -30,10 +34,9 @@ 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
+    edf_c2_10025.jp2
     edf_c2_1000234.jp2
     edf_c2_225881.jp2
     edf_c2_1000671.jp2
@@ -42,16 +45,22 @@ set(BLACKLIST_JPEG2000_TMP
     edf_c2_101463.jp2
     edf_c2_1674177.jp2
     edf_c2_1673169.jp2
+    issue418.jp2
     issue429.jp2
+    issue427-null-image-size.jp2
+    issue427-illegal-tile-offset.jp2
+    issue495.jp2
+    issue820.jp2
    )
 
 # Define a list of file which should be gracefully rejected:
 set(BLACKLIST_JPEG2000
     ${BLACKLIST_JPEG2000_TMP}
-    broken.jp2 
+    broken1.jp2
     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
@@ -68,6 +77,13 @@ set(BLACKLIST_JPEG2000
     issue393.jp2 #kdu_jp2info ok
     issue408.jp2 #kdu_jp2info ok
     issue420.jp2 #kdu_jp2info ok
+    27ac957758a35d00d6765a0c86350d9c.SIGFPE.d25.537.jpc #kdu_jp2info crash
+    3672da2f1f67bbecad27d7181b4e9d7c.SIGFPE.d25.805.jpc #kdu_jp2info crash
+    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
    )
 
 file(GLOB_RECURSE OPJ_DATA_NR_LIST
@@ -75,6 +91,7 @@ file(GLOB_RECURSE OPJ_DATA_NR_LIST
      "${INPUT_NR}/*.j2c"
      "${INPUT_NR}/*.jp2"
      "${INPUT_NR}/*.jpc"
+     "${INPUT_NR}/*.jph"
      #"${INPUT_NR}/*.jpx"
      )
 
@@ -218,11 +235,13 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
 
     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()
 
@@ -232,6 +251,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
@@ -304,8 +349,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}
@@ -316,17 +385,52 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
                                  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 (JPYLYZER_EXECUTABLE)
+            if (${OUTPUT_FILENAME} MATCHES "\\.jp2$")
+              add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-jpylyser
+                COMMAND ${JPYLYZER_EXECUTABLE}
+                ${OUTPUT_FILENAME}
+                )
+              set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-jpylyser PROPERTIES
+                DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode
+                PASS_REGULAR_EXPRESSION "<isValidJP2>True</isValidJP2>"
+                )		
+            endif()
+          endif(JPYLYZER_EXECUTABLE)
+
+          # If lossless compression (simple test is 4 arguments), decompress & compare
+          list(LENGTH CMD_ARG_LIST_2 ARG_COUNT)
+          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
+                COMMAND opj_decompress -i ${OUTPUT_FILENAME} -o ${OUTPUT_FILENAME}.lossless.tif
+                )
+              set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode PROPERTIES
+                DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode
+                )
+              add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare
+                COMMAND compare_images -b ${INPUT_FILENAME} -t ${OUTPUT_FILENAME}.lossless.tif -n 1 -d
+                )
+              set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare PROPERTIES
+                DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode
+                )	
+            endif()
           endif()
       endif()
 
@@ -355,12 +459,12 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
           -DOUTFILENAME:STRING=${OUTPUT_FILENAME}
           -P ${CMAKE_CURRENT_SOURCE_DIR}/checkmd5refs.cmake)
 
-        set_tests_properties(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5 
+        set_tests_properties(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5
           PROPERTIES DEPENDS NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode
         )
 
 # FIXME: add a compare2base function base on raw which
-# can output png diff files if necesary
+# can output png diff files if necessary
 #  add_test(NR-${filename}-compare2base
 #      ${EXECUTABLE_OUTPUT_PATH}/compare_images
 #     -b ${BASELINE_NR}/opj_${filenameRef}