sharp 0.34.2-rc.0 → 0.34.3-rc.0

package/lib/constructor.js

@@ -156,6 +156,7 @@ const debuglog = util.debuglog('sharp');
  * @param {number} [options.subifd=-1] - subIFD (Sub Image File Directory) to extract for OME-TIFF, defaults to main image.
  * @param {number} [options.level=0] - level to extract from a multi-level input (OpenSlide), zero based.
  * @param {string|Object} [options.pdfBackground] - Background colour to use when PDF is partially transparent. Parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha. Requires the use of a globally-installed libvips compiled with support for PDFium, Poppler, ImageMagick or GraphicsMagick.
+ * @param {boolean} [options.jp2Oneshot=false] - Set to `true` to decode tiled JPEG 2000 images in a single operation, improving compatibility.
  * @param {boolean} [options.animated=false] - Set to `true` to read all frames/pages of an animated image (GIF, WebP, TIFF), equivalent of setting `pages` to `-1`.
  * @param {Object} [options.raw] - describes raw pixel input image data. See `raw()` for pixel ordering.
  * @param {number} [options.raw.width] - integral number of pixels wide.

package/lib/index.d.ts

@@ -1009,6 +1009,8 @@ declare namespace sharp {
         level?: number | undefined;
         /** Background colour to use when PDF is partially transparent. Requires the use of a globally-installed libvips compiled with support for PDFium, Poppler, ImageMagick or GraphicsMagick. */
         pdfBackground?: Colour | Color | undefined;
+        /** Set to `true` to load JPEG 2000 images using [oneshot mode](https://github.com/libvips/libvips/issues/4205) */
+        jp2Oneshot?: boolean | undefined;
         /** Set to `true` to read all frames/pages of an animated image (equivalent of setting `pages` to `-1`). (optional, default false) */
         animated?: boolean | undefined;
         /** Describes raw pixel input image data. See raw() for pixel ordering. */

package/lib/input.js

@@ -27,9 +27,9 @@ const align = {
  * @private
  */
 function _inputOptionsFromObject (obj) {
-  const { raw, density, limitInputPixels, ignoreIcc, unlimited, sequentialRead, failOn, failOnError, animated, page, pages, subifd, pdfBackground, autoOrient } = obj;
-  return [raw, density, limitInputPixels, ignoreIcc, unlimited, sequentialRead, failOn, failOnError, animated, page, pages, subifd, pdfBackground, autoOrient].some(is.defined)
-    ? { raw, density, limitInputPixels, ignoreIcc, unlimited, sequentialRead, failOn, failOnError, animated, page, pages, subifd, pdfBackground, autoOrient }
+  const { raw, density, limitInputPixels, ignoreIcc, unlimited, sequentialRead, failOn, failOnError, animated, page, pages, subifd, pdfBackground, autoOrient, jp2Oneshot } = obj;
+  return [raw, density, limitInputPixels, ignoreIcc, unlimited, sequentialRead, failOn, failOnError, animated, page, pages, subifd, pdfBackground, autoOrient, jp2Oneshot].some(is.defined)
+    ? { raw, density, limitInputPixels, ignoreIcc, unlimited, sequentialRead, failOn, failOnError, animated, page, pages, subifd, pdfBackground, autoOrient, jp2Oneshot }
     : undefined;
 }
 
@@ -250,6 +250,14 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
     if (is.defined(inputOptions.pdfBackground)) {
       inputDescriptor.pdfBackground = this._getBackgroundColourOption(inputOptions.pdfBackground);
     }
+    // JP2 oneshot
+    if (is.defined(inputOptions.jp2Oneshot)) {
+      if (is.bool(inputOptions.jp2Oneshot)) {
+        inputDescriptor.jp2Oneshot = inputOptions.jp2Oneshot;
+      } else {
+        throw is.invalidParameterError('jp2Oneshot', 'boolean', inputOptions.jp2Oneshot);
+      }
+    }
     // Create new image
     if (is.defined(inputOptions.create)) {
       if (

package/lib/output.js

@@ -1019,6 +1019,9 @@ function tiff (options) {
  * AVIF image sequences are not supported.
  * Prebuilt binaries support a bitdepth of 8 only.
  *
+ * This feature is experimental on the Windows ARM64 platform
+ * and requires a CPU with ARM64v8.4 or later.
+ *
  * @example
  * const data = await sharp(input)
  *   .avif({ effort: 2 })

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.2-rc.0",
+  "version": "0.34.3-rc.0",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -92,7 +92,7 @@
     "Don Denton <don@happycollision.com>"
   ],
   "scripts": {
-    "install": "node install/check",
+    "install": "node install/check.js",
     "clean": "rm -rf src/build/ .nyc_output/ coverage/ test/fixtures/output.*",
     "test": "npm run test-lint && npm run test-unit && npm run test-licensing && npm run test-types",
     "test-lint": "semistandard && cpplint",
@@ -100,8 +100,7 @@
     "test-licensing": "license-checker --production --summary --onlyAllow=\"Apache-2.0;BSD;ISC;LGPL-3.0-or-later;MIT\"",
     "test-leak": "./test/leak/leak.sh",
     "test-types": "tsd",
-    "package-from-local-build": "node npm/from-local-build",
-    "package-from-github-release": "node npm/from-github-release",
+    "package-from-local-build": "node npm/from-local-build.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"
@@ -142,35 +141,36 @@
     "semver": "^7.7.2"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.34.2-rc.0",
-    "@img/sharp-darwin-x64": "0.34.2-rc.0",
-    "@img/sharp-libvips-darwin-arm64": "1.1.0",
-    "@img/sharp-libvips-darwin-x64": "1.1.0",
-    "@img/sharp-libvips-linux-arm": "1.1.0",
-    "@img/sharp-libvips-linux-arm64": "1.1.0",
-    "@img/sharp-libvips-linux-ppc64": "1.1.0",
-    "@img/sharp-libvips-linux-s390x": "1.1.0",
-    "@img/sharp-libvips-linux-x64": "1.1.0",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.1.0",
-    "@img/sharp-libvips-linuxmusl-x64": "1.1.0",
-    "@img/sharp-linux-arm": "0.34.2-rc.0",
-    "@img/sharp-linux-arm64": "0.34.2-rc.0",
-    "@img/sharp-linux-s390x": "0.34.2-rc.0",
-    "@img/sharp-linux-x64": "0.34.2-rc.0",
-    "@img/sharp-linuxmusl-arm64": "0.34.2-rc.0",
-    "@img/sharp-linuxmusl-x64": "0.34.2-rc.0",
-    "@img/sharp-wasm32": "0.34.2-rc.0",
-    "@img/sharp-win32-arm64": "0.34.2-rc.0",
-    "@img/sharp-win32-ia32": "0.34.2-rc.0",
-    "@img/sharp-win32-x64": "0.34.2-rc.0"
+    "@img/sharp-darwin-arm64": "0.34.3-rc.0",
+    "@img/sharp-darwin-x64": "0.34.3-rc.0",
+    "@img/sharp-libvips-darwin-arm64": "1.2.0-rc.2",
+    "@img/sharp-libvips-darwin-x64": "1.2.0-rc.2",
+    "@img/sharp-libvips-linux-arm": "1.2.0-rc.2",
+    "@img/sharp-libvips-linux-arm64": "1.2.0-rc.2",
+    "@img/sharp-libvips-linux-ppc64": "1.2.0-rc.2",
+    "@img/sharp-libvips-linux-s390x": "1.2.0-rc.2",
+    "@img/sharp-libvips-linux-x64": "1.2.0-rc.2",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.2.0-rc.2",
+    "@img/sharp-libvips-linuxmusl-x64": "1.2.0-rc.2",
+    "@img/sharp-linux-arm": "0.34.3-rc.0",
+    "@img/sharp-linux-arm64": "0.34.3-rc.0",
+    "@img/sharp-linux-ppc64": "0.34.3-rc.0",
+    "@img/sharp-linux-s390x": "0.34.3-rc.0",
+    "@img/sharp-linux-x64": "0.34.3-rc.0",
+    "@img/sharp-linuxmusl-arm64": "0.34.3-rc.0",
+    "@img/sharp-linuxmusl-x64": "0.34.3-rc.0",
+    "@img/sharp-wasm32": "0.34.3-rc.0",
+    "@img/sharp-win32-arm64": "0.34.3-rc.0",
+    "@img/sharp-win32-ia32": "0.34.3-rc.0",
+    "@img/sharp-win32-x64": "0.34.3-rc.0"
   },
   "devDependencies": {
     "@emnapi/runtime": "^1.4.3",
-    "@img/sharp-libvips-dev": "1.1.0",
-    "@img/sharp-libvips-dev-wasm32": "1.1.0",
-    "@img/sharp-libvips-win32-arm64": "1.1.0",
-    "@img/sharp-libvips-win32-ia32": "1.1.0",
-    "@img/sharp-libvips-win32-x64": "1.1.0",
+    "@img/sharp-libvips-dev": "1.2.0-rc.2",
+    "@img/sharp-libvips-dev-wasm32": "1.2.0-rc.2",
+    "@img/sharp-libvips-win32-arm64": "1.2.0-rc.2",
+    "@img/sharp-libvips-win32-ia32": "1.2.0-rc.2",
+    "@img/sharp-libvips-win32-x64": "1.2.0-rc.2",
     "@types/node": "*",
     "cc": "^3.0.1",
     "emnapi": "^1.4.3",
@@ -179,12 +179,12 @@
     "icc": "^3.0.0",
     "jsdoc-to-markdown": "^9.1.1",
     "license-checker": "^25.0.1",
-    "mocha": "^11.2.2",
+    "mocha": "^11.6.0",
     "node-addon-api": "^8.3.1",
+    "node-gyp": "^11.2.0",
     "nyc": "^17.1.0",
-    "prebuild": "^13.0.1",
     "semistandard": "^17.0.0",
-    "tar-fs": "^3.0.8",
+    "tar-fs": "^3.0.9",
     "tsd": "^0.32.0"
   },
   "license": "Apache-2.0",
@@ -192,16 +192,11 @@
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
   },
   "config": {
-    "libvips": ">=8.16.1"
+    "libvips": ">=8.17.0"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"
   },
-  "binary": {
-    "napi_versions": [
-      9
-    ]
-  },
   "semistandard": {
     "env": [
       "mocha"

package/src/binding.gyp

@@ -163,6 +163,8 @@
             },
             'xcode_settings': {
               'OTHER_LDFLAGS': [
+                '-Wl,-s',
+                '-Wl,-dead_strip',
                 # 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\'',
@@ -176,6 +178,9 @@
             'defines': [
               '_GLIBCXX_USE_CXX11_ABI=1'
             ],
+            'cflags_cc': [
+              '<!(node -p "require(\'detect-libc\').isNonGlibcLinuxSync() ? \'\' : \'-flto=auto\'")'
+            ],
             'link_settings': {
               'libraries': [
                 '-l:libvips-cpp.so.<(vips_version)'

package/src/common.cc

@@ -113,6 +113,10 @@ namespace sharp {
     if (HasAttr(input, "pdfBackground")) {
       descriptor->pdfBackground = AttrAsVectorOfDouble(input, "pdfBackground");
     }
+    // Use JPEG 2000 oneshot mode?
+    if (HasAttr(input, "jp2Oneshot")) {
+      descriptor->jp2Oneshot = AttrAsBool(input, "jp2Oneshot");
+    }
     // Create new image
     if (HasAttr(input, "createChannels")) {
       descriptor->createChannels = AttrAsUint32(input, "createChannels");
@@ -434,6 +438,9 @@ namespace sharp {
             if (imageType == ImageType::PDF) {
               option->set("background", descriptor->pdfBackground);
             }
+            if (imageType == ImageType::JP2) {
+              option->set("oneshot", descriptor->jp2Oneshot);
+            }
             image = VImage::new_from_buffer(descriptor->buffer, descriptor->bufferLength, nullptr, option);
             if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
               image = SetDensity(image, descriptor->density);
@@ -541,6 +548,9 @@ namespace sharp {
             if (imageType == ImageType::PDF) {
               option->set("background", descriptor->pdfBackground);
             }
+            if (imageType == ImageType::JP2) {
+              option->set("oneshot", descriptor->jp2Oneshot);
+            }
             image = VImage::new_from_file(descriptor->file.data(), option);
             if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
               image = SetDensity(image, descriptor->density);

package/src/common.h

@@ -15,9 +15,9 @@
 // Verify platform and compiler compatibility
 
 #if (VIPS_MAJOR_VERSION < 8) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 16) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 16 && VIPS_MICRO_VERSION < 1)
-#error "libvips version 8.16.1+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 17) || \
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 17 && VIPS_MICRO_VERSION < 0)
+#error "libvips version 8.17.0+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if defined(__has_include)
@@ -78,6 +78,7 @@ namespace sharp {
     VipsAlign joinHalign;
     VipsAlign joinValign;
     std::vector<double> pdfBackground;
+    bool jp2Oneshot;
 
     InputDescriptor():
       autoOrient(false),
@@ -120,7 +121,8 @@ namespace sharp {
       joinBackground{ 0.0, 0.0, 0.0, 255.0 },
       joinHalign(VIPS_ALIGN_LOW),
       joinValign(VIPS_ALIGN_LOW),
-      pdfBackground{ 255.0, 255.0, 255.0, 255.0 } {}
+      pdfBackground{ 255.0, 255.0, 255.0, 255.0 },
+      jp2Oneshot(false) {}
   };
 
   // Convenience methods to access the attributes of a Napi::Object

package/src/pipeline.cc

@@ -294,6 +294,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           option->set("n", baton->input->pages);
           option->set("page", baton->input->page);
           option->set("dpi", baton->input->density);
+          option->set("background", baton->input->pdfBackground);
 
           if (baton->input->buffer != nullptr) {
             // Reload PDF buffer
@@ -668,7 +669,6 @@ class PipelineWorker : public Napi::AsyncWorker {
           sharp::ImageType compositeImageType = sharp::ImageType::UNKNOWN;
           composite->input->access = access;
           std::tie(compositeImage, compositeImageType) = sharp::OpenInput(composite->input);
-          compositeImage = sharp::EnsureColourspace(compositeImage, baton->colourspacePipeline);
 
           if (composite->input->autoOrient) {
             // Respect EXIF Orientation
@@ -733,8 +733,7 @@ class PipelineWorker : public Napi::AsyncWorker {
             // gravity was used for extract_area, set it back to its default value of 0
             composite->gravity = 0;
           }
-          // Ensure image to composite is sRGB with unpremultiplied alpha
-          compositeImage = compositeImage.colourspace(VIPS_INTERPRETATION_sRGB);
+          // Ensure image to composite is with unpremultiplied alpha
           compositeImage = sharp::EnsureAlpha(compositeImage, 1);
           if (composite->premultiplied) compositeImage = compositeImage.unpremultiply();
           // Calculate position
@@ -759,7 +758,12 @@ class PipelineWorker : public Napi::AsyncWorker {
           xs.push_back(left);
           ys.push_back(top);
         }
-        image = VImage::composite(images, modes, VImage::option()->set("x", xs)->set("y", ys));
+        image = VImage::composite(images, modes, VImage::option()
+          ->set("compositing_space", baton->colourspacePipeline == VIPS_INTERPRETATION_LAST
+            ? VIPS_INTERPRETATION_sRGB
+            : baton->colourspacePipeline)
+          ->set("x", xs)
+          ->set("y", ys));
         image = sharp::RemoveGifPalette(image);
       }
 

package/src/sharp.cc

@@ -18,8 +18,10 @@ Napi::Object init(Napi::Env env, Napi::Object exports) {
     vips_init("sharp");
   });
 
-  g_log_set_handler("VIPS", static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING),
-    static_cast<GLogFunc>(sharp::VipsWarningCallback), nullptr);
+  for (auto domain : { "VIPS", "vips2tiff" }) {
+    g_log_set_handler(domain, 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));