@revizly/sharp 0.35.0-revizly52 → 0.35.0-revizly54

package/dist/index.d.cts

@@ -775,7 +775,7 @@ declare namespace sharp {
          * Use these JPEG-XL (JXL) options for output image.
          * This feature is experimental, please do not use in production systems.
          * Requires libvips compiled with support for libjxl.
-         * The prebuilt binaries do not include this.
+         * The `@revizly` prebuilt binaries include this.
          * Image metadata (EXIF, XMP) is unsupported.
          * @param options Output options.
          * @throws {Error} Invalid options

package/dist/index.d.mts

@@ -769,7 +769,7 @@ export interface Sharp extends Duplex {
      * Use these JPEG-XL (JXL) options for output image.
      * This feature is experimental, please do not use in production systems.
      * Requires libvips compiled with support for libjxl.
-     * The prebuilt binaries do not include this.
+     * The `@revizly` prebuilt binaries include this.
      * Image metadata (EXIF, XMP) is unsupported.
      * @param options Output options.
      * @throws {Error} Invalid options

package/dist/output.cjs

@@ -1326,8 +1326,7 @@ function heif (options) {
  * This feature is experimental, please do not use in production systems.
  *
  * Requires libvips compiled with support for libjxl.
- * The prebuilt binaries do not include this - see
- * {@link /install/#custom-libvips installing a custom libvips}.
+ * The `@revizly` prebuilt binaries include this.
  *
  * @since 0.31.3
  *

package/dist/output.mjs

@@ -1326,8 +1326,7 @@ function heif (options) {
  * This feature is experimental, please do not use in production systems.
  *
  * Requires libvips compiled with support for libjxl.
- * The prebuilt binaries do not include this - see
- * {@link /install/#custom-libvips installing a custom libvips}.
+ * The `@revizly` prebuilt binaries include this.
  *
  * @since 0.31.3
  *

package/lib/index.d.ts

@@ -775,7 +775,7 @@ declare namespace sharp {
          * Use these JPEG-XL (JXL) options for output image.
          * This feature is experimental, please do not use in production systems.
          * Requires libvips compiled with support for libjxl.
-         * The prebuilt binaries do not include this.
+         * The `@revizly` prebuilt binaries include this.
          * Image metadata (EXIF, XMP) is unsupported.
          * @param options Output options.
          * @throws {Error} Invalid options

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@revizly/sharp",
   "description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, GIF, AVIF and TIFF images",
-  "version": "0.35.0-revizly52",
+  "version": "0.35.0-revizly54",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -163,10 +163,10 @@
     "semver": "^7.8.5"
   },
   "optionalDependencies": {
-    "@revizly/sharp-libvips-linux-arm64": "1.0.53",
-    "@revizly/sharp-libvips-linux-x64": "1.0.53",
-    "@revizly/sharp-linux-arm64": "0.35.0-revizly52",
-    "@revizly/sharp-linux-x64": "0.35.0-revizly52"
+    "@revizly/sharp-libvips-linux-arm64": "1.0.54",
+    "@revizly/sharp-libvips-linux-x64": "1.0.54",
+    "@revizly/sharp-linux-arm64": "0.35.0-revizly54",
+    "@revizly/sharp-linux-x64": "0.35.0-revizly54"
   },
   "peerDependenciesMeta": {
     "@types/node": {
@@ -177,7 +177,7 @@
     "@biomejs/biome": "^2.5.14",
     "@cpplint/cli": "^0.1.0",
     "@emnapi/runtime": "^1.11.3",
-    "@revizly/sharp-libvips-dev": "1.0.53",
+    "@revizly/sharp-libvips-dev": "1.0.54",
     "@types/node": "*",
     "emnapi": "^1.11.3",
     "exif-reader": "^2.0.3",

package/src/common.cc

@@ -399,6 +399,7 @@ namespace sharp {
       imageType == ImageType::JP2 ||
       imageType == ImageType::TIFF ||
       imageType == ImageType::HEIF ||
+      imageType == ImageType::JXL ||
       imageType == ImageType::PDF;
   }
 

package/src/pipeline.cc

@@ -78,7 +78,20 @@ class PipelineWorker : public Napi::AsyncWorker {
         }
       }
       VipsAccess access = baton->input->access;
-      image = sharp::EnsureColourspace(image, baton->colourspacePipeline);
+      // A device-independent colourspace is reached through the ICC profile connection space, either Lab or XYZ
+      bool const labPcs =
+        baton->colourspacePipeline == VIPS_INTERPRETATION_LAB ||
+        baton->colourspacePipeline == VIPS_INTERPRETATION_LABS ||
+        baton->colourspacePipeline == VIPS_INTERPRETATION_LCH;
+      bool const xyzPcs =
+        baton->colourspacePipeline == VIPS_INTERPRETATION_scRGB ||
+        baton->colourspacePipeline == VIPS_INTERPRETATION_XYZ ||
+        baton->colourspacePipeline == VIPS_INTERPRETATION_YXY;
+      // lcms needs 8/16-bit device values, so the conversion must wait for the import
+      bool const deferColourspace = sharp::HasProfile(image) && (labPcs || xyzPcs);
+      if (!deferColourspace) {
+        image = sharp::EnsureColourspace(image, baton->colourspacePipeline);
+      }
 
       int nPages = baton->input->pages;
       if (nPages == -1) {
@@ -372,6 +385,7 @@ class PipelineWorker : public Napi::AsyncWorker {
         baton->input->ignoreIcc = true;
       }
       char const *processingProfile = image.interpretation() == VIPS_INTERPRETATION_RGB16 ? "p3" : "srgb";
+      bool importedToPcs = false;
       if (
         sharp::HasProfile(image) &&
         image.interpretation() != VIPS_INTERPRETATION_LABS &&
@@ -381,10 +395,20 @@ class PipelineWorker : public Napi::AsyncWorker {
       ) {
         // Convert to sRGB/P3 using embedded profile
         try {
-          image = image.icc_transform(processingProfile, VImage::option()
-            ->set("embedded", true)
-            ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
-            ->set("intent", VIPS_INTENT_PERCEPTUAL));
+          if (deferColourspace &&
+            (image.format() == VIPS_FORMAT_UCHAR || image.format() == VIPS_FORMAT_USHORT)) {
+            // XYZ PCS is linear and device-independent, so colour management and linearisation are a single operation
+            image = image.icc_import(VImage::option()
+              ->set("embedded", true)
+              ->set("pcs", labPcs ? VIPS_PCS_LAB : VIPS_PCS_XYZ)
+              ->set("intent", VIPS_INTENT_PERCEPTUAL));
+            importedToPcs = true;
+          } else {
+            image = image.icc_transform(processingProfile, VImage::option()
+              ->set("embedded", true)
+              ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
+              ->set("intent", VIPS_INTENT_PERCEPTUAL));
+          }
         } catch(...) {
           sharp::VipsWarningCallback(nullptr, G_LOG_LEVEL_WARNING, "Invalid embedded profile", nullptr);
         }
@@ -397,6 +421,10 @@ class PipelineWorker : public Napi::AsyncWorker {
           ->set("intent", VIPS_INTENT_PERCEPTUAL));
       }
 
+      if (deferColourspace) {
+        image = sharp::EnsureColourspace(image, baton->colourspacePipeline);
+      }
+
       // Flatten image to remove alpha channel
       if (baton->flatten && image.has_alpha()) {
         image = sharp::Flatten(image, baton->flattenBackground);
@@ -882,6 +910,19 @@ class PipelineWorker : public Napi::AsyncWorker {
         image = sharp::EnsureAlpha(image, baton->ensureAlpha);
       }
 
+      // Leave PCS before the output colourspace is applied, which would gamut-clip
+      if (importedToPcs) {
+        try {
+          image = image.colourspace(VIPS_INTERPRETATION_XYZ).icc_export(VImage::option()
+            ->set("output_profile", baton->withIccProfile.empty()
+              ? processingProfile
+              : const_cast<char*>(baton->withIccProfile.data()))
+            ->set("intent", VIPS_INTENT_PERCEPTUAL));
+        } catch(...) {
+          sharp::VipsWarningCallback(nullptr, G_LOG_LEVEL_WARNING, "Invalid profile", nullptr);
+        }
+      }
+
       // Ensure output colour space
       if (sharp::Is16Bit(image.interpretation())) {
         image = image.cast(VIPS_FORMAT_USHORT);
@@ -919,7 +960,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
 
       // Apply output ICC profile
-      if (!baton->withIccProfile.empty()) {
+      if (!importedToPcs && !baton->withIccProfile.empty()) {
         try {
           image = image.icc_transform(const_cast<char*>(baton->withIccProfile.data()), VImage::option()
             ->set("input_profile", processingProfile)
@@ -1165,7 +1206,6 @@ class PipelineWorker : public Napi::AsyncWorker {
         } else if (baton->formatOut == "jxl" ||
           (baton->formatOut == "input" && inputImageType == sharp::ImageType::JXL)) {
           // Write JXL to buffer
-          image = sharp::RemoveAnimationProperties(image);
           VipsArea *area = reinterpret_cast<VipsArea*>(image.jxlsave_buffer(VImage::option()
             ->set("keep", baton->keepMetadata)
             ->set("distance", baton->jxlDistance)
@@ -1358,7 +1398,6 @@ class PipelineWorker : public Napi::AsyncWorker {
         } else if (baton->formatOut == "jxl" || (mightMatchInput && isJxl) ||
           (willMatchInput && inputImageType == sharp::ImageType::JXL)) {
           // Write JXL to file
-          image = sharp::RemoveAnimationProperties(image);
           image.jxlsave(const_cast<char*>(baton->fileOut.data()), VImage::option()
             ->set("keep", baton->keepMetadata)
             ->set("distance", baton->jxlDistance)