sharp 0.35.0-rc.0 → 0.35.0-rc.3

package/README.md

@@ -38,31 +38,27 @@ npm install sharp
 ```
 
 ```javascript
+// ESM
+import sharp from 'sharp';
+
+// CJS
 const sharp = require('sharp');
 ```
 
-### Callback
-
 ```javascript
-sharp(inputBuffer)
-  .resize(320, 240)
+await sharp(inputBuffer)
+  .resize({ width: 320, height: 240 })
   .toFile('output.webp', (err, info) => { ... });
 ```
 
-### Promise
-
 ```javascript
-sharp('input.jpg')
-  .rotate()
-  .resize(200)
+const output = await sharp('input.jpg')
+  .autoOrient()
+  .resize({ width: 200 })
   .jpeg({ mozjpeg: true })
-  .toBuffer()
-  .then( data => { ... })
-  .catch( err => { ... });
+  .toBuffer();
 ```
 
-### Async/await
-
 ```javascript
 const semiTransparentRedPng = await sharp({
   create: {
@@ -76,8 +72,6 @@ const semiTransparentRedPng = await sharp({
   .toBuffer();
 ```
 
-### Stream
-
 ```javascript
 const roundedCorners = Buffer.from(
   '<svg><rect x="0" y="0" width="200" height="200" rx="50" ry="50"/></svg>'

package/install/build.js

@@ -8,7 +8,7 @@ const {
   globalLibvipsVersion,
   log,
   spawnRebuild,
-} = require('../lib/libvips');
+} = require('../dist/libvips.cjs');
 
 log('Building from source');
 log('See https://sharp.pixelplumbing.com/install#building-from-source');

package/lib/index.d.ts

@@ -28,6 +28,7 @@
 /// <reference types="node" />
 
 import type { Duplex } from 'node:stream';
+import { ColorLike } from '@img/colour';
 
 //#region Constructor functions
 
@@ -234,7 +235,7 @@ declare namespace sharp {
          * @param tint Parsed by the color module.
          * @returns A sharp instance that can be used to chain operations
          */
-        tint(tint: Colour | Color): Sharp;
+        tint(tint: ColorLike): Sharp;
 
         /**
          * Convert to 8-bit greyscale; 256 shades of grey.
@@ -684,6 +685,14 @@ declare namespace sharp {
          */
         toUint8Array(): Promise<{ data: Uint8Array; info: OutputInfo }>;
 
+        /**
+         * Set output density (DPI) in EXIF metadata.
+         * @param density Density in dots per inch (DPI).
+         * @returns A sharp instance that can be used to chain operations
+         * @throws {Error} Invalid parameters
+         */
+        withDensity(density: number): Sharp;
+
         /**
          * Keep all EXIF metadata from the input image in the output image.
          * EXIF metadata is unsupported for TIFF output.
@@ -993,7 +1002,7 @@ declare namespace sharp {
         unlimited?: boolean | undefined;
         /** Set this to false to use random access rather than sequential read. Some operations will do this automatically. */
         sequentialRead?: boolean | undefined;
-        /** Number representing the DPI for vector images in the range 1 to 100000. (optional, default 72) */
+        /** The DPI at which to render SVG and PDF images, in the range 1 to 100000. (optional, default 72) */
         density?: number | undefined;
         /** Should the embedded ICC profile, if any, be ignored. */
         ignoreIcc?: boolean | undefined;
@@ -1014,7 +1023,7 @@ declare namespace sharp {
         /** @deprecated Use {@link SharpOptions.tiff} instead */
         subifd?: number | undefined;
         /** @deprecated Use {@link SharpOptions.pdf} instead */
-        pdfBackground?: Colour | Color | undefined;
+        pdfBackground?: ColorLike | undefined;
         /** @deprecated Use {@link SharpOptions.openSlide} instead */
         level?: number | undefined;
         /** Set to `true` to read all frames/pages of an animated image (equivalent of setting `pages` to `-1`). (optional, default false) */
@@ -1073,7 +1082,7 @@ declare namespace sharp {
         /** Number of bands, 3 for RGB, 4 for RGBA */
         channels: CreateChannels;
         /** Parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha. */
-        background: Colour | Color;
+        background: ColorLike;
         /** Describes a noise to be created. */
         noise?: Noise | undefined;
         /** The height of each page/frame for animated images, must be an integral factor of the overall image height. */
@@ -1120,7 +1129,7 @@ declare namespace sharp {
         /** Space between images, in pixels. */
         shim?: number | undefined;
         /** Background colour. */
-        background?: Colour | Color | undefined;
+        background?: ColorLike | undefined;
         /** Horizontal alignment. */
         halign?: HorizontalAlignment | undefined;
         /** Vertical alignment. */
@@ -1141,7 +1150,7 @@ declare namespace sharp {
 
     interface PdfInputOptions {
         /** 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. */
-        background?: Colour | Color | undefined;
+        background?: ColorLike | undefined;
     }
 
     interface OpenSlideInputOptions {
@@ -1479,8 +1488,8 @@ declare namespace sharp {
         xres?: number | undefined;
         /** Vertical resolution in pixels/mm (optional, default 1.0) */
         yres?: number | undefined;
-        /** Reduce bitdepth to 1, 2 or 4 bit (optional, default 8) */
-        bitdepth?: 1 | 2 | 4 | 8 | undefined;
+        /** Reduce bitdepth to 1, 2 or 4 bit (optional) */
+        bitdepth?: 1 | 2 | 4 | undefined;
         /** Write 1-bit images as miniswhite (optional, default false) */
         miniswhite?: boolean | undefined;
         /** Resolution unit options: inch, cm (optional, default 'inch') */
@@ -1510,7 +1519,7 @@ declare namespace sharp {
 
     interface RotateOptions {
         /** parsed by the color module to extract values for red, green, blue and alpha. (optional, default "#000000") */
-        background?: Colour | Color | undefined;
+        background?: ColorLike | undefined;
     }
 
     type Precision = 'integer' | 'float' | 'approximate';
@@ -1526,7 +1535,7 @@ declare namespace sharp {
 
     interface FlattenOptions {
         /** background colour, parsed by the color module, defaults to black. (optional, default {r:0,g:0,b:0}) */
-        background?: Colour | Color | undefined;
+        background?: ColorLike | undefined;
     }
 
     interface NegateOptions {
@@ -1551,7 +1560,7 @@ declare namespace sharp {
         /** Position, gravity or strategy to use when fit is cover or contain. (optional, default 'centre') */
         position?: number | string | undefined;
         /** Background colour when using a fit of contain, parsed by the color module, defaults to black without transparency. (optional, default {r:0,g:0,b:0,alpha:1}) */
-        background?: Colour | Color | undefined;
+        background?: ColorLike | undefined;
         /** The kernel to use for image reduction. (optional, default 'lanczos3') */
         kernel?: keyof KernelEnum | undefined;
         /** Do not enlarge if the width or height are already less than the specified dimensions, equivalent to GraphicsMagick's > geometry option. (optional, default false) */
@@ -1594,14 +1603,14 @@ declare namespace sharp {
         /** single pixel count to right edge (optional, default 0) */
         right?: number | undefined;
         /** background colour, parsed by the color module, defaults to black without transparency. (optional, default {r:0,g:0,b:0,alpha:1}) */
-        background?: Colour | Color | undefined;
+        background?: ColorLike | undefined;
         /** how the extension is done, one of: "background", "copy", "repeat", "mirror" (optional, default `'background'`) */
         extendWith?: ExtendWith | undefined;
     }
 
     interface TrimOptions {
         /** Background colour, parsed by the color module, defaults to that of the top-left pixel. (optional) */
-        background?: Colour | Color | undefined;
+        background?: ColorLike | undefined;
         /** Allowed difference from the above colour, a positive number. (optional, default 10) */
         threshold?: number | undefined;
         /** Does the input more closely resemble line art (e.g. vector) rather than being photographic? (optional, default false) */
@@ -1617,15 +1626,8 @@ declare namespace sharp {
     /** 1 for grayscale, 2 for grayscale + alpha, 3 for sRGB, 4 for CMYK or RGBA */
     type Channels = 1 | 2 | 3 | 4;
 
-    interface RGBA {
-        r?: number | undefined;
-        g?: number | undefined;
-        b?: number | undefined;
-        alpha?: number | undefined;
-    }
-
-    type Colour = string | RGBA;
-    type Color = Colour;
+    type Colour = ColorLike;
+    type Color = ColorLike;
 
     interface Kernel {
         /** width of the kernel in pixels. */
@@ -1691,7 +1693,7 @@ declare namespace sharp {
         /** Tile angle of rotation, must be a multiple of 90. (optional, default 0) */
         angle?: number | undefined;
         /** background colour, parsed by the color module, defaults to white without transparency. (optional, default {r:255,g:255,b:255,alpha:1}) */
-        background?: string | RGBA | undefined;
+        background?: ColorLike | undefined;
         /** How deep to make the pyramid, possible values are "onepixel", "onetile" or "one" (default based on layout) */
         depth?: string | undefined;
         /** Threshold to skip tile generation, a value 0 - 255 for 8-bit images or 0 - 65535 for 16-bit images */

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.0-rc.0",
+  "version": "0.35.0-rc.3",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -90,10 +90,12 @@
     "Dennis Beatty <dennis@dcbeatty.com>",
     "Ingvar Stepanyan <me@rreverser.com>",
     "Don Denton <don@happycollision.com>",
-    "Dmytro Tiapukhin <cool.gegeg@gmail.com>"
+    "Dmytro Tiapukhin <cool.gegeg@gmail.com>",
+    "Florian Lefebvre <contact@florian-lefebvre.dev>"
   ],
   "scripts": {
     "build": "node install/build.js",
+    "build:dist": "node scripts/build.mjs",
     "clean": "rm -rf src/build/ test/fixtures/output.*",
     "test": "npm run lint && npm run test-unit",
     "lint": "npm run lint-cpp && npm run lint-js && npm run lint-types",
@@ -103,19 +105,28 @@
     "test-leak": "./test/leak/leak.sh",
     "test-unit": "node --experimental-test-coverage test/unit.mjs",
     "package-from-local-build": "node npm/from-local-build.js",
+    "package-wasm-wrappers": "node npm/wasm-wrappers.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"
   },
   "type": "commonjs",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
   "files": [
+    "dist",
     "install",
-    "lib",
+    "lib/index.d.ts",
     "src/*.{cc,h,gyp}"
   ],
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./lib/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/lovell/sharp.git"
@@ -139,53 +150,54 @@
     "vips"
   ],
   "dependencies": {
-    "@img/colour": "^1.0.0",
+    "@img/colour": "^1.1.0",
     "detect-libc": "^2.1.2",
-    "semver": "^7.7.3"
+    "semver": "^7.7.4"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.35.0-rc.0",
-    "@img/sharp-darwin-x64": "0.35.0-rc.0",
-    "@img/sharp-libvips-darwin-arm64": "1.3.0-rc.2",
-    "@img/sharp-libvips-darwin-x64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-arm": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-arm64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-ppc64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-riscv64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-s390x": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-x64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linuxmusl-x64": "1.3.0-rc.2",
-    "@img/sharp-linux-arm": "0.35.0-rc.0",
-    "@img/sharp-linux-arm64": "0.35.0-rc.0",
-    "@img/sharp-linux-ppc64": "0.35.0-rc.0",
-    "@img/sharp-linux-riscv64": "0.35.0-rc.0",
-    "@img/sharp-linux-s390x": "0.35.0-rc.0",
-    "@img/sharp-linux-x64": "0.35.0-rc.0",
-    "@img/sharp-linuxmusl-arm64": "0.35.0-rc.0",
-    "@img/sharp-linuxmusl-x64": "0.35.0-rc.0",
-    "@img/sharp-wasm32": "0.35.0-rc.0",
-    "@img/sharp-win32-arm64": "0.35.0-rc.0",
-    "@img/sharp-win32-ia32": "0.35.0-rc.0",
-    "@img/sharp-win32-x64": "0.35.0-rc.0"
+    "@img/sharp-darwin-arm64": "0.35.0-rc.3",
+    "@img/sharp-darwin-x64": "0.35.0-rc.3",
+    "@img/sharp-freebsd-wasm32": "0.35.0-rc.3",
+    "@img/sharp-libvips-darwin-arm64": "1.3.0-rc.5",
+    "@img/sharp-libvips-darwin-x64": "1.3.0-rc.5",
+    "@img/sharp-libvips-linux-arm": "1.3.0-rc.5",
+    "@img/sharp-libvips-linux-arm64": "1.3.0-rc.5",
+    "@img/sharp-libvips-linux-ppc64": "1.3.0-rc.5",
+    "@img/sharp-libvips-linux-riscv64": "1.3.0-rc.5",
+    "@img/sharp-libvips-linux-s390x": "1.3.0-rc.5",
+    "@img/sharp-libvips-linux-x64": "1.3.0-rc.5",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.3.0-rc.5",
+    "@img/sharp-libvips-linuxmusl-x64": "1.3.0-rc.5",
+    "@img/sharp-linux-arm": "0.35.0-rc.3",
+    "@img/sharp-linux-arm64": "0.35.0-rc.3",
+    "@img/sharp-linux-ppc64": "0.35.0-rc.3",
+    "@img/sharp-linux-riscv64": "0.35.0-rc.3",
+    "@img/sharp-linux-s390x": "0.35.0-rc.3",
+    "@img/sharp-linux-x64": "0.35.0-rc.3",
+    "@img/sharp-linuxmusl-arm64": "0.35.0-rc.3",
+    "@img/sharp-linuxmusl-x64": "0.35.0-rc.3",
+    "@img/sharp-webcontainers-wasm32": "0.35.0-rc.3",
+    "@img/sharp-win32-arm64": "0.35.0-rc.3",
+    "@img/sharp-win32-ia32": "0.35.0-rc.3",
+    "@img/sharp-win32-x64": "0.35.0-rc.3"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.10",
+    "@biomejs/biome": "^2.4.12",
     "@cpplint/cli": "^0.1.0",
-    "@emnapi/runtime": "^1.7.1",
-    "@img/sharp-libvips-dev": "1.3.0-rc.2",
-    "@img/sharp-libvips-dev-wasm32": "1.3.0-rc.2",
-    "@img/sharp-libvips-win32-arm64": "1.3.0-rc.2",
-    "@img/sharp-libvips-win32-ia32": "1.3.0-rc.2",
-    "@img/sharp-libvips-win32-x64": "1.3.0-rc.2",
+    "@emnapi/runtime": "^1.10.0",
+    "@img/sharp-libvips-dev": "1.3.0-rc.5",
+    "@img/sharp-libvips-dev-wasm32": "1.3.0-rc.5",
+    "@img/sharp-libvips-win32-arm64": "1.3.0-rc.5",
+    "@img/sharp-libvips-win32-ia32": "1.3.0-rc.5",
+    "@img/sharp-libvips-win32-x64": "1.3.0-rc.5",
     "@types/node": "*",
-    "emnapi": "^1.7.1",
+    "emnapi": "^1.10.0",
     "exif-reader": "^2.0.3",
     "extract-zip": "^2.0.1",
     "icc": "^3.0.0",
-    "node-addon-api": "^8.5.0",
-    "node-gyp": "^12.1.0",
-    "tar-fs": "^3.1.1",
+    "node-addon-api": "^8.7.0",
+    "node-gyp": "^12.2.0",
+    "tar-fs": "^3.1.2",
     "tsd": "^0.33.0"
   },
   "license": "Apache-2.0",
@@ -193,7 +205,7 @@
     "node": ">=20.9.0"
   },
   "config": {
-    "libvips": ">=8.18.0"
+    "libvips": ">=8.18.2"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"

package/src/binding.gyp

@@ -3,14 +3,14 @@
 
 {
   'variables': {
-    'vips_version': '<!(node -p "require(\'../lib/libvips\').minimumLibvipsVersion")',
-    'platform_and_arch': '<!(node -p "require(\'../lib/libvips\').buildPlatformArch()")',
+    'vips_version': '<!(node -p "require(\'../dist/libvips.cjs\').minimumLibvipsVersion")',
+    'platform_and_arch': '<!(node -p "require(\'../dist/libvips.cjs\').buildPlatformArch()")',
     'sharp_version': '<!(node -p "require(\'../package.json\').version")',
     'sharp_libvips_version': '<!(node -p "require(\'../package.json\').optionalDependencies[\'@img/sharp-libvips-<(platform_and_arch)\']")',
-    'sharp_libvips_yarn_locator': '<!(node -p "require(\'../lib/libvips\').yarnLocator()")',
-    'sharp_libvips_include_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsIncludeDir()")',
-    'sharp_libvips_cplusplus_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsCPlusPlusDir()")',
-    'sharp_libvips_lib_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsLibDir()")'
+    'sharp_libvips_yarn_locator': '<!(node -p "require(\'../dist/libvips.cjs\').yarnLocator()")',
+    'sharp_libvips_include_dir': '<!(node -p "require(\'../dist/libvips.cjs\').buildSharpLibvipsIncludeDir()")',
+    'sharp_libvips_cplusplus_dir': '<!(node -p "require(\'../dist/libvips.cjs\').buildSharpLibvipsCPlusPlusDir()")',
+    'sharp_libvips_lib_dir': '<!(node -p "require(\'../dist/libvips.cjs\').buildSharpLibvipsLibDir()")'
   },
   'targets': [{
     'target_name': 'libvips-cpp-<(vips_version)',
@@ -21,6 +21,7 @@
         'defines': [
           '_VIPS_PUBLIC=__declspec(dllexport)',
           '_ALLOW_KEYWORD_MACROS',
+          '_HAS_EXCEPTIONS=1',
           'G_DISABLE_ASSERT',
           'G_DISABLE_CAST_CHECKS',
           'G_DISABLE_CHECKS'
@@ -98,8 +99,8 @@
     'variables': {
       'conditions': [
         ['OS != "win"', {
-          'pkg_config_path': '<!(node -p "require(\'../lib/libvips\').pkgConfigPath()")',
-          'use_global_libvips': '<!(node -p "Boolean(require(\'../lib/libvips\').useGlobalLibvips()).toString()")'
+          'pkg_config_path': '<!(node -p "require(\'../dist/libvips.cjs\').pkgConfigPath()")',
+          'use_global_libvips': '<!(node -p "Boolean(require(\'../dist/libvips.cjs\').useGlobalLibvips()).toString()")'
         }, {
           'pkg_config_path': '',
           'use_global_libvips': ''
@@ -148,7 +149,8 @@
           ['OS == "win"', {
             'defines': [
               '_ALLOW_KEYWORD_MACROS',
-              '_FILE_OFFSET_BITS=64'
+              '_FILE_OFFSET_BITS=64',
+              '_HAS_EXCEPTIONS=1'
             ],
             'link_settings': {
               'libraries': [
@@ -203,14 +205,16 @@
           }],
           ['OS == "emscripten"', {
             'product_extension': 'node.js',
+            'cflags_cc': [
+              '-fwasm-exceptions'
+            ],
             'link_settings': {
               'ldflags': [
-                '-fexceptions',
+                '-fwasm-exceptions',
                 '--pre-js=<!(node -p "require.resolve(\'./emscripten/pre.js\')")',
                 '-Oz',
                 '-sALLOW_MEMORY_GROWTH',
                 '-sENVIRONMENT=node',
-                '-sEXPORTED_FUNCTIONS=emnapiInit,_vips_shutdown,_uv_library_shutdown',
                 '-sNODERAWFS',
                 '-sWASM_ASYNC_COMPILATION=0'
               ],

package/src/common.cc

@@ -426,7 +426,7 @@ namespace sharp {
     }
     if (ImageTypeSupportsPage(imageType)) {
       option->set("n", descriptor->pages);
-      option->set("page", descriptor->page);
+      option->set("page", std::max(0, descriptor->page));
     }
     switch (imageType) {
       case ImageType::SVG:
@@ -456,6 +456,22 @@ namespace sharp {
     return option;
   }
 
+  /*
+    Should HEIF image be re-opened using the primary item?
+  */
+  static bool HeifPrimaryPageReopen(VImage image, InputDescriptor *descriptor) {
+    if (image.get_typeof(VIPS_META_N_PAGES) == G_TYPE_INT && image.get_typeof("heif-primary") == G_TYPE_INT) {
+      if (image.get_int(VIPS_META_N_PAGES) > 1 && descriptor->pages == 1 && descriptor->page == -1) {
+        int const pagePrimary = image.get_int("heif-primary");
+        if (pagePrimary != 0) {
+          descriptor->page = pagePrimary;
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
   /*
     Open an image from the given InputDescriptor (filesystem, compressed buffer, raw pixel data)
   */
@@ -490,12 +506,15 @@ namespace sharp {
             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);
+            } else if (imageType == ImageType::HEIF && HeifPrimaryPageReopen(image, descriptor)) {
+              option = GetOptionsForImageType(imageType, descriptor);
+              image = VImage::new_from_buffer(descriptor->buffer, descriptor->bufferLength, nullptr, option);
             }
-          } catch (vips::VError const &err) {
-            throw vips::VError(std::string("Input buffer has corrupt header: ") + err.what());
+          } catch (std::runtime_error const &err) {
+            throw std::runtime_error(std::string("Input buffer has corrupt header: ") + err.what());
           }
         } else {
-          throw vips::VError("Input buffer contains unsupported image format");
+          throw std::runtime_error("Input buffer contains unsupported image format");
         }
       }
     } else {
@@ -566,10 +585,10 @@ namespace sharp {
         imageType = DetermineImageType(descriptor->file.data());
         if (imageType == ImageType::MISSING) {
           if (descriptor->file.find("<svg") != std::string::npos) {
-            throw vips::VError("Input file is missing, did you mean "
+            throw std::runtime_error("Input file is missing, did you mean "
               "sharp(Buffer.from('" + descriptor->file.substr(0, 8) + "...')?");
           }
-          throw vips::VError("Input file is missing: " + descriptor->file);
+          throw std::runtime_error("Input file is missing: " + descriptor->file);
         }
         if (imageType != ImageType::UNKNOWN) {
           try {
@@ -577,12 +596,15 @@ namespace sharp {
             image = VImage::new_from_file(descriptor->file.data(), option);
             if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
               image = SetDensity(image, descriptor->density);
+            } else if (imageType == ImageType::HEIF && HeifPrimaryPageReopen(image, descriptor)) {
+              option = GetOptionsForImageType(imageType, descriptor);
+              image = VImage::new_from_file(descriptor->file.data(), option);
             }
-          } catch (vips::VError const &err) {
-            throw vips::VError(std::string("Input file has corrupt header: ") + err.what());
+          } catch (std::runtime_error const &err) {
+            throw std::runtime_error(std::string("Input file has corrupt header: ") + err.what());
           }
         } else {
-          throw vips::VError("Input file contains unsupported image format");
+          throw std::runtime_error("Input file contains unsupported image format");
         }
       }
     }
@@ -590,7 +612,7 @@ namespace sharp {
     // Limit input images to a given number of pixels, where pixels = width * height
     if (descriptor->limitInputPixels > 0 &&
       static_cast<uint64_t>(image.width()) * image.height() > descriptor->limitInputPixels) {
-      throw vips::VError("Input image exceeds pixel limit");
+      throw std::runtime_error("Input image exceeds pixel limit");
     }
     return std::make_tuple(image, imageType);
   }
@@ -610,7 +632,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*>(g_malloc(length));
+      icc.first = static_cast<char*>(vips_malloc(reinterpret_cast<VipsObject*>(image.get_image()), length));
       icc.second = length;
       memcpy(icc.first, data, length);
     }
@@ -623,7 +645,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, reinterpret_cast<VipsCallbackFn>(vips_area_free_cb), icc.first, icc.second);
+      image.set(VIPS_META_ICC_NAME, nullptr, icc.first, icc.second);
     }
     return image;
   }
@@ -766,19 +788,19 @@ namespace sharp {
       : image.height();
     if (imageType == ImageType::JPEG) {
       if (image.width() > 65535 || height > 65535) {
-        throw vips::VError("Processed image is too large for the JPEG format");
+        throw std::runtime_error("Processed image is too large for the JPEG format");
       }
     } else if (imageType == ImageType::WEBP) {
       if (image.width() > 16383 || height > 16383) {
-        throw vips::VError("Processed image is too large for the WebP format");
+        throw std::runtime_error("Processed image is too large for the WebP format");
       }
     } else if (imageType == ImageType::GIF) {
       if (image.width() > 65535 || height > 65535) {
-        throw vips::VError("Processed image is too large for the GIF format");
+        throw std::runtime_error("Processed image is too large for the GIF format");
       }
     } else if (imageType == ImageType::HEIF) {
       if (image.width() > 16384 || height > 16384) {
-        throw vips::VError("Processed image is too large for the HEIF format");
+        throw std::runtime_error("Processed image is too large for the HEIF format");
       }
     }
   }
@@ -1142,7 +1164,8 @@ namespace sharp {
     Does this image have a gain map?
   */
   bool HasGainMap(VImage image) {
-    return image.get_typeof("gainmap-data") == VIPS_TYPE_BLOB;
+    return image.get_typeof("gainmap") == VIPS_TYPE_BLOB ||
+      image.get_typeof("gainmap-data") == VIPS_TYPE_BLOB;
   }
 
   /*
@@ -1150,6 +1173,7 @@ namespace sharp {
   */
   VImage RemoveGainMap(VImage image) {
     VImage copy = image.copy();
+    copy.remove("gainmap");
     copy.remove("gainmap-data");
     return copy;
   }

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 < 0)
-#error "libvips version 8.18.0+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 18 && VIPS_MICRO_VERSION < 2)
+#error "libvips version 8.18.2+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if defined(__has_include)
@@ -29,6 +29,12 @@
 #endif
 #endif
 
+#ifdef __EMSCRIPTEN__
+#define SHARP_CALLBACK_FN_NAME Call
+#else
+#define SHARP_CALLBACK_FN_NAME MakeCallback
+#endif
+
 using vips::VImage;
 
 namespace sharp {
@@ -105,7 +111,7 @@ namespace sharp {
       rawPremultiplied(false),
       rawPageHeight(0),
       pages(1),
-      page(0),
+      page(-1),
       createChannels(0),
       createWidth(0),
       createHeight(0),