@revizly/sharp 0.35.0-revizly51 → 0.35.0-revizly53

package/dist/channel.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/channel.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/colour.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/colour.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/composite.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/composite.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/constructor.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/constructor.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/index.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

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/index.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/input.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/input.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/is.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/is.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/libvips.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/libvips.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/operation.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/operation.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/output.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 
@@ -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

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 
@@ -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/resize.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/resize.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/sharp.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/sharp.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/utility.cjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/dist/utility.mjs

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/install/build.js

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

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-revizly51",
+  "version": "0.35.0-revizly53",
   "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.52",
-    "@revizly/sharp-libvips-linux-x64": "1.0.52",
-    "@revizly/sharp-linux-arm64": "0.35.0-revizly51",
-    "@revizly/sharp-linux-x64": "0.35.0-revizly51"
+    "@revizly/sharp-libvips-linux-arm64": "1.0.54",
+    "@revizly/sharp-libvips-linux-x64": "1.0.54",
+    "@revizly/sharp-linux-arm64": "0.35.0-revizly53",
+    "@revizly/sharp-linux-x64": "0.35.0-revizly53"
   },
   "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.52",
+    "@revizly/sharp-libvips-dev": "1.0.54",
     "@types/node": "*",
     "emnapi": "^1.11.3",
     "exif-reader": "^2.0.3",

package/src/binding.gyp

@@ -1,4 +1,4 @@
-# Copyright 2013 Lovell Fuller and others.
+# SPDX-FileCopyrightText: 2013 Lovell Fuller and others
 # SPDX-License-Identifier: Apache-2.0
 
 { # noqa: B018

package/src/common.cc

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 
@@ -635,7 +635,7 @@ namespace sharp {
     if (HasProfile(image)) {
       size_t length;
       const void *data = image.get_blob(VIPS_META_ICC_NAME, &length);
-      icc.first = static_cast<char*>(vips_malloc(reinterpret_cast<VipsObject*>(image.get_image()), length));
+      icc.first = static_cast<char*>(g_malloc(length));
       icc.second = length;
       memcpy(icc.first, data, length);
     }
@@ -648,7 +648,7 @@ namespace sharp {
   VImage SetProfile(VImage image, std::pair<char*, size_t> icc) {
     if (icc.first != nullptr) {
       image = image.copy();
-      image.set(VIPS_META_ICC_NAME, nullptr, icc.first, icc.second);
+      image.set(VIPS_META_ICC_NAME, reinterpret_cast<VipsCallbackFn>(vips_area_free_cb), icc.first, icc.second);
     }
     return image;
   }
@@ -720,7 +720,7 @@ namespace sharp {
     if (hasDelay) {
       if (delay.size() == 1) {
         // We have just one delay, repeat that value for all frames.
-        delay.insert(delay.end(), nPages - 1, delay[0]);
+        delay.insert(delay.end(), std::max(0, nPages - 1), delay[0]);
       }
       copy.set("delay", delay);
     }

package/src/common.h

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/src/metadata.cc

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/src/metadata.h

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/src/operations.cc

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/src/operations.h

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/src/pipeline.cc

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 
@@ -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);
@@ -638,15 +666,17 @@ class PipelineWorker : public Napi::AsyncWorker {
           std::tie(image, background) = sharp::ApplyAlpha(image, baton->extendBackground, shouldPremultiplyAlpha);
         }
         image = sharp::StaySequential(image, nPages > 1 || baton->extendWith != VIPS_EXTEND_BACKGROUND);
-        auto options = VImage::option()->set("extend", baton->extendWith);
-        if (baton->extendWith == VIPS_EXTEND_BACKGROUND) {
-          options->set("background", background);
+        if (nPages > 1) {
+          image = sharp::EmbedMultiPage(image,
+            baton->extendLeft, baton->extendTop, baton->width, baton->height,
+            baton->extendWith, background, nPages, &targetPageHeight);
+        } else {
+          auto options = VImage::option()->set("extend", baton->extendWith);
+          if (baton->extendWith == VIPS_EXTEND_BACKGROUND) {
+            options->set("background", background);
+          }
+          image = image.embed(baton->extendLeft, baton->extendTop, baton->width, baton->height, options);
         }
-        image = nPages > 1
-          ? sharp::EmbedMultiPage(image,
-              baton->extendLeft, baton->extendTop, baton->width, baton->height,
-              baton->extendWith, background, nPages, &targetPageHeight)
-          : image.embed(baton->extendLeft, baton->extendTop, baton->width, baton->height, options);
         if (baton->keepGainMap) {
           gainMap = gainMap.embed(baton->extendLeft / gainMapScaleFactor, baton->extendTop / gainMapScaleFactor,
             baton->width / gainMapScaleFactor, baton->height / gainMapScaleFactor, VImage::option()
@@ -880,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);
@@ -888,7 +931,11 @@ class PipelineWorker : public Napi::AsyncWorker {
         image = image.colourspace(baton->colourspace, VImage::option()->set("source_space", image.interpretation()));
         if (inputProfile.first != nullptr && baton->withIccProfile.empty()) {
           image = sharp::SetProfile(image, inputProfile);
+        } else {
+          g_free(inputProfile.first);
         }
+      } else {
+        g_free(inputProfile.first);
       }
 
       // Extract channel
@@ -913,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)
@@ -1383,8 +1430,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           baton->formatOut = "v";
         } else {
           // Unsupported output format
-          (baton->err).append("Unsupported output format " + baton->fileOut);
-          return Error();
+          throw std::runtime_error("Unsupported output format " + baton->fileOut);
         }
       }
     } catch (std::runtime_error const &err) {
@@ -1467,7 +1513,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // ECMAScript ArrayBuffer with Uint8Array view
           Napi::TypedArrayOf<uint8_t> data = Napi::Buffer<char>::Copy(env,
             static_cast<char*>(baton->bufferOut), baton->bufferOutLength);
-          sharp::FreeCallback(static_cast<char*>(baton->bufferOut), nullptr);
+          sharp::FreeCallback(nullptr, static_cast<char*>(baton->bufferOut));
           Callback().SHARP_CALLBACK_FN_NAME(Receiver().Value(), { env.Null(), data, info });
         } else {
           // Node.js Buffer
@@ -1659,6 +1705,8 @@ class PipelineWorker : public Napi::AsyncWorker {
     image = image.copy();
     image.set("gainmap-data", reinterpret_cast<VipsCallbackFn>(vips_area_free_cb),
       gainMapJpeg->data, gainMapJpeg->length);
+    gainMapJpeg->free_fn = nullptr;
+    vips_area_unref(gainMapJpeg);
     return image;
   }
 

package/src/pipeline.h

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/src/sharp.cc

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/src/stats.cc

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/src/stats.h

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/src/utilities.cc

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */
 

package/src/utilities.h

@@ -1,5 +1,5 @@
 /*!
-  Copyright 2013 Lovell Fuller and others.
+  SPDX-FileCopyrightText: 2013 Lovell Fuller and others
   SPDX-License-Identifier: Apache-2.0
 */