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
   }

FORMATS.md

@@ -163,6 +163,37 @@
 </tr>
 <tr>
     <td>8</td>
+    <td><a href="https://wikipedia.org/wiki/JPEG_XL">JPEG XL</a></td>
+    <td>
+        <b>Grayscale:</b> 8-bit, 16-bit.
+        <b>RGB:</b> 24-bit, 48-bit.
+        <b>RGBA:</b> 32-bit, 64-bit.
+        <b>CMYK:</b> 32-bit, 64-bit.
+        <b>CMYKA:</b> 40-bit, 80-bit.
+        <br/><br/>
+        <b>Content:</b> Static, Animated, Meta data, ICC profiles.
+        <br/><br/>
+        <b>Special properties:</b>
+             Key: <i>"jpegxl-bits-per-sample"</i>. Possible values: unsigned int.
+        <br/>Key: <i>"jpegxl-exponent-bits-per-sample"</i>. Possible values: unsigned int.
+        <br/>Key: <i>"jpegxl-intensity-target"</i>. Possible values: float.
+        <br/>Key: <i>"jpegxl-min-nits"</i>. Possible values: float.
+        <br/>Key: <i>"jpegxl-relative-to-max-display"</i>. Possible values: bool.
+        <br/>Key: <i>"jpegxl-linear-below"</i>. Possible values: float.
+        <br/>Key: <i>"jpegxl-color-channels"</i>. Possible values: unsigned int.
+        <br/>Key: <i>"jpegxl-extra-channels"</i>. Possible values: unsigned int.
+        <br/>Key: <i>"jpegxl-alpha-bits"</i>. Possible values: unsigned int.
+        <br/>Key: <i>"jpegxl-intrinsic-width"</i>. Possible values: unsigned int.
+        <br/>Key: <i>"jpegxl-intrinsic-height"</i>. Possible values: unsigned int.
+        <br/>See the <a href="https://libjxl.readthedocs.io/en/latest/api_metadata.html#_CPPv412JxlBasicInfo">JxlBasicInfo structure</a> documentation in libjxl for more.
+    </td>
+    <td>-</td>
+    <td>Unsupported</td>
+    <td>-</td>
+    <td>-</td>
+</tr>
+<tr>
+    <td>9</td>
     <td><a href="https://wikipedia.org/wiki/PCX">PCX</a></td>
     <td>
         <b>Indexed:</b> 1-bit, 4-bit, 8-bit.
@@ -179,7 +210,7 @@
     <td>-</td>
 </tr>
 <tr>
-    <td>9</td>
+    <td>10</td>
     <td><a href="https://wikipedia.org/wiki/Portable_Network_Graphics">PNG</a></td>
     <td>
         <b>Grayscale:</b> 1-bit, 2-bit, 4-bit, 8-bit, 16-bit.
@@ -207,7 +238,7 @@
     <td>libpng</td>
 </tr>
 <tr>
-    <td>10</td>
+    <td>11</td>
     <td><a href="https://en.wikipedia.org/wiki/Adobe_Photoshop#File_format">PSD</a></td>
     <td>
         <b>Grayscale:</b> 8-bit, 16-bit.
@@ -234,7 +265,7 @@
     <td>-</td>
 </tr>
 <tr>
-    <td>11</td>
+    <td>12</td>
     <td><a href="http://qoiformat.org">QOI</a></td>
     <td>
         <b>RGB:</b> 24-bit.
@@ -253,7 +284,7 @@
     <td>-</td>
 </tr>
 <tr>
-    <td>12</td>
+    <td>13</td>
     <td><a href="https://wikipedia.org/wiki/Scalable_Vector_Graphics">SVG</a></td>
     <td>
         <b>Bit depth:</b> 32-bit.
@@ -272,7 +303,7 @@
     <td>resvg</td>
 </tr>
 <tr>
-    <td>13</td>
+    <td>14</td>
     <td><a href="https://wikipedia.org/wiki/Truevision_TGA">TGA</a></td>
     <td>
         <b>Grayscale:</b> 8-bit.
@@ -288,7 +319,7 @@
     <td>-</td>
 </tr>
 <tr>
-    <td>14</td>
+    <td>15</td>
     <td><a href="https://wikipedia.org/wiki/TIFF">TIFF</a></td>
     <td>
         <b>Bit depth:</b> 1-bit, 2-bit, 4-bit, 8-bit, 16-bit, 24-bit, 32-bit, 48-bit, 64-bit.
@@ -309,7 +340,7 @@
     <td>libtiff</td>
 </tr>
 <tr>
-    <td>15</td>
+    <td>16</td>
     <td><a href="http://fileformats.archiveteam.org/wiki/Quake_2_Texture">WAL</a></td>
     <td>
         <b>Indexed:</b> 8-bit.
@@ -322,7 +353,7 @@
     <td>-</td>
 </tr>
 <tr>
-    <td>16</td>
+    <td>17</td>
     <td><a href="https://wikipedia.org/wiki/WebP">WEBP</a></td>
     <td>
         <b>Bit depth:</b> 24-bit, 32-bit.
@@ -335,7 +366,7 @@
     <td>libwebp</td>
 </tr>
 <tr>
-    <td>17</td>
+    <td>18</td>
     <td><a href="https://en.wikipedia.org/wiki/X_BitMap">XBM</a></td>
     <td>
         <b>Bit depth:</b> 1-bit.

README.md

@@ -76,15 +76,16 @@ images with the help of [ksquirrel-libs](FAQ.md#how-old-is-sail), the predecesso
 | .. | ...                                                                 |               |                   |
 | 6  | [JPEG](https://wikipedia.org/wiki/JPEG)                             | RW            | libjpeg-turbo     |
 | 7  | [JPEG2000](https://wikipedia.org/wiki/JPEG_2000)                    | R             | jasper            |
-| 8  | [PCX](https://wikipedia.org/wiki/PCX)                               | R             |                   |
-| 9  | [PNG](https://wikipedia.org/wiki/Portable_Network_Graphics)         | RW            | libpng            |
-| 10 | [PSD](https://en.wikipedia.org/wiki/Adobe_Photoshop#File_format)    | R             |                   |
-| 11 | [QOI](http://qoiformat.org)                                         | RW            |                   |
-| 12 | [SVG](https://wikipedia.org/wiki/Scalable_Vector_Graphics)          | R             | resvg             |
-| 13 | [TGA](https://wikipedia.org/wiki/Truevision_TGA)                    | R             |                   |
-| 14 | [TIFF](https://wikipedia.org/wiki/TIFF)                             | RW            | libtiff           |
+| 8  | [JPEG XL](https://wikipedia.org/wiki/JPEG_XL)                       | R             | libjxl            |
+| 9  | [PCX](https://wikipedia.org/wiki/PCX)                               | R             |                   |
+| 10 | [PNG](https://wikipedia.org/wiki/Portable_Network_Graphics)         | RW            | libpng            |
+| 11 | [PSD](https://en.wikipedia.org/wiki/Adobe_Photoshop#File_format)    | R             |                   |
+| 12 | [QOI](http://qoiformat.org)                                         | RW            |                   |
+| 13 | [SVG](https://wikipedia.org/wiki/Scalable_Vector_Graphics)          | R             | resvg             |
+| 14 | [TGA](https://wikipedia.org/wiki/Truevision_TGA)                    | R             |                   |
+| 15 | [TIFF](https://wikipedia.org/wiki/TIFF)                             | RW            | libtiff           |
 | .. | ...                                                                 |               |                   |
-| 16 | [WEBP](https://wikipedia.org/wiki/WebP)                             | R             | libwebp           |
+| 17 | [WEBP](https://wikipedia.org/wiki/WebP)                             | R             | libwebp           |
 | .. | ...                                                                 |               |                   |
 
 See the full list [here](FORMATS.md). Work to add more image formats is ongoing.

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")