sharp 0.34.3-rc.1 → 0.34.4-rc.3

package/lib/channel.js

@@ -74,6 +74,8 @@ function ensureAlpha (alpha) {
 /**
  * Extract a single channel from a multi-channel image.
  *
+ * The output colourspace will be either `b-w` (8-bit) or `grey16` (16-bit).
+ *
  * @example
  * // green.jpg is a greyscale image containing the green channel of the input
  * await sharp(input)

package/lib/colour.js

@@ -3,7 +3,7 @@
 
 'use strict';
 
-const color = require('color');
+const color = require('@img/colour');
 const is = require('./is');
 
 /**

package/lib/constructor.js

@@ -230,7 +230,8 @@ const Sharp = function (input, options) {
     angle: 0,
     rotationAngle: 0,
     rotationBackground: [0, 0, 0, 255],
-    rotateBeforePreExtract: false,
+    rotateBefore: false,
+    orientBefore: false,
     flip: false,
     flop: false,
     extendTop: 0,

package/lib/index.d.ts

@@ -1784,6 +1784,7 @@ declare namespace sharp {
     interface KernelEnum {
         nearest: 'nearest';
         cubic: 'cubic';
+        linear: 'linear';
         mitchell: 'mitchell';
         lanczos2: 'lanczos2';
         lanczos3: 'lanczos3';

package/lib/resize.js

@@ -107,7 +107,7 @@ const mapFitToCanvas = {
  * @private
  */
 function isRotationExpected (options) {
-  return (options.angle % 360) !== 0 || options.input.autoOrient === true || options.rotationAngle !== 0;
+  return (options.angle % 360) !== 0 || options.rotationAngle !== 0;
 }
 
 /**
@@ -343,7 +343,7 @@ function resize (widthOrOptions, height, options) {
     }
   }
   if (isRotationExpected(this.options) && isResizeExpected(this.options)) {
-    this.options.rotateBeforePreExtract = true;
+    this.options.rotateBefore = true;
   }
   return this;
 }
@@ -490,9 +490,12 @@ function extract (options) {
   // Ensure existing rotation occurs before pre-resize extraction
   if (isRotationExpected(this.options) && !isResizeExpected(this.options)) {
     if (this.options.widthPre === -1 || this.options.widthPost === -1) {
-      this.options.rotateBeforePreExtract = true;
+      this.options.rotateBefore = true;
     }
   }
+  if (this.options.input.autoOrient) {
+    this.options.orientBefore = true;
+  }
   return this;
 }
 
@@ -566,7 +569,7 @@ function trim (options) {
     }
   }
   if (isRotationExpected(this.options)) {
-    this.options.rotateBeforePreExtract = true;
+    this.options.rotateBefore = true;
   }
   return this;
 }

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.34.3-rc.1",
+  "version": "0.34.4-rc.3",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -101,6 +101,7 @@
     "test-leak": "./test/leak/leak.sh",
     "test-types": "tsd",
     "package-from-local-build": "node npm/from-local-build.js",
+    "package-release-notes": "node npm/release-notes.js",
     "docs-build": "node docs/build.mjs",
     "docs-serve": "cd docs && npm start",
     "docs-publish": "cd docs && npm run build && npx firebase-tools deploy --project pixelplumbing --only hosting:pixelplumbing-sharp"
@@ -136,63 +137,63 @@
     "vips"
   ],
   "dependencies": {
-    "color": "^4.2.3",
-    "detect-libc": "^2.0.4",
+    "@img/colour": "^1.0.0",
+    "detect-libc": "^2.1.0",
     "semver": "^7.7.2"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.34.3-rc.1",
-    "@img/sharp-darwin-x64": "0.34.3-rc.1",
-    "@img/sharp-libvips-darwin-arm64": "1.2.0",
-    "@img/sharp-libvips-darwin-x64": "1.2.0",
-    "@img/sharp-libvips-linux-arm": "1.2.0",
-    "@img/sharp-libvips-linux-arm64": "1.2.0",
-    "@img/sharp-libvips-linux-ppc64": "1.2.0",
-    "@img/sharp-libvips-linux-s390x": "1.2.0",
-    "@img/sharp-libvips-linux-x64": "1.2.0",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.2.0",
-    "@img/sharp-libvips-linuxmusl-x64": "1.2.0",
-    "@img/sharp-linux-arm": "0.34.3-rc.1",
-    "@img/sharp-linux-arm64": "0.34.3-rc.1",
-    "@img/sharp-linux-ppc64": "0.34.3-rc.1",
-    "@img/sharp-linux-s390x": "0.34.3-rc.1",
-    "@img/sharp-linux-x64": "0.34.3-rc.1",
-    "@img/sharp-linuxmusl-arm64": "0.34.3-rc.1",
-    "@img/sharp-linuxmusl-x64": "0.34.3-rc.1",
-    "@img/sharp-wasm32": "0.34.3-rc.1",
-    "@img/sharp-win32-arm64": "0.34.3-rc.1",
-    "@img/sharp-win32-ia32": "0.34.3-rc.1",
-    "@img/sharp-win32-x64": "0.34.3-rc.1"
+    "@img/sharp-darwin-arm64": "0.34.4-rc.3",
+    "@img/sharp-darwin-x64": "0.34.4-rc.3",
+    "@img/sharp-libvips-darwin-arm64": "1.2.2",
+    "@img/sharp-libvips-darwin-x64": "1.2.2",
+    "@img/sharp-libvips-linux-arm": "1.2.2",
+    "@img/sharp-libvips-linux-arm64": "1.2.2",
+    "@img/sharp-libvips-linux-ppc64": "1.2.2",
+    "@img/sharp-libvips-linux-s390x": "1.2.2",
+    "@img/sharp-libvips-linux-x64": "1.2.2",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.2.2",
+    "@img/sharp-libvips-linuxmusl-x64": "1.2.2",
+    "@img/sharp-linux-arm": "0.34.4-rc.3",
+    "@img/sharp-linux-arm64": "0.34.4-rc.3",
+    "@img/sharp-linux-ppc64": "0.34.4-rc.3",
+    "@img/sharp-linux-s390x": "0.34.4-rc.3",
+    "@img/sharp-linux-x64": "0.34.4-rc.3",
+    "@img/sharp-linuxmusl-arm64": "0.34.4-rc.3",
+    "@img/sharp-linuxmusl-x64": "0.34.4-rc.3",
+    "@img/sharp-wasm32": "0.34.4-rc.3",
+    "@img/sharp-win32-arm64": "0.34.4-rc.3",
+    "@img/sharp-win32-ia32": "0.34.4-rc.3",
+    "@img/sharp-win32-x64": "0.34.4-rc.3"
   },
   "devDependencies": {
-    "@emnapi/runtime": "^1.4.4",
-    "@img/sharp-libvips-dev": "1.2.0",
-    "@img/sharp-libvips-dev-wasm32": "1.2.0",
-    "@img/sharp-libvips-win32-arm64": "1.2.0",
-    "@img/sharp-libvips-win32-ia32": "1.2.0",
-    "@img/sharp-libvips-win32-x64": "1.2.0",
+    "@emnapi/runtime": "^1.5.0",
+    "@img/sharp-libvips-dev": "1.2.2",
+    "@img/sharp-libvips-dev-wasm32": "1.2.2",
+    "@img/sharp-libvips-win32-arm64": "1.2.2",
+    "@img/sharp-libvips-win32-ia32": "1.2.2",
+    "@img/sharp-libvips-win32-x64": "1.2.2",
     "@types/node": "*",
     "cc": "^3.0.1",
-    "emnapi": "^1.4.4",
+    "emnapi": "^1.5.0",
     "exif-reader": "^2.0.2",
     "extract-zip": "^2.0.1",
     "icc": "^3.0.0",
-    "jsdoc-to-markdown": "^9.1.1",
+    "jsdoc-to-markdown": "^9.1.2",
     "license-checker": "^25.0.1",
-    "mocha": "^11.7.1",
-    "node-addon-api": "^8.4.0",
-    "node-gyp": "^11.2.0",
+    "mocha": "^11.7.2",
+    "node-addon-api": "^8.5.0",
+    "node-gyp": "^11.4.2",
     "nyc": "^17.1.0",
     "semistandard": "^17.0.0",
     "tar-fs": "^3.1.0",
-    "tsd": "^0.32.0"
+    "tsd": "^0.33.0"
   },
   "license": "Apache-2.0",
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
   },
   "config": {
-    "libvips": ">=8.17.1"
+    "libvips": ">=8.17.2"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"

package/src/binding.gyp

@@ -168,6 +168,7 @@
                 # Ensure runtime linking is relative to sharp.node
                 '-Wl,-rpath,\'@loader_path/../../sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../../sharp-libvips-<(platform_and_arch)/<(sharp_libvips_version)/lib\'',
+                '-Wl,-rpath,\'@loader_path/../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../../../../@img-sharp-libvips-<(platform_and_arch)-npm-<(sharp_libvips_version)-<(sharp_libvips_yarn_locator)/node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
@@ -208,11 +209,9 @@
                 '-Oz',
                 '-sALLOW_MEMORY_GROWTH',
                 '-sENVIRONMENT=node',
-                '-sEXPORTED_FUNCTIONS=["emnapiInit", "_vips_shutdown", "_uv_library_shutdown"]',
+                '-sEXPORTED_FUNCTIONS=emnapiInit,_vips_shutdown,_uv_library_shutdown',
                 '-sNODERAWFS',
-                '-sTEXTDECODER=0',
-                '-sWASM_ASYNC_COMPILATION=0',
-                '-sWASM_BIGINT'
+                '-sWASM_ASYNC_COMPILATION=0'
               ],
               'libraries': [
                 '<!@(PKG_CONFIG_PATH="<!(node -p "require(\'@img/sharp-libvips-dev-wasm32/lib\')")/pkgconfig" pkg-config --static --libs vips-cpp)'

package/src/common.cc

@@ -396,6 +396,7 @@ namespace sharp {
       imageType == ImageType::JPEG ||
       imageType == ImageType::PNG ||
       imageType == ImageType::SVG ||
+      imageType == ImageType::TIFF ||
       imageType == ImageType::HEIF;
   }
 

package/src/common.h

@@ -16,8 +16,8 @@
 
 #if (VIPS_MAJOR_VERSION < 8) || \
   (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 17) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 17 && VIPS_MICRO_VERSION < 1)
-#error "libvips version 8.17.1+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 17 && VIPS_MICRO_VERSION < 2)
+#error "libvips version 8.17.2+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if defined(__has_include)

package/src/metadata.cc

@@ -261,11 +261,11 @@ class MetadataWorker : public Napi::AsyncWorker {
         info.Set("iptc", Napi::Buffer<char>::NewOrCopy(env, baton->iptc, baton->iptcLength, sharp::FreeCallback));
       }
       if (baton->xmpLength > 0) {
-        info.Set("xmp", Napi::Buffer<char>::NewOrCopy(env, baton->xmp, baton->xmpLength, sharp::FreeCallback));
         if (g_utf8_validate(static_cast<char const *>(baton->xmp), baton->xmpLength, nullptr)) {
           info.Set("xmpAsString",
             Napi::String::New(env, static_cast<char const *>(baton->xmp), baton->xmpLength));
         }
+        info.Set("xmp", Napi::Buffer<char>::NewOrCopy(env, baton->xmp, baton->xmpLength, sharp::FreeCallback));
       }
       if (baton->tifftagPhotoshopLength > 0) {
         info.Set("tifftagPhotoshop",

package/src/pipeline.cc

@@ -92,31 +92,22 @@ class PipelineWorker : public Napi::AsyncWorker {
       // Calculate angle of rotation
       VipsAngle rotation = VIPS_ANGLE_D0;
       VipsAngle autoRotation = VIPS_ANGLE_D0;
-      bool autoFlip = false;
       bool autoFlop = false;
 
       if (baton->input->autoOrient) {
         // Rotate and flip image according to Exif orientation
-        std::tie(autoRotation, autoFlip, autoFlop) = CalculateExifRotationAndFlip(sharp::ExifOrientation(image));
-        image = sharp::RemoveExifOrientation(image);
+        std::tie(autoRotation, autoFlop) = CalculateExifRotationAndFlop(sharp::ExifOrientation(image));
       }
 
       rotation = CalculateAngleRotation(baton->angle);
 
-      // Rotate pre-extract
-      bool const shouldRotateBefore = baton->rotateBeforePreExtract &&
-        (rotation != VIPS_ANGLE_D0 || autoRotation != VIPS_ANGLE_D0 ||
-          autoFlip || baton->flip || autoFlop || baton->flop ||
-          baton->rotationAngle != 0.0);
-
-      if (shouldRotateBefore) {
-        image = sharp::StaySequential(image,
-          rotation != VIPS_ANGLE_D0 ||
-          autoRotation != VIPS_ANGLE_D0 ||
-          autoFlip ||
-          baton->flip ||
-          baton->rotationAngle != 0.0);
+      bool const shouldRotateBefore = baton->rotateBefore &&
+        (rotation != VIPS_ANGLE_D0 || baton->flip || baton->flop || baton->rotationAngle != 0.0);
+      bool const shouldOrientBefore = (shouldRotateBefore || baton->orientBefore) &&
+        (autoRotation != VIPS_ANGLE_D0 || autoFlop);
 
+      if (shouldOrientBefore) {
+        image = sharp::StaySequential(image, autoRotation != VIPS_ANGLE_D0);
         if (autoRotation != VIPS_ANGLE_D0) {
           if (autoRotation != VIPS_ANGLE_D180) {
             MultiPageUnsupported(nPages, "Rotate");
@@ -124,14 +115,20 @@ class PipelineWorker : public Napi::AsyncWorker {
           image = image.rot(autoRotation);
           autoRotation = VIPS_ANGLE_D0;
         }
-        if (autoFlip != baton->flip) {
+        if (autoFlop) {
+          image = image.flip(VIPS_DIRECTION_HORIZONTAL);
+          autoFlop = false;
+        }
+      }
+
+      if (shouldRotateBefore) {
+        image = sharp::StaySequential(image, rotation != VIPS_ANGLE_D0 || baton->flip || baton->rotationAngle != 0.0);
+        if (baton->flip) {
           image = image.flip(VIPS_DIRECTION_VERTICAL);
-          autoFlip = false;
           baton->flip = false;
         }
-        if (autoFlop != baton->flop) {
+        if (baton->flop) {
           image = image.flip(VIPS_DIRECTION_HORIZONTAL);
-          autoFlop = false;
           baton->flop = false;
         }
         if (rotation != VIPS_ANGLE_D0) {
@@ -146,6 +143,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           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();
+          baton->rotationAngle = 0.0;
         }
       }
 
@@ -184,8 +182,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       // When auto-rotating by 90 or 270 degrees, swap the target width and
       // height to ensure the behavior aligns with how it would have been if
       // the rotation had taken place *before* resizing.
-      if (!baton->rotateBeforePreExtract &&
-        (autoRotation == VIPS_ANGLE_D90 || autoRotation == VIPS_ANGLE_D270)) {
+      if (autoRotation == VIPS_ANGLE_D90 || autoRotation == VIPS_ANGLE_D270) {
         std::swap(targetResizeWidth, targetResizeHeight);
       }
 
@@ -207,7 +204,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       //  - input colourspace is not specified;
       bool const shouldPreShrink = (targetResizeWidth > 0 || targetResizeHeight > 0) &&
         baton->gamma == 0 && baton->topOffsetPre == -1 && baton->trimThreshold < 0.0 &&
-        baton->colourspacePipeline == VIPS_INTERPRETATION_LAST && !shouldRotateBefore;
+        baton->colourspacePipeline == VIPS_INTERPRETATION_LAST && !(shouldOrientBefore || shouldRotateBefore);
 
       if (shouldPreShrink) {
         // The common part of the shrink: the bit by which both axes must be shrunk
@@ -294,6 +291,9 @@ class PipelineWorker : public Napi::AsyncWorker {
           throw vips::VError("Input SVG image exceeds 32767x32767 pixel limit");
         }
       }
+      if (baton->input->autoOrient) {
+        image = sharp::RemoveExifOrientation(image);
+      }
 
       // Any pre-shrinking may already have been done
       inputWidth = image.width();
@@ -396,7 +396,6 @@ class PipelineWorker : public Napi::AsyncWorker {
       image = sharp::StaySequential(image,
         autoRotation != VIPS_ANGLE_D0 ||
         baton->flip ||
-        autoFlip ||
         rotation != VIPS_ANGLE_D0);
       // Auto-rotate post-extract
       if (autoRotation != VIPS_ANGLE_D0) {
@@ -406,7 +405,7 @@ class PipelineWorker : public Napi::AsyncWorker {
         image = image.rot(autoRotation);
       }
       // Mirror vertically (up-down) about the x-axis
-      if (baton->flip != autoFlip) {
+      if (baton->flip) {
         image = image.flip(VIPS_DIRECTION_VERTICAL);
       }
       // Mirror horizontally (left-right) about the y-axis
@@ -513,7 +512,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
 
       // Rotate post-extract non-90 angle
-      if (!baton->rotateBeforePreExtract && baton->rotationAngle != 0.0) {
+      if (!baton->rotateBefore && baton->rotationAngle != 0.0) {
         MultiPageUnsupported(nPages, "Rotate");
         image = sharp::StaySequential(image);
         std::vector<double> background;
@@ -654,21 +653,16 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (composite->input->autoOrient) {
             // Respect EXIF Orientation
             VipsAngle compositeAutoRotation = VIPS_ANGLE_D0;
-            bool compositeAutoFlip = false;
             bool compositeAutoFlop = false;
-            std::tie(compositeAutoRotation, compositeAutoFlip, compositeAutoFlop) =
-              CalculateExifRotationAndFlip(sharp::ExifOrientation(compositeImage));
+            std::tie(compositeAutoRotation, compositeAutoFlop) =
+              CalculateExifRotationAndFlop(sharp::ExifOrientation(compositeImage));
 
             compositeImage = sharp::RemoveExifOrientation(compositeImage);
-            compositeImage = sharp::StaySequential(compositeImage,
-              compositeAutoRotation != VIPS_ANGLE_D0 || compositeAutoFlip);
+            compositeImage = sharp::StaySequential(compositeImage, compositeAutoRotation != VIPS_ANGLE_D0);
 
             if (compositeAutoRotation != VIPS_ANGLE_D0) {
               compositeImage = compositeImage.rot(compositeAutoRotation);
             }
-            if (compositeAutoFlip) {
-              compositeImage = compositeImage.flip(VIPS_DIRECTION_VERTICAL);
-            }
             if (compositeAutoFlop) {
               compositeImage = compositeImage.flip(VIPS_DIRECTION_HORIZONTAL);
             }
@@ -1400,21 +1394,20 @@ class PipelineWorker : public Napi::AsyncWorker {
     Calculate the angle of rotation and need-to-flip for the given Exif orientation
     By default, returns zero, i.e. no rotation.
   */
-  std::tuple<VipsAngle, bool, bool>
-  CalculateExifRotationAndFlip(int const exifOrientation) {
+  std::tuple<VipsAngle, bool>
+  CalculateExifRotationAndFlop(int const exifOrientation) {
     VipsAngle rotate = VIPS_ANGLE_D0;
-    bool flip = false;
     bool flop = false;
     switch (exifOrientation) {
       case 6: rotate = VIPS_ANGLE_D90; break;
       case 3: rotate = VIPS_ANGLE_D180; break;
       case 8: rotate = VIPS_ANGLE_D270; break;
-      case 2: flop = true; break;  // flop 1
-      case 7: flip = true; rotate = VIPS_ANGLE_D90; break;  // flip 6
-      case 4: flop = true; rotate = VIPS_ANGLE_D180; break;  // flop 3
-      case 5: flip = true; rotate = VIPS_ANGLE_D270; break;  // flip 8
+      case 2: flop = true; break;
+      case 7: flop = true; rotate = VIPS_ANGLE_D270; break;
+      case 4: flop = true; rotate = VIPS_ANGLE_D180; break;
+      case 5: flop = true; rotate = VIPS_ANGLE_D90; break;
     }
-    return std::make_tuple(rotate, flip, flop);
+    return std::make_tuple(rotate, flop);
   }
 
   /*
@@ -1639,7 +1632,8 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
   baton->angle = sharp::AttrAsInt32(options, "angle");
   baton->rotationAngle = sharp::AttrAsDouble(options, "rotationAngle");
   baton->rotationBackground = sharp::AttrAsVectorOfDouble(options, "rotationBackground");
-  baton->rotateBeforePreExtract = sharp::AttrAsBool(options, "rotateBeforePreExtract");
+  baton->rotateBefore = sharp::AttrAsBool(options, "rotateBefore");
+  baton->orientBefore = sharp::AttrAsBool(options, "orientBefore");
   baton->flip = sharp::AttrAsBool(options, "flip");
   baton->flop = sharp::AttrAsBool(options, "flop");
   baton->extendTop = sharp::AttrAsInt32(options, "extendTop");

package/src/pipeline.h

@@ -115,7 +115,8 @@ struct PipelineBaton {
   int angle;
   double rotationAngle;
   std::vector<double> rotationBackground;
-  bool rotateBeforePreExtract;
+  bool rotateBefore;
+  bool orientBefore;
   bool flip;
   bool flop;
   int extendTop;

package/src/sharp.cc

@@ -18,10 +18,8 @@ Napi::Object init(Napi::Env env, Napi::Object exports) {
     vips_init("sharp");
   });
 
-  for (auto domain : { "VIPS", "vips2tiff" }) {
-    g_log_set_handler(domain, static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING),
-      static_cast<GLogFunc>(sharp::VipsWarningCallback), nullptr);
-  }
+  g_log_set_handler("VIPS", static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING),
+    static_cast<GLogFunc>(sharp::VipsWarningCallback), nullptr);
 
   // Methods available to JavaScript
   exports.Set("metadata", Napi::Function::New(env, metadata));