Feature/jxl

.travis.yml

@@ -10,6 +10,7 @@ addons:
       - giflib
       - jasper
       - jpeg-turbo
+      - jpeg-xl
       - libavif
       - libpng
       - libtiff
@@ -38,7 +39,7 @@ jobs:
       dist: jammy
       name: "Ubuntu 22.04 Jammy"
     - os: osx
-      osx_image: xcode14.1
+      osx_image: xcode14.2
       name: "macOS 12.6"
       env:
         - CMAKE_PREFIX_PATH="/usr/local/opt/jpeg-turbo;$CMAKE_PREFIX_PATH"
@@ -80,6 +81,7 @@ script:
     local project_path="$1"
     local sail_cmake_path="$2"
     local build_type="$3"
+    local old_dir="$PWD"
 
     echo
     echo "External Windows Test '$project_path' '$build_type'"
@@ -93,13 +95,16 @@ script:
 
     fail_on_error cmake -A x64 -DSAIL_DEV=ON -DCMAKE_PREFIX_PATH="$sail_cmake_path" ..
     fail_on_error cmake --build . --config $build_type
+
+    cd "$old_dir"
   }
 
   test_external_unix()
   {
     local project_path="$1"
     local build_type="$2"
     local exe="$3"
+    local old_dir="$PWD"
 
     echo
     echo "External Unix Test '$project_path' '$build_type'"
@@ -114,6 +119,8 @@ script:
     fail_on_error cmake -DSAIL_DEV=ON -DCMAKE_BUILD_TYPE="$build_type" ..
     fail_on_error cmake --build .
     fail_on_error "$exe"
+
+    cd "$old_dir"
   }
 
   build()
@@ -145,6 +152,8 @@ script:
 
         test_external_windows "tests/external/link/c"   "$CMAKE_INSTALL_PREFIX/lib/cmake" "$CMAKE_BUILD_TYPE"
         test_external_windows "tests/external/link/c++" "$CMAKE_INSTALL_PREFIX/lib/cmake" "$CMAKE_BUILD_TYPE"
+
+        rm -rf "$CMAKE_INSTALL_PREFIX"
       ;;
       osx | linux)
         CMAKE_INSTALL_PREFIX="/usr/local"
@@ -160,11 +169,14 @@ script:
 
         cd tests
         fail_on_error ctest --verbose
+        cd -
 
         fail_on_error "$CMAKE_INSTALL_PREFIX/bin/sail" --version
 
         test_external_unix "tests/external/link/c"   "$CMAKE_BUILD_TYPE" "./external-c-api-link"
         test_external_unix "tests/external/link/c++" "$CMAKE_BUILD_TYPE" "./external-c++-api-link"
+
+        xargs sudo rm -v < install_manifest.txt
       ;;
     esac
   }

cmake/sail_codec.cmake

@@ -1,8 +1,10 @@
 # Intended to be included by every codec. Sets up necessary dependencies,
 # installation targets, codec info.
 #
+# Creates SAIL_CODEC_TARGET variable with the created target name.
+#
 macro(sail_codec)
-    cmake_parse_arguments(SAIL_CODEC "" "NAME;ICON" "SOURCES;LINK;DEPENDENCY_COMPILE_OPTIONS;DEPENDENCY_INCLUDE_DIRS;DEPENDENCY_LIBS" ${ARGN})
+    cmake_parse_arguments(SAIL_CODEC "" "NAME;ICON" "SOURCES;LINK;DEPENDENCY_COMPILE_DEFINITIONS;DEPENDENCY_INCLUDE_DIRS;DEPENDENCY_LIBS" ${ARGN})
 
     if (NOT SAIL_CODEC_NAME MATCHES "^[a-z0-9]+$")
         message(FATAL_ERROR "Invalid codec name '${SAIL_CODEC_NAME}'. Only lower-case letters and numbers are allowed.")
@@ -12,33 +14,33 @@ macro(sail_codec)
     # with libpng cmake configs (they also export a 'png' target)
     # and possibly other libs in the future.
     #
-    set(TARGET sail-codec-${SAIL_CODEC_NAME})
+    set(SAIL_CODEC_TARGET sail-codec-${SAIL_CODEC_NAME})
 
     # Add a codec
     #
     if (SAIL_COMBINE_CODECS)
-        add_library(${TARGET} OBJECT ${SAIL_CODEC_SOURCES})
+        add_library(${SAIL_CODEC_TARGET} OBJECT ${SAIL_CODEC_SOURCES})
     else()
-        add_library(${TARGET} MODULE ${SAIL_CODEC_SOURCES})
+        add_library(${SAIL_CODEC_TARGET} MODULE ${SAIL_CODEC_SOURCES})
 
-        sail_enable_asan(TARGET ${TARGET})
+        sail_enable_asan(TARGET ${SAIL_CODEC_TARGET})
     endif()
 
     # Disable a "lib" prefix on Unix
     #
-    set_target_properties(${TARGET} PROPERTIES PREFIX "")
+    set_target_properties(${SAIL_CODEC_TARGET} PROPERTIES PREFIX "")
 
     # Rename to 'sail-codec-png.dll'
     #
-    set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME sail-codec-${SAIL_CODEC_NAME})
+    set_target_properties(${SAIL_CODEC_TARGET} PROPERTIES OUTPUT_NAME sail-codec-${SAIL_CODEC_NAME})
 
     # Depend on sail-common
     #
-    target_link_libraries(${TARGET} PRIVATE sail-common)
+    target_link_libraries(${SAIL_CODEC_TARGET} PRIVATE sail-common)
 
     # Depend on user-defined targets
     #
-    target_link_libraries(${TARGET} PRIVATE ${SAIL_CODEC_LINK})
+    target_link_libraries(${SAIL_CODEC_TARGET} PRIVATE ${SAIL_CODEC_LINK})
 
     # This hack is needed for static builds where we have the following dependencies
     # ("->" is "links to"):
@@ -57,16 +59,16 @@ macro(sail_codec)
             get_target_property(TARGET_TYPE ${LINK_DEPENDENCY} TYPE)
 
             if (TARGET_TYPE STREQUAL "OBJECT_LIBRARY")
-                target_sources(${TARGET} INTERFACE $<TARGET_OBJECTS:${LINK_DEPENDENCY}>)
+                target_sources(${SAIL_CODEC_TARGET} INTERFACE $<TARGET_OBJECTS:${LINK_DEPENDENCY}>)
             endif()
         endif()
     endforeach()
 
     # Link against the found libs
     #
-    target_compile_options(${TARGET}     PRIVATE ${SAIL_CODEC_DEPENDENCY_COMPILE_OPTIONS})
-    target_include_directories(${TARGET} PRIVATE ${SAIL_CODEC_DEPENDENCY_INCLUDE_DIRS})
-    target_link_libraries(${TARGET}      PRIVATE ${SAIL_CODEC_DEPENDENCY_LIBS})
+    target_compile_definitions(${SAIL_CODEC_TARGET} PRIVATE ${SAIL_CODEC_DEPENDENCY_COMPILE_DEFINITIONS})
+    target_include_directories(${SAIL_CODEC_TARGET} PRIVATE ${SAIL_CODEC_DEPENDENCY_INCLUDE_DIRS})
+    target_link_libraries(${SAIL_CODEC_TARGET}      PRIVATE ${SAIL_CODEC_DEPENDENCY_LIBS})
 
     # Generate and copy .codec.info into the build dir
     #
@@ -77,7 +79,7 @@ macro(sail_codec)
     # Installation
     #
     if (NOT SAIL_COMBINE_CODECS)
-        install(TARGETS ${TARGET} DESTINATION "${CMAKE_INSTALL_LIBDIR}/sail/codecs")
+        install(TARGETS ${SAIL_CODEC_TARGET} DESTINATION "${CMAKE_INSTALL_LIBDIR}/sail/codecs")
 
         install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sail-codec-${SAIL_CODEC_NAME}.codec.info"
                 DESTINATION "${CMAKE_INSTALL_LIBDIR}/sail/codecs")

examples/c/sail/sail.c

@@ -88,8 +88,6 @@
 
     sail_destroy_image(image);
 
-    SAIL_LOG_INFO("\n*** Success ***\n");
-
     return SAIL_OK;
 }
 
@@ -127,6 +125,41 @@
     return SAIL_OK;
 }
 
+static void print_aligned_image_info(const struct sail_image *image) {
+
+    printf("Size          : %ux%u\n", image->width, image->height);
+
+    if (image->resolution == NULL) {
+        printf("Resolution:   : -\n");
+    } else {
+        printf("Resolution:   : %.1fx%.1f\n", image->resolution->x, image->resolution->y);
+    }
+
+    printf("Pixel format  : %s\n", sail_pixel_format_to_string(image->source_image->pixel_format));
+    printf("ICC profile   : %s\n", image->iccp == NULL ? "no" : "yes");
+    printf("Interlaced    : %s\n", image->source_image->interlaced ? "yes" : "no");
+    printf("Delay         : %d ms.\n", image->delay);
+
+    if (image->meta_data_node != NULL) {
+        printf("Meta data     :\n");
+
+        for (const struct sail_meta_data_node *meta_data_node = image->meta_data_node; meta_data_node != NULL; meta_data_node = meta_data_node->next) {
+            const struct sail_meta_data *meta_data = meta_data_node->meta_data;
+            const char *meta_data_str = NULL;
+
+            if (meta_data->key == SAIL_META_DATA_UNKNOWN) {
+                meta_data_str = meta_data->key_unknown;
+            } else {
+                meta_data_str = sail_meta_data_to_string(meta_data->key);
+            }
+
+            printf("  %-12s: ", meta_data_str);
+            sail_printf_variant(meta_data->value);
+            printf("\n");
+        }
+    }
+}
+
 static sail_status_t probe_impl(const char *path) {
 
     SAIL_CHECK_PTR(path);
@@ -139,63 +172,86 @@
 
     SAIL_TRY(sail_probe_file(path, &image, &codec_info));
 
+    uint64_t elapsed_time = sail_now() - start_time;
+
     printf("File          : %s\n", path);
-    printf("Probe time    : %lu ms.\n", (unsigned long)(sail_now() - start_time));
     printf("Codec         : %s [%s]\n", codec_info->name, codec_info->description);
     printf("Codec version : %s\n", codec_info->version);
-    printf("Size          : %ux%u\n", image->width, image->height);
-    if (image->resolution == NULL) {
-        printf("Resolution:   : -\n");
-    } else {
-        printf("Resolution:   : %.1fx%.1f\n", image->resolution->x, image->resolution->y);
-    }
-    printf("Pixel format  : %s\n", sail_pixel_format_to_string(image->source_image->pixel_format));
-    printf("ICC profile   : %s\n", image->iccp == NULL ? "no" : "yes");
-    printf("Interlaced    : %s\n", image->source_image->interlaced ? "yes" : "no");
+    printf("Probe time    : %lu ms.\n", (unsigned long)elapsed_time);
 
-    for (const struct sail_meta_data_node *meta_data_node = image->meta_data_node; meta_data_node != NULL; meta_data_node = meta_data_node->next) {
-        const struct sail_meta_data *meta_data = meta_data_node->meta_data;
-        const char *meta_data_str = NULL;
+    print_aligned_image_info(image);
 
-        if (meta_data->key == SAIL_META_DATA_UNKNOWN) {
-            meta_data_str = meta_data->key_unknown;
-        } else {
-            meta_data_str = sail_meta_data_to_string(meta_data->key);
-        }
+    sail_destroy_image(image);
 
-        printf("%-14s: ", meta_data_str);
-
-        switch (meta_data->value->type) {
-            case SAIL_VARIANT_TYPE_BOOL:           printf("%s\n",  sail_variant_to_bool(meta_data->value) ? "<set>" : "<unset>");   break;
-            case SAIL_VARIANT_TYPE_CHAR:           printf("%d\n",  sail_variant_to_char(meta_data->value));                         break;
-            case SAIL_VARIANT_TYPE_UNSIGNED_CHAR:  printf("%u\n",  sail_variant_to_unsigned_char(meta_data->value));                break;
-            case SAIL_VARIANT_TYPE_SHORT:          printf("%d\n",  sail_variant_to_short(meta_data->value));                        break;
-            case SAIL_VARIANT_TYPE_UNSIGNED_SHORT: printf("%u\n",  sail_variant_to_unsigned_short(meta_data->value));               break;
-            case SAIL_VARIANT_TYPE_INT:            printf("%d\n",  sail_variant_to_int(meta_data->value));                          break;
-            case SAIL_VARIANT_TYPE_UNSIGNED_INT:   printf("%u\n",  sail_variant_to_unsigned_int(meta_data->value));                 break;
-            case SAIL_VARIANT_TYPE_LONG:           printf("%ld\n", sail_variant_to_long(meta_data->value));                         break;
-            case SAIL_VARIANT_TYPE_UNSIGNED_LONG:  printf("%lu\n", sail_variant_to_unsigned_long(meta_data->value));                break;
-            case SAIL_VARIANT_TYPE_FLOAT:          printf("%.1f\n", sail_variant_to_float(meta_data->value));                       break;
-            case SAIL_VARIANT_TYPE_DOUBLE:         printf("%.1f\n", sail_variant_to_double(meta_data->value));                      break;
-            case SAIL_VARIANT_TYPE_STRING:         printf("%s\n", sail_variant_to_string(meta_data->value));                        break;
-            case SAIL_VARIANT_TYPE_DATA:           printf("<binary data, length: %u byte(s)>\n", (unsigned)meta_data->value->size); break;
-            case SAIL_VARIANT_TYPE_INVALID:        printf("<invalid value>\n");                                                     break;
-        }
+    return SAIL_OK;
+}
+
+static sail_status_t probe(int argc, char *argv[]) {
+
+    if (argc != 3) {
+        print_invalid_argument();
+        SAIL_LOG_AND_RETURN(SAIL_ERROR_INVALID_ARGUMENT);
     }
 
+    SAIL_TRY(probe_impl(argv[2]));
+
+    return SAIL_OK;
+}
+
+static sail_status_t decode_impl(const char *path) {
+
+    SAIL_CHECK_PTR(path);
+
+    struct sail_image *image;
+    const struct sail_codec_info *codec_info;
+
+    SAIL_TRY(sail_probe_file(path, &image, &codec_info));
+
+    printf("File          : %s\n", path);
+    printf("Codec         : %s [%s]\n", codec_info->name, codec_info->description);
+    printf("Codec version : %s\n", codec_info->version);
+
     sail_destroy_image(image);
 
+    /* Time counter. */
+    uint64_t start_time = sail_now();
+
+    /* Decode. */
+    void *state;
+    SAIL_TRY(sail_start_loading_from_file(path, codec_info, &state));
+
+    sail_status_t status;
+    unsigned frame = 0;
+
+    while ((status = sail_load_next_frame(state, &image)) == SAIL_OK) {
+        printf("Frame #%u\n", frame++);
+        print_aligned_image_info(image);
+        sail_destroy_image(image);
+    }
+
+    if (status != SAIL_ERROR_NO_MORE_FRAMES) {
+        sail_stop_loading(state);
+        fprintf(stderr, "Error: Decoder error %d.\n", status);
+        SAIL_LOG_AND_RETURN(SAIL_ERROR_BROKEN_IMAGE);
+    }
+
+    SAIL_TRY(sail_stop_loading(state));
+
+    uint64_t elapsed_time = sail_now() - start_time;
+
+    printf("Decode time   : %lu ms.\n", (unsigned long)elapsed_time);
+
     return SAIL_OK;
 }
 
-static sail_status_t probe(int argc, char *argv[]) {
+static sail_status_t decode(int argc, char *argv[]) {
 
     if (argc != 3) {
         print_invalid_argument();
         SAIL_LOG_AND_RETURN(SAIL_ERROR_INVALID_ARGUMENT);
     }
 
-    SAIL_TRY(probe_impl(argv[2]));
+    SAIL_TRY(decode_impl(argv[2]));
 
     return SAIL_OK;
 }
@@ -260,9 +316,13 @@
     fprintf(stderr, "       %s [-v | --version]\n", app);
     fprintf(stderr, "       %s [-h | --help]\n", app);
     fprintf(stderr, "Commands:\n");
-    fprintf(stderr, "    convert <INPUT PATH> <OUTPUT PATH> [-c | --compression <value>] - Convert one image format to another.\n");
     fprintf(stderr, "    list [-v] - List supported codecs.\n");
-    fprintf(stderr, "    probe <PATH> - Retrieve image information.\n");
+    fprintf(stderr, "\n");
+    fprintf(stderr, "    convert <INPUT PATH> <OUTPUT PATH> [-c | --compression <value>] - Convert one image format to another.\n");
+    fprintf(stderr, "\n");
+    fprintf(stderr, "    probe <PATH> - Retrieve information of the very first image found in the file.\n");
+    fprintf(stderr, "                   In most cases probing doesn't decode the image data.\n");
+    fprintf(stderr, "    decode <PATH> - Decode the whole file and print information of all its frames.\n");
 }
 
 int main(int argc, char *argv[]) {
@@ -291,6 +351,8 @@
         SAIL_TRY(list(argc, argv));
     } else if (strcmp(argv[1], "probe") == 0) {
         SAIL_TRY(probe(argc, argv));
+    } else if (strcmp(argv[1], "decode") == 0) {
+        SAIL_TRY(decode(argc, argv));
     } else {
         print_invalid_argument();
         SAIL_LOG_AND_RETURN(SAIL_ERROR_INVALID_ARGUMENT);

src/libsail-common/common.h

@@ -133,10 +133,12 @@ enum SailPixelFormat {
     SAIL_PIXEL_FORMAT_BPP64_ABGR,
 
     /*
-     * Float formats.
+     * 32-bit single-precision floating point formats.
      */
-    SAIL_PIXEL_FORMAT_BPP16_FLOAT,
     SAIL_PIXEL_FORMAT_BPP32_FLOAT,
+    SAIL_PIXEL_FORMAT_BPP64_FLOAT,
+    SAIL_PIXEL_FORMAT_BPP96_FLOAT,
+    SAIL_PIXEL_FORMAT_BPP128_FLOAT,
 
     /*
      * CMYK formats.