sharp 0.33.4-rc.0 → 0.33.5-rc.0

package/install/check.js

@@ -18,7 +18,7 @@ try {
     }
     try {
       const gyp = require('node-gyp');
-      log(`Found node-gyp version ${gyp().version}`);
+      log(`Found node-gyp ${gyp().version}`);
     } catch (err) {
       log('Please add node-gyp to your dependencies');
       return;
@@ -30,7 +30,7 @@ try {
     }
   };
 
-  if (useGlobalLibvips()) {
+  if (useGlobalLibvips(log)) {
     buildFromSource(`Detected globally-installed libvips v${globalLibvipsVersion()}`);
   } else if (process.env.npm_config_build_from_source) {
     buildFromSource('Detected --build-from-source flag');

package/lib/constructor.js

@@ -226,6 +226,8 @@ const Sharp = function (input, options) {
     negateAlpha: true,
     medianSize: 0,
     blurSigma: 0,
+    precision: 'integer',
+    minAmpl: 0.2,
     sharpenSigma: 0,
     sharpenM1: 1,
     sharpenM2: 2,

package/lib/index.d.ts

@@ -464,7 +464,7 @@ declare namespace sharp {
          * @throws {Error} Invalid parameters
          * @returns A sharp instance that can be used to chain operations
          */
-        blur(sigma?: number | boolean): Sharp;
+        blur(sigma?: number | boolean | BlurOptions): Sharp;
 
         /**
          * Merge alpha transparency channel, if any, with background.
@@ -571,11 +571,11 @@ declare namespace sharp {
 
         /**
          * Recomb the image with the specified matrix.
-         * @param inputMatrix 3x3 Recombination matrix
+         * @param inputMatrix 3x3 Recombination matrix or 4x4 Recombination matrix
          * @throws {Error} Invalid parameters
          * @returns A sharp instance that can be used to chain operations
          */
-        recomb(inputMatrix: Matrix3x3): Sharp;
+        recomb(inputMatrix: Matrix3x3 | Matrix4x4): Sharp;
 
         /**
          * Transforms the image using brightness, saturation, hue rotation and lightness.
@@ -1108,6 +1108,8 @@ declare namespace sharp {
         resolutionUnit?: 'inch' | 'cm' | undefined;
         /** String containing format for images loaded via *magick */
         formatMagick?: string | undefined;
+        /** Array of keyword/text pairs representing PNG text blocks, if present. */
+        comments?: CommentsMetadata[] | undefined;
     }
 
     interface LevelMetadata {
@@ -1115,6 +1117,11 @@ declare namespace sharp {
         height: number;
     }
 
+    interface CommentsMetadata {
+        keyword: string;
+        text: string;
+    }
+
     interface Stats {
         /** Array of channel statistics for each channel in the image. */
         channels: ChannelStats[];
@@ -1335,6 +1342,17 @@ declare namespace sharp {
         background?: Color | undefined;
     }
 
+    type Precision = 'integer' | 'float' | 'approximate';
+
+    interface BlurOptions {
+        /** A value between 0.3 and 1000 representing the sigma of the Gaussian mask, where `sigma = 1 + radius / 2` */
+        sigma: number;
+        /** A value between 0.001 and 1. A smaller value will generate a larger, more accurate mask. */
+        minAmplitude?: number;
+        /** How accurate the operation should be, one of: integer, float, approximate. (optional, default "integer") */
+        precision?: Precision | undefined;
+    }
+
     interface FlattenOptions {
         /** background colour, parsed by the color module, defaults to black. (optional, default {r:0,g:0,b:0}) */
         background?: Color | undefined;
@@ -1730,6 +1748,7 @@ declare namespace sharp {
 
     type Matrix2x2 = [[number, number], [number, number]];
     type Matrix3x3 = [[number, number, number], [number, number, number], [number, number, number]];
+    type Matrix4x4 = [[number, number, number, number], [number, number, number, number], [number, number, number, number], [number, number, number, number]];
 }
 
 export = sharp;

package/lib/input.js

@@ -450,6 +450,7 @@ function _isStreamInput () {
  * - `xmp`: Buffer containing raw XMP data, if present
  * - `tifftagPhotoshop`: Buffer containing raw TIFFTAG_PHOTOSHOP data, if present
  * - `formatMagick`: String containing format for images loaded via *magick
+ * - `comments`: Array of keyword/text pairs representing PNG text blocks, if present.
  *
  * @example
  * const metadata = await sharp(input).metadata();

package/lib/libvips.js

@@ -10,10 +10,10 @@ const semverGreaterThanOrEqualTo = require('semver/functions/gte');
 const semverSatisfies = require('semver/functions/satisfies');
 const detectLibc = require('detect-libc');
 
-const { engines, optionalDependencies } = require('../package.json');
+const { config, engines, optionalDependencies } = require('../package.json');
 
 const minimumLibvipsVersionLabelled = process.env.npm_package_config_libvips || /* istanbul ignore next */
-  engines.libvips;
+  config.libvips;
 const minimumLibvipsVersion = semverCoerce(minimumLibvipsVersionLabelled).version;
 
 const prebuiltPlatforms = [
@@ -162,21 +162,23 @@ const pkgConfigPath = () => {
   }
 };
 
-const skipSearch = (status, reason) => {
-  log(`Detected ${reason}, skipping search for globally-installed libvips`);
+const skipSearch = (status, reason, logger) => {
+  if (logger) {
+    logger(`Detected ${reason}, skipping search for globally-installed libvips`);
+  }
   return status;
 };
 
-const useGlobalLibvips = () => {
+const useGlobalLibvips = (logger) => {
   if (Boolean(process.env.SHARP_IGNORE_GLOBAL_LIBVIPS) === true) {
-    return skipSearch(false, 'SHARP_IGNORE_GLOBAL_LIBVIPS');
+    return skipSearch(false, 'SHARP_IGNORE_GLOBAL_LIBVIPS', logger);
   }
   if (Boolean(process.env.SHARP_FORCE_GLOBAL_LIBVIPS) === true) {
-    return skipSearch(true, 'SHARP_FORCE_GLOBAL_LIBVIPS');
+    return skipSearch(true, 'SHARP_FORCE_GLOBAL_LIBVIPS', logger);
   }
   /* istanbul ignore next */
   if (isRosetta()) {
-    return skipSearch(false, 'Rosetta');
+    return skipSearch(false, 'Rosetta', logger);
   }
   const globalVipsVersion = globalLibvipsVersion();
   return !!globalVipsVersion && /* istanbul ignore next */

package/lib/operation.js

@@ -6,6 +6,17 @@
 const color = require('color');
 const is = require('./is');
 
+/**
+ * How accurate an operation should be.
+ * @member
+ * @private
+ */
+const vipsPrecision = {
+  integer: 'integer',
+  float: 'float',
+  approximate: 'approximate'
+};
+
 /**
  * Rotate the output image by either an explicit angle
  * or auto-orient based on the EXIF `Orientation` tag.
@@ -367,23 +378,51 @@ function median (size) {
  *   .blur(5)
  *   .toBuffer();
  *
- * @param {number} [sigma] a value between 0.3 and 1000 representing the sigma of the Gaussian mask, where `sigma = 1 + radius / 2`.
+ * @param {Object|number|Boolean} [options]
+ * @param {number} [options.sigma] a value between 0.3 and 1000 representing the sigma of the Gaussian mask, where `sigma = 1 + radius / 2`.
+ * @param {string} [options.precision='integer'] How accurate the operation should be, one of: integer, float, approximate.
+ * @param {number} [options.minAmplitude=0.2] A value between 0.001 and 1. A smaller value will generate a larger, more accurate mask.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
-function blur (sigma) {
-  if (!is.defined(sigma)) {
+function blur (options) {
+  let sigma;
+  if (is.number(options)) {
+    sigma = options;
+  } else if (is.plainObject(options)) {
+    if (!is.number(options.sigma)) {
+      throw is.invalidParameterError('options.sigma', 'number between 0.3 and 1000', sigma);
+    }
+    sigma = options.sigma;
+    if ('precision' in options) {
+      if (is.string(vipsPrecision[options.precision])) {
+        this.options.precision = vipsPrecision[options.precision];
+      } else {
+        throw is.invalidParameterError('precision', 'one of: integer, float, approximate', options.precision);
+      }
+    }
+    if ('minAmplitude' in options) {
+      if (is.number(options.minAmplitude) && is.inRange(options.minAmplitude, 0.001, 1)) {
+        this.options.minAmpl = options.minAmplitude;
+      } else {
+        throw is.invalidParameterError('minAmplitude', 'number between 0.001 and 1', options.minAmplitude);
+      }
+    }
+  }
+
+  if (!is.defined(options)) {
     // No arguments: default to mild blur
     this.options.blurSigma = -1;
-  } else if (is.bool(sigma)) {
+  } else if (is.bool(options)) {
     // Boolean argument: apply mild blur?
-    this.options.blurSigma = sigma ? -1 : 0;
+    this.options.blurSigma = options ? -1 : 0;
   } else if (is.number(sigma) && is.inRange(sigma, 0.3, 1000)) {
     // Numeric argument: specific sigma
     this.options.blurSigma = sigma;
   } else {
     throw is.invalidParameterError('sigma', 'number between 0.3 and 1000', sigma);
   }
+
   return this;
 }
 
@@ -787,24 +826,22 @@ function linear (a, b) {
  *     // With this example input, a sepia filter has been applied
  *   });
  *
- * @param {Array<Array<number>>} inputMatrix - 3x3 Recombination matrix
+ * @param {Array<Array<number>>} inputMatrix - 3x3 or 4x4 Recombination matrix
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
 function recomb (inputMatrix) {
-  if (!Array.isArray(inputMatrix) || inputMatrix.length !== 3 ||
-      inputMatrix[0].length !== 3 ||
-      inputMatrix[1].length !== 3 ||
-      inputMatrix[2].length !== 3
-  ) {
-    // must pass in a kernel
-    throw new Error('Invalid recombination matrix');
+  if (!Array.isArray(inputMatrix)) {
+    throw is.invalidParameterError('inputMatrix', 'array', inputMatrix);
+  }
+  if (inputMatrix.length !== 3 && inputMatrix.length !== 4) {
+    throw is.invalidParameterError('inputMatrix', '3x3 or 4x4 array', inputMatrix.length);
+  }
+  const recombMatrix = inputMatrix.flat().map(Number);
+  if (recombMatrix.length !== 9 && recombMatrix.length !== 16) {
+    throw is.invalidParameterError('inputMatrix', 'cardinality of 9 or 16', recombMatrix.length);
   }
-  this.options.recombMatrix = [
-    inputMatrix[0][0], inputMatrix[0][1], inputMatrix[0][2],
-    inputMatrix[1][0], inputMatrix[1][1], inputMatrix[1][2],
-    inputMatrix[2][0], inputMatrix[2][1], inputMatrix[2][2]
-  ].map(Number);
+  this.options.recombMatrix = recombMatrix;
   return this;
 }
 

package/lib/output.js

@@ -65,6 +65,7 @@ const bitdepthFromColourCount = (colours) => 1 << 31 - Math.clz32(Math.ceil(Math
  * `channels` and `premultiplied` (indicating if premultiplication was used).
  * When using a crop strategy also contains `cropOffsetLeft` and `cropOffsetTop`.
  * When using the attention crop strategy also contains `attentionX` and `attentionY`, the focal point of the cropped region.
+ * Animated output will also contain `pageHeight` and `pages`.
  * May also contain `textAutofitDpi` (dpi the font was rendered at) if image was created from text.
  * @returns {Promise<Object>} - when no callback is provided
  * @throws {Error} Invalid parameters
@@ -109,6 +110,7 @@ function toFile (fileOut, callback) {
  * - `info` contains the output image `format`, `size` (bytes), `width`, `height`,
  * `channels` and `premultiplied` (indicating if premultiplication was used).
  * When using a crop strategy also contains `cropOffsetLeft` and `cropOffsetTop`.
+ * Animated output will also contain `pageHeight` and `pages`.
  * May also contain `textAutofitDpi` (dpi the font was rendered at) if image was created from text.
  *
  * A `Promise` is returned when `callback` is not provided.

package/lib/sharp.js

@@ -73,9 +73,9 @@ if (sharp) {
   }
   if (isLinux && /(symbol not found|CXXABI_)/i.test(messages)) {
     try {
-      const { engines } = require(`@img/sharp-libvips-${runtimePlatform}/package`);
+      const { config } = require(`@img/sharp-libvips-${runtimePlatform}/package`);
       const libcFound = `${familySync()} ${versionSync()}`;
-      const libcRequires = `${engines.musl ? 'musl' : 'glibc'} ${engines.musl || engines.glibc}`;
+      const libcRequires = `${config.musl ? 'musl' : 'glibc'} ${config.musl || config.glibc}`;
       help.push(
         '- Update your OS:',
         `    Found ${libcFound}`,

package/lib/utility.js

@@ -75,6 +75,13 @@ if (!libvipsVersion.isGlobal) {
 }
 versions.sharp = require('../package.json').version;
 
+/* istanbul ignore next */
+if (versions.heif && format.heif) {
+  // Prebuilt binaries provide AV1
+  format.heif.input.fileSuffix = ['.avif'];
+  format.heif.output.alias = ['avif'];
+}
+
 /**
  * Gets or, when options are provided, sets the limits of _libvips'_ operation cache.
  * Existing entries in the cache will be trimmed after any change in limits.

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.33.4-rc.0",
+  "version": "0.33.5-rc.0",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -88,7 +88,8 @@
     "Mart Jansink <m.jansink@gmail.com>",
     "Lachlan Newman <lachnewman007@gmail.com>",
     "Dennis Beatty <dennis@dcbeatty.com>",
-    "Ingvar Stepanyan <me@rreverser.com>"
+    "Ingvar Stepanyan <me@rreverser.com>",
+    "Don Denton <don@happycollision.com>"
   ],
   "scripts": {
     "install": "node install/check",
@@ -138,56 +139,58 @@
   "dependencies": {
     "color": "^4.2.3",
     "detect-libc": "^2.0.3",
-    "semver": "^7.6.0"
+    "semver": "^7.6.3"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.33.4-rc.0",
-    "@img/sharp-darwin-x64": "0.33.4-rc.0",
-    "@img/sharp-libvips-darwin-arm64": "1.0.2",
-    "@img/sharp-libvips-darwin-x64": "1.0.2",
-    "@img/sharp-libvips-linux-arm": "1.0.2",
-    "@img/sharp-libvips-linux-arm64": "1.0.2",
-    "@img/sharp-libvips-linux-s390x": "1.0.2",
-    "@img/sharp-libvips-linux-x64": "1.0.2",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.0.2",
-    "@img/sharp-libvips-linuxmusl-x64": "1.0.2",
-    "@img/sharp-linux-arm": "0.33.4-rc.0",
-    "@img/sharp-linux-arm64": "0.33.4-rc.0",
-    "@img/sharp-linux-s390x": "0.33.4-rc.0",
-    "@img/sharp-linux-x64": "0.33.4-rc.0",
-    "@img/sharp-linuxmusl-arm64": "0.33.4-rc.0",
-    "@img/sharp-linuxmusl-x64": "0.33.4-rc.0",
-    "@img/sharp-wasm32": "0.33.4-rc.0",
-    "@img/sharp-win32-ia32": "0.33.4-rc.0",
-    "@img/sharp-win32-x64": "0.33.4-rc.0"
+    "@img/sharp-darwin-arm64": "0.33.5-rc.0",
+    "@img/sharp-darwin-x64": "0.33.5-rc.0",
+    "@img/sharp-libvips-darwin-arm64": "1.0.4",
+    "@img/sharp-libvips-darwin-x64": "1.0.4",
+    "@img/sharp-libvips-linux-arm": "1.0.5",
+    "@img/sharp-libvips-linux-arm64": "1.0.4",
+    "@img/sharp-libvips-linux-s390x": "1.0.4",
+    "@img/sharp-libvips-linux-x64": "1.0.4",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.0.4",
+    "@img/sharp-libvips-linuxmusl-x64": "1.0.4",
+    "@img/sharp-linux-arm": "0.33.5-rc.0",
+    "@img/sharp-linux-arm64": "0.33.5-rc.0",
+    "@img/sharp-linux-s390x": "0.33.5-rc.0",
+    "@img/sharp-linux-x64": "0.33.5-rc.0",
+    "@img/sharp-linuxmusl-arm64": "0.33.5-rc.0",
+    "@img/sharp-linuxmusl-x64": "0.33.5-rc.0",
+    "@img/sharp-wasm32": "0.33.5-rc.0",
+    "@img/sharp-win32-ia32": "0.33.5-rc.0",
+    "@img/sharp-win32-x64": "0.33.5-rc.0"
   },
   "devDependencies": {
-    "@emnapi/runtime": "^1.1.1",
-    "@img/sharp-libvips-dev": "1.0.2",
-    "@img/sharp-libvips-dev-wasm32": "1.0.3",
-    "@img/sharp-libvips-win32-ia32": "1.0.2",
-    "@img/sharp-libvips-win32-x64": "1.0.2",
+    "@emnapi/runtime": "^1.2.0",
+    "@img/sharp-libvips-dev": "1.0.4",
+    "@img/sharp-libvips-dev-wasm32": "1.0.5",
+    "@img/sharp-libvips-win32-ia32": "1.0.4",
+    "@img/sharp-libvips-win32-x64": "1.0.4",
     "@types/node": "*",
     "async": "^3.2.5",
     "cc": "^3.0.1",
-    "emnapi": "^1.1.1",
+    "emnapi": "^1.2.0",
     "exif-reader": "^2.0.1",
     "extract-zip": "^2.0.1",
     "icc": "^3.0.0",
-    "jsdoc-to-markdown": "^8.0.1",
+    "jsdoc-to-markdown": "^8.0.3",
     "license-checker": "^25.0.1",
-    "mocha": "^10.4.0",
-    "node-addon-api": "^8.0.0",
-    "nyc": "^15.1.0",
+    "mocha": "^10.7.3",
+    "node-addon-api": "^8.1.0",
+    "nyc": "^17.0.0",
     "prebuild": "^13.0.1",
     "semistandard": "^17.0.0",
     "tar-fs": "^3.0.6",
-    "tsd": "^0.31.0"
+    "tsd": "^0.31.1"
   },
   "license": "Apache-2.0",
   "engines": {
-    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-    "libvips": ">=8.15.2"
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+  },
+  "config": {
+    "libvips": ">=8.15.3"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"

package/src/binding.gyp

@@ -192,7 +192,7 @@
                 '-Oz',
                 '-sALLOW_MEMORY_GROWTH',
                 '-sENVIRONMENT=node',
-                '-sEXPORTED_FUNCTIONS=["_vips_shutdown", "_uv_library_shutdown"]',
+                '-sEXPORTED_FUNCTIONS=["emnapiInit", "_vips_shutdown", "_uv_library_shutdown"]',
                 '-sNODERAWFS',
                 '-sTEXTDECODER=0',
                 '-sWASM_ASYNC_COMPILATION=0',

package/src/common.h

@@ -16,8 +16,8 @@
 
 #if (VIPS_MAJOR_VERSION < 8) || \
   (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 15) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 2)
-#error "libvips version 8.15.2+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 3)
+#error "libvips version 8.15.3+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))

package/src/metadata.cc

@@ -10,6 +10,8 @@
 #include "common.h"
 #include "metadata.h"
 
+static void* readPNGComment(VipsImage *image, const char *field, GValue *value, void *p);
+
 class MetadataWorker : public Napi::AsyncWorker {
  public:
   MetadataWorker(Napi::Function callback, MetadataBaton *baton, Napi::Function debuglog) :
@@ -131,6 +133,8 @@ class MetadataWorker : public Napi::AsyncWorker {
         memcpy(baton->tifftagPhotoshop, tifftagPhotoshop, tifftagPhotoshopLength);
         baton->tifftagPhotoshopLength = tifftagPhotoshopLength;
       }
+      // PNG comments
+      vips_image_map(image.get_image(), readPNGComment, &baton->comments);
     }
 
     // Clean up
@@ -246,6 +250,17 @@ class MetadataWorker : public Napi::AsyncWorker {
           Napi::Buffer<char>::NewOrCopy(env, baton->tifftagPhotoshop,
             baton->tifftagPhotoshopLength, sharp::FreeCallback));
       }
+      if (baton->comments.size() > 0) {
+        int i = 0;
+        Napi::Array comments = Napi::Array::New(env, baton->comments.size());
+        for (auto &c : baton->comments) {
+          Napi::Object comment = Napi::Object::New(env);
+          comment.Set("keyword", c.first);
+          comment.Set("text", c.second);
+          comments.Set(i++, comment);
+        }
+        info.Set("comments", comments);
+      }
       Callback().Call(Receiver().Value(), { env.Null(), info });
     } else {
       Callback().Call(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
@@ -285,3 +300,21 @@ Napi::Value metadata(const Napi::CallbackInfo& info) {
 
   return info.Env().Undefined();
 }
+
+const char *PNG_COMMENT_START = "png-comment-";
+const int PNG_COMMENT_START_LEN = strlen(PNG_COMMENT_START);
+
+static void* readPNGComment(VipsImage *image, const char *field, GValue *value, void *p) {
+  MetadataComments *comments = static_cast<MetadataComments *>(p);
+
+  if (vips_isprefix(PNG_COMMENT_START, field)) {
+    const char *keyword = strchr(field + PNG_COMMENT_START_LEN, '-');
+    const char *str;
+    if (keyword != NULL && !vips_image_get_string(image, field, &str)) {
+      keyword++;  // Skip the hyphen
+      comments->push_back(std::make_pair(keyword, str));
+    }
+  }
+
+  return NULL;
+}

package/src/metadata.h

@@ -9,6 +9,8 @@
 
 #include "./common.h"
 
+typedef std::vector<std::pair<std::string, std::string>> MetadataComments;
+
 struct MetadataBaton {
   // Input
   sharp::InputDescriptor *input;
@@ -47,6 +49,7 @@ struct MetadataBaton {
   size_t xmpLength;
   char *tifftagPhotoshop;
   size_t tifftagPhotoshopLength;
+  MetadataComments comments;
   std::string err;
 
   MetadataBaton():

package/src/operations.cc

@@ -144,7 +144,7 @@ namespace sharp {
   /*
    * Gaussian blur. Use sigma of -1.0 for fast blur.
    */
-  VImage Blur(VImage image, double const sigma) {
+  VImage Blur(VImage image, double const sigma, VipsPrecision precision, double const minAmpl) {
     if (sigma == -1.0) {
       // Fast, mild blur - averages neighbouring pixels
       VImage blur = VImage::new_matrixv(3, 3,
@@ -155,7 +155,9 @@ namespace sharp {
       return image.conv(blur);
     } else {
       // Slower, accurate Gaussian blur
-      return StaySequential(image).gaussblur(sigma);
+      return StaySequential(image).gaussblur(sigma, VImage::option()
+        ->set("precision", precision)
+        ->set("min_ampl", minAmpl));
     }
   }
 
@@ -164,10 +166,10 @@ namespace sharp {
    */
   VImage Convolve(VImage image, int const width, int const height,
     double const scale, double const offset,
-    std::unique_ptr<double[]> const &kernel_v
+    std::vector<double> const &kernel_v
   ) {
     VImage kernel = VImage::new_from_memory(
-      kernel_v.get(),
+      static_cast<void*>(const_cast<double*>(kernel_v.data())),
       width * height * sizeof(double),
       width,
       height,
@@ -183,19 +185,21 @@ namespace sharp {
    * Recomb with a Matrix of the given bands/channel size.
    * Eg. RGB will be a 3x3 matrix.
    */
-  VImage Recomb(VImage image, std::unique_ptr<double[]> const &matrix) {
-    double *m = matrix.get();
+  VImage Recomb(VImage image, std::vector<double> const& matrix) {
+    double* m = const_cast<double*>(matrix.data());
     image = image.colourspace(VIPS_INTERPRETATION_sRGB);
-    return image
-      .recomb(image.bands() == 3
-        ? VImage::new_from_memory(
-          m, 9 * sizeof(double), 3, 3, 1, VIPS_FORMAT_DOUBLE
-        )
-        : VImage::new_matrixv(4, 4,
-          m[0], m[1], m[2], 0.0,
-          m[3], m[4], m[5], 0.0,
-          m[6], m[7], m[8], 0.0,
-          0.0, 0.0, 0.0, 1.0));
+    if (matrix.size() == 9) {
+      return image
+        .recomb(image.bands() == 3
+          ? VImage::new_matrix(3, 3, m, 9)
+          : VImage::new_matrixv(4, 4,
+            m[0], m[1], m[2], 0.0,
+            m[3], m[4], m[5], 0.0,
+            m[6], m[7], m[8], 0.0,
+            0.0, 0.0, 0.0, 1.0));
+    } else {
+      return image.recomb(VImage::new_matrix(4, 4, m, 16));
+    }
   }
 
   VImage Modulate(VImage image, double const brightness, double const saturation,

package/src/operations.h

@@ -47,13 +47,13 @@ namespace sharp {
   /*
    * Gaussian blur. Use sigma of -1.0 for fast blur.
    */
-  VImage Blur(VImage image, double const sigma);
+  VImage Blur(VImage image, double const sigma, VipsPrecision precision, double const minAmpl);
 
   /*
    * Convolution with a kernel.
    */
   VImage Convolve(VImage image, int const width, int const height,
-    double const scale, double const offset, std::unique_ptr<double[]> const &kernel_v);
+    double const scale, double const offset, std::vector<double> const &kernel_v);
 
   /*
    * Sharpen flat and jagged areas. Use sigma of -1.0 for fast sharpen.
@@ -95,7 +95,7 @@ namespace sharp {
    * Recomb with a Matrix of the given bands/channel size.
    * Eg. RGB will be a 3x3 matrix.
    */
-  VImage Recomb(VImage image, std::unique_ptr<double[]> const &matrix);
+  VImage Recomb(VImage image, std::vector<double> const &matrix);
 
   /*
    * Modulate brightness, saturation, hue and lightness

package/src/pipeline.cc

@@ -325,6 +325,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       if ((baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) && baton->withIccProfile.empty()) {
         // Cache input profile for use with output
         inputProfile = sharp::GetProfile(image);
+        baton->input->ignoreIcc = true;
       }
       char const *processingProfile = image.interpretation() == VIPS_INTERPRETATION_RGB16 ? "p3" : "srgb";
       if (
@@ -592,7 +593,7 @@ class PipelineWorker : public Napi::AsyncWorker {
 
       // Blur
       if (shouldBlur) {
-        image = sharp::Blur(image, baton->blurSigma);
+        image = sharp::Blur(image, baton->blurSigma, baton->precision, baton->minAmpl);
       }
 
       // Unflatten the image
@@ -609,7 +610,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
 
       // Recomb
-      if (baton->recombMatrix != NULL) {
+      if (!baton->recombMatrix.empty()) {
         image = sharp::Recomb(image, baton->recombMatrix);
       }
 
@@ -849,6 +850,11 @@ class PipelineWorker : public Napi::AsyncWorker {
       image = sharp::SetAnimationProperties(
         image, nPages, targetPageHeight, baton->delay, baton->loop);
 
+      if (image.get_typeof(VIPS_META_PAGE_HEIGHT) == G_TYPE_INT) {
+        baton->pageHeightOut = image.get_int(VIPS_META_PAGE_HEIGHT);
+        baton->pagesOut = image.get_int(VIPS_META_N_PAGES);
+      }
+
       // Output
       sharp::SetTimeout(image, baton->timeoutSeconds);
       if (baton->fileOut.empty()) {
@@ -1284,6 +1290,10 @@ class PipelineWorker : public Napi::AsyncWorker {
       if (baton->input->textAutofitDpi) {
         info.Set("textAutofitDpi", static_cast<uint32_t>(baton->input->textAutofitDpi));
       }
+      if (baton->pageHeightOut) {
+        info.Set("pageHeight", static_cast<int32_t>(baton->pageHeightOut));
+        info.Set("pages", static_cast<int32_t>(baton->pagesOut));
+      }
 
       if (baton->bufferOutLength > 0) {
         // Add buffer size to info
@@ -1532,6 +1542,8 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
   baton->negate = sharp::AttrAsBool(options, "negate");
   baton->negateAlpha = sharp::AttrAsBool(options, "negateAlpha");
   baton->blurSigma = sharp::AttrAsDouble(options, "blurSigma");
+  baton->precision = sharp::AttrAsEnum<VipsPrecision>(options, "precision", VIPS_TYPE_PRECISION);
+  baton->minAmpl = sharp::AttrAsDouble(options, "minAmpl");
   baton->brightness = sharp::AttrAsDouble(options, "brightness");
   baton->saturation = sharp::AttrAsDouble(options, "saturation");
   baton->hue = sharp::AttrAsInt32(options, "hue");
@@ -1597,17 +1609,18 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
     baton->convKernelScale = sharp::AttrAsDouble(kernel, "scale");
     baton->convKernelOffset = sharp::AttrAsDouble(kernel, "offset");
     size_t const kernelSize = static_cast<size_t>(baton->convKernelWidth * baton->convKernelHeight);
-    baton->convKernel = std::unique_ptr<double[]>(new double[kernelSize]);
+    baton->convKernel.resize(kernelSize);
     Napi::Array kdata = kernel.Get("kernel").As<Napi::Array>();
     for (unsigned int i = 0; i < kernelSize; i++) {
       baton->convKernel[i] = sharp::AttrAsDouble(kdata, i);
     }
   }
   if (options.Has("recombMatrix")) {
-    baton->recombMatrix = std::unique_ptr<double[]>(new double[9]);
     Napi::Array recombMatrix = options.Get("recombMatrix").As<Napi::Array>();
-    for (unsigned int i = 0; i < 9; i++) {
-       baton->recombMatrix[i] = sharp::AttrAsDouble(recombMatrix, i);
+    unsigned int matrixElements = recombMatrix.Length();
+    baton->recombMatrix.resize(matrixElements);
+    for (unsigned int i = 0; i < matrixElements; i++) {
+      baton->recombMatrix[i] = sharp::AttrAsDouble(recombMatrix, i);
     }
   }
   baton->colourspacePipeline = sharp::AttrAsEnum<VipsInterpretation>(

package/src/pipeline.h

@@ -43,6 +43,8 @@ struct PipelineBaton {
   std::string fileOut;
   void *bufferOut;
   size_t bufferOutLength;
+  int pageHeightOut;
+  int pagesOut;
   std::vector<Composite *> composite;
   std::vector<sharp::InputDescriptor *> joinChannelIn;
   int topOffsetPre;
@@ -76,6 +78,8 @@ struct PipelineBaton {
   bool negate;
   bool negateAlpha;
   double blurSigma;
+  VipsPrecision precision;
+  double minAmpl;
   double brightness;
   double saturation;
   int hue;
@@ -195,7 +199,7 @@ struct PipelineBaton {
   std::unordered_map<std::string, std::string> withExif;
   bool withExifMerge;
   int timeoutSeconds;
-  std::unique_ptr<double[]> convKernel;
+  std::vector<double> convKernel;
   int convKernelWidth;
   int convKernelHeight;
   double convKernelScale;
@@ -221,11 +225,13 @@ struct PipelineBaton {
   VipsForeignDzDepth tileDepth;
   std::string tileId;
   std::string tileBasename;
-  std::unique_ptr<double[]> recombMatrix;
+  std::vector<double> recombMatrix;
 
   PipelineBaton():
     input(nullptr),
     bufferOutLength(0),
+    pageHeightOut(0),
+    pagesOut(0),
     topOffsetPre(-1),
     topOffsetPost(-1),
     channels(0),