sharp 0.35.5-rc.0 → 0.35.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sharp",
   "description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, GIF, AVIF and TIFF images",
-  "version": "0.35.5-rc.0",
+  "version": "0.35.5",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -163,31 +163,31 @@
     "semver": "^7.8.5"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.35.5-rc.0",
-    "@img/sharp-darwin-x64": "0.35.5-rc.0",
-    "@img/sharp-freebsd-wasm32": "0.35.5-rc.0",
-    "@img/sharp-libvips-darwin-arm64": "1.3.4-rc.0",
-    "@img/sharp-libvips-darwin-x64": "1.3.4-rc.0",
-    "@img/sharp-libvips-linux-arm": "1.3.4-rc.0",
-    "@img/sharp-libvips-linux-arm64": "1.3.4-rc.0",
-    "@img/sharp-libvips-linux-ppc64": "1.3.4-rc.0",
-    "@img/sharp-libvips-linux-riscv64": "1.3.4-rc.0",
-    "@img/sharp-libvips-linux-s390x": "1.3.4-rc.0",
-    "@img/sharp-libvips-linux-x64": "1.3.4-rc.0",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.3.4-rc.0",
-    "@img/sharp-libvips-linuxmusl-x64": "1.3.4-rc.0",
-    "@img/sharp-linux-arm": "0.35.5-rc.0",
-    "@img/sharp-linux-arm64": "0.35.5-rc.0",
-    "@img/sharp-linux-ppc64": "0.35.5-rc.0",
-    "@img/sharp-linux-riscv64": "0.35.5-rc.0",
-    "@img/sharp-linux-s390x": "0.35.5-rc.0",
-    "@img/sharp-linux-x64": "0.35.5-rc.0",
-    "@img/sharp-linuxmusl-arm64": "0.35.5-rc.0",
-    "@img/sharp-linuxmusl-x64": "0.35.5-rc.0",
-    "@img/sharp-webcontainers-wasm32": "0.35.5-rc.0",
-    "@img/sharp-win32-arm64": "0.35.5-rc.0",
-    "@img/sharp-win32-ia32": "0.35.5-rc.0",
-    "@img/sharp-win32-x64": "0.35.5-rc.0"
+    "@img/sharp-darwin-arm64": "0.35.5",
+    "@img/sharp-darwin-x64": "0.35.5",
+    "@img/sharp-freebsd-wasm32": "0.35.5",
+    "@img/sharp-libvips-darwin-arm64": "1.3.4",
+    "@img/sharp-libvips-darwin-x64": "1.3.4",
+    "@img/sharp-libvips-linux-arm": "1.3.4",
+    "@img/sharp-libvips-linux-arm64": "1.3.4",
+    "@img/sharp-libvips-linux-ppc64": "1.3.4",
+    "@img/sharp-libvips-linux-riscv64": "1.3.4",
+    "@img/sharp-libvips-linux-s390x": "1.3.4",
+    "@img/sharp-libvips-linux-x64": "1.3.4",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.3.4",
+    "@img/sharp-libvips-linuxmusl-x64": "1.3.4",
+    "@img/sharp-linux-arm": "0.35.5",
+    "@img/sharp-linux-arm64": "0.35.5",
+    "@img/sharp-linux-ppc64": "0.35.5",
+    "@img/sharp-linux-riscv64": "0.35.5",
+    "@img/sharp-linux-s390x": "0.35.5",
+    "@img/sharp-linux-x64": "0.35.5",
+    "@img/sharp-linuxmusl-arm64": "0.35.5",
+    "@img/sharp-linuxmusl-x64": "0.35.5",
+    "@img/sharp-webcontainers-wasm32": "0.35.5",
+    "@img/sharp-win32-arm64": "0.35.5",
+    "@img/sharp-win32-ia32": "0.35.5",
+    "@img/sharp-win32-x64": "0.35.5"
   },
   "peerDependenciesMeta": {
     "@types/node": {
@@ -198,11 +198,11 @@
     "@biomejs/biome": "^2.5.14",
     "@cpplint/cli": "^0.1.0",
     "@emnapi/runtime": "^1.11.3",
-    "@img/sharp-libvips-dev": "1.3.4-rc.0",
-    "@img/sharp-libvips-dev-wasm32": "1.3.4-rc.0",
-    "@img/sharp-libvips-win32-arm64": "1.3.4-rc.0",
-    "@img/sharp-libvips-win32-ia32": "1.3.4-rc.0",
-    "@img/sharp-libvips-win32-x64": "1.3.4-rc.0",
+    "@img/sharp-libvips-dev": "1.3.4",
+    "@img/sharp-libvips-dev-wasm32": "1.3.4",
+    "@img/sharp-libvips-win32-arm64": "1.3.4",
+    "@img/sharp-libvips-win32-ia32": "1.3.4",
+    "@img/sharp-libvips-win32-x64": "1.3.4",
     "@types/node": "*",
     "emnapi": "^1.11.3",
     "exif-reader": "^2.0.3",
@@ -219,7 +219,7 @@
     "node": ">=20.9.0"
   },
   "config": {
-    "libvips": ">=8.18.6"
+    "libvips": ">=8.18.7"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"

package/src/binding.gyp

@@ -1,7 +1,7 @@
 # Copyright 2013 Lovell Fuller and others.
 # SPDX-License-Identifier: Apache-2.0
 
-{
+{ # noqa: B018
   'variables': {
     'vips_version': '<!(node -p "require(\'../dist/libvips.cjs\').minimumLibvipsVersion")',
     'platform_and_arch': '<!(node -p "require(\'../dist/libvips.cjs\').buildPlatformArch()")',

package/src/common.h

@@ -19,8 +19,8 @@
 
 #if (VIPS_MAJOR_VERSION < 8) || \
   (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 18) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 18 && VIPS_MICRO_VERSION < 6)
-#error "libvips version 8.18.6+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 18 && VIPS_MICRO_VERSION < 7)
+#error "libvips version 8.18.7+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if defined(__has_include)

package/src/pipeline.cc

@@ -56,9 +56,9 @@ class PipelineWorker : public Napi::AsyncWorker {
           hasAlpha |= image.has_alpha();
         }
         if (hasAlpha) {
-          for (auto &image : images) {
-            if (!image.has_alpha()) {
-              image = sharp::EnsureAlpha(image, 1);
+          for (size_t i = 0; i < images.size(); i++) {
+            if (!images[i].has_alpha()) {
+              images[i] = sharp::EnsureAlpha(images[i], 1);
             }
           }
         } else {
@@ -94,7 +94,10 @@ class PipelineWorker : public Napi::AsyncWorker {
       // Calculate angle of rotation
       VipsAngle rotation = VIPS_ANGLE_D0;
       VipsAngle autoRotation = VIPS_ANGLE_D0;
+      VipsAngle gainMapRotation = VIPS_ANGLE_D0;
       bool autoFlop = false;
+      bool gainMapFlip = false;
+      bool gainMapFlop = false;
 
       if (baton->input->autoOrient) {
         // Rotate and flip image according to Exif orientation
@@ -115,11 +118,13 @@ class PipelineWorker : public Napi::AsyncWorker {
             MultiPageUnsupported(nPages, "Rotate");
           }
           image = image.rot(autoRotation);
+          gainMapRotation = autoRotation;
           autoRotation = VIPS_ANGLE_D0;
         }
         if (autoFlop) {
           image = image.flip(VIPS_DIRECTION_HORIZONTAL);
           autoFlop = false;
+          gainMapFlop = true;
         }
       }
 
@@ -128,20 +133,24 @@ class PipelineWorker : public Napi::AsyncWorker {
         if (baton->flip) {
           image = image.flip(VIPS_DIRECTION_VERTICAL);
           baton->flip = false;
+          gainMapFlip = true;
         }
         if (baton->flop) {
           image = image.flip(VIPS_DIRECTION_HORIZONTAL);
           baton->flop = false;
+          gainMapFlop = true;
         }
         if (rotation != VIPS_ANGLE_D0) {
           if (rotation != VIPS_ANGLE_D180) {
             MultiPageUnsupported(nPages, "Rotate");
           }
           image = image.rot(rotation);
+          gainMapRotation = rotation;
           rotation = VIPS_ANGLE_D0;
         }
         if (baton->rotationAngle != 0.0) {
           MultiPageUnsupported(nPages, "Rotate");
+          KeepGainMapUnsupported(baton->keepGainMap, "Rotate");
           std::vector<double> background;
           std::tie(image, background) = sharp::ApplyAlpha(image, baton->rotationBackground, false);
           image = image.rotate(baton->rotationAngle, VImage::option()->set("background", background)).copy_memory();
@@ -152,6 +161,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       // Trim
       if (baton->trimThreshold >= 0.0) {
         MultiPageUnsupported(nPages, "Trim");
+        KeepGainMapUnsupported(baton->keepGainMap, "Trim");
         image = sharp::StaySequential(image);
         image = sharp::Trim(image, baton->trimBackground, baton->trimThreshold, baton->trimLineArt, baton->trimMargin);
         baton->trimOffsetLeft = image.xoffset();
@@ -306,6 +316,20 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (image.get_typeof("gainmap-scale-factor") == G_TYPE_INT) {
             gainMapScaleFactor = image.get_int("gainmap-scale-factor");
           }
+          if (gainMapFlip) {
+            gainMap = gainMap.flip(VIPS_DIRECTION_VERTICAL);
+          }
+          if (gainMapFlop) {
+            gainMap = gainMap.flip(VIPS_DIRECTION_HORIZONTAL);
+          }
+          if (gainMapRotation != VIPS_ANGLE_D0) {
+            gainMap = gainMap.rot(gainMapRotation);
+          }
+          if (baton->topOffsetPre != -1) {
+            gainMap = gainMap.extract_area(
+              baton->leftOffsetPre / gainMapScaleFactor, baton->topOffsetPre / gainMapScaleFactor,
+              baton->widthPre / gainMapScaleFactor, baton->heightPre / gainMapScaleFactor);
+          }
         } else if (baton->withGainMap) {
           image = image.uhdr2scRGB();
         }
@@ -429,14 +453,14 @@ class PipelineWorker : public Napi::AsyncWorker {
         }
         image = image.rot(autoRotation);
         if (baton->keepGainMap) {
-          gainMap = gainMap.rot(autoRotation);
+          gainMap = sharp::StaySequential(gainMap).rot(autoRotation);
         }
       }
       // Mirror vertically (up-down) about the x-axis
       if (baton->flip) {
         image = image.flip(VIPS_DIRECTION_VERTICAL);
         if (baton->keepGainMap) {
-          gainMap = gainMap.flip(VIPS_DIRECTION_VERTICAL);
+          gainMap = sharp::StaySequential(gainMap).flip(VIPS_DIRECTION_VERTICAL);
         }
       }
       // Mirror horizontally (left-right) about the y-axis
@@ -453,7 +477,7 @@ class PipelineWorker : public Napi::AsyncWorker {
         }
         image = image.rot(rotation);
         if (baton->keepGainMap) {
-          gainMap = gainMap.rot(rotation);
+          gainMap = sharp::StaySequential(gainMap).rot(rotation);
         }
       }
 
@@ -557,6 +581,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       // Rotate post-extract non-90 angle
       if (!baton->rotateBefore && baton->rotationAngle != 0.0) {
         MultiPageUnsupported(nPages, "Rotate");
+        KeepGainMapUnsupported(baton->keepGainMap, "Rotate");
         image = sharp::StaySequential(image);
         std::vector<double> background;
         std::tie(image, background) = sharp::ApplyAlpha(image, baton->rotationBackground, shouldPremultiplyAlpha);

package/src/utilities.cc

@@ -133,7 +133,7 @@ Napi::Value format(const Napi::CallbackInfo& info) {
     input.Set("file", hasInputFile);
     input.Set("buffer", hasInputBuffer);
     input.Set("stream", hasInputBuffer);
-    if (hasInputFile) {
+    if (oc) {
       const VipsForeignClass *fc = VIPS_FOREIGN_CLASS(oc);
       if (fc->suffs) {
         Napi::Array fileSuffix = Napi::Array::New(env);