sharp 0.33.1-rc.0 → 0.33.1-rc.3

package/install/check.js

@@ -3,34 +3,39 @@
 
 'use strict';
 
-const { useGlobalLibvips, globalLibvipsVersion, log, spawnRebuild } = require('../lib/libvips');
+try {
+  const { useGlobalLibvips, globalLibvipsVersion, log, spawnRebuild } = require('../lib/libvips');
 
-const buildFromSource = (msg) => {
-  log(msg);
-  log('Attempting to build from source via node-gyp');
-  try {
-    require('node-addon-api');
-    log('Found node-addon-api');
-  } catch (err) {
-    log('Please add node-addon-api to your dependencies');
-    return;
-  }
-  try {
-    const gyp = require('node-gyp');
-    log(`Found node-gyp version ${gyp().version}`);
-  } catch (err) {
-    log('Please add node-gyp to your dependencies');
-    return;
-  }
-  log('See https://sharp.pixelplumbing.com/install#building-from-source');
-  const status = spawnRebuild();
-  if (status !== 0) {
-    process.exit(status);
-  }
-};
+  const buildFromSource = (msg) => {
+    log(msg);
+    log('Attempting to build from source via node-gyp');
+    try {
+      require('node-addon-api');
+      log('Found node-addon-api');
+    } catch (err) {
+      log('Please add node-addon-api to your dependencies');
+      return;
+    }
+    try {
+      const gyp = require('node-gyp');
+      log(`Found node-gyp version ${gyp().version}`);
+    } catch (err) {
+      log('Please add node-gyp to your dependencies');
+      return;
+    }
+    log('See https://sharp.pixelplumbing.com/install#building-from-source');
+    const status = spawnRebuild();
+    if (status !== 0) {
+      process.exit(status);
+    }
+  };
 
-if (useGlobalLibvips()) {
-  buildFromSource(`Detected globally-installed libvips v${globalLibvipsVersion()}`);
-} else if (process.env.npm_config_build_from_source) {
-  buildFromSource('Detected --build-from-source flag');
+  if (useGlobalLibvips()) {
+    buildFromSource(`Detected globally-installed libvips v${globalLibvipsVersion()}`);
+  } else if (process.env.npm_config_build_from_source) {
+    buildFromSource('Detected --build-from-source flag');
+  }
+} catch (err) {
+  const summary = err.message.split(/\n/).slice(0, 1);
+  console.log(`sharp: skipping install check: ${summary}`);
 }

package/lib/index.d.ts

@@ -126,7 +126,7 @@ declare namespace sharp {
     function counters(): SharpCounters;
 
     /**
-     * Get and set use of SIMD vector unit instructions. Requires libvips to have been compiled with liborc support.
+     * Get and set use of SIMD vector unit instructions. Requires libvips to have been compiled with highway support.
      * Improves the performance of resize, blur and sharpen operations by taking advantage of the SIMD vector unit of the CPU, e.g. Intel SSE and ARM NEON.
      * @param enable enable or disable use of SIMD vector unit instructions
      * @returns true if usage of SIMD vector unit instructions is enabled

package/lib/sharp.js

@@ -49,11 +49,11 @@ if (sharp) {
     help.push(
       '- Ensure optional dependencies can be installed:',
       '    npm install --include=optional sharp',
-      '  or',
       '    yarn add sharp --ignore-engines',
+      '- Ensure your package manager supports multi-platform installation:',
+      '    See https://sharp.pixelplumbing.com/install#cross-platform',
       '- Add platform-specific dependencies:',
       `    npm install --os=${os} --cpu=${cpu} sharp`,
-      '  or',
       `    npm install --force @img/sharp-${runtimePlatform}`
     );
   } else {
@@ -61,11 +61,10 @@ if (sharp) {
       `- Manually install libvips >= ${minimumLibvipsVersion}`,
       '- Add experimental WebAssembly-based dependencies:',
       '    npm install --cpu=wasm32 sharp',
-      '  or',
       '    npm install --force @img/sharp-wasm32'
     );
   }
-  if (isLinux && /symbol not found/i.test(messages)) {
+  if (isLinux && /(symbol not found|CXXABI_)/i.test(messages)) {
     try {
       const { engines } = require(`@img/sharp-libvips-${runtimePlatform}/package`);
       const libcFound = `${familySync()} ${versionSync()}`;
@@ -103,7 +102,7 @@ if (sharp) {
   }
   help.push(
     '- Consult the installation documentation:',
-    '    https://sharp.pixelplumbing.com/install'
+    '    See https://sharp.pixelplumbing.com/install'
   );
   throw new Error(help.join('\n'));
 }

package/lib/utility.js

@@ -183,17 +183,17 @@ function counters () {
 
 /**
  * Get and set use of SIMD vector unit instructions.
- * Requires libvips to have been compiled with liborc support.
+ * Requires libvips to have been compiled with highway support.
  *
  * Improves the performance of `resize`, `blur` and `sharpen` operations
  * by taking advantage of the SIMD vector unit of the CPU, e.g. Intel SSE and ARM NEON.
  *
  * @example
  * const simd = sharp.simd();
- * // simd is `true` if the runtime use of liborc is currently enabled
+ * // simd is `true` if the runtime use of highway is currently enabled
  * @example
  * const simd = sharp.simd(false);
- * // prevent libvips from using liborc at runtime
+ * // prevent libvips from using highway at runtime
  *
  * @param {boolean} [simd=true]
  * @returns {boolean}
@@ -201,7 +201,6 @@ function counters () {
 function simd (simd) {
   return sharp.simd(is.bool(simd) ? simd : null);
 }
-simd(true);
 
 /**
  * Block libvips operations at runtime.

package/package.json

@@ -1,9 +1,9 @@
 {
   "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.1-rc.0",
+  "version": "0.33.1-rc.3",
   "author": "Lovell Fuller <npm@lovell.info>",
-  "homepage": "https://github.com/lovell/sharp",
+  "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
     "Pierre Inglebert <pierre.inglebert@gmail.com>",
     "Jonathan Ong <jonathanrichardong@gmail.com>",
@@ -141,8 +141,8 @@
     "semver": "^7.5.4"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.33.1-rc.0",
-    "@img/sharp-darwin-x64": "0.33.1-rc.0",
+    "@img/sharp-darwin-arm64": "0.33.1-rc.3",
+    "@img/sharp-darwin-x64": "0.33.1-rc.3",
     "@img/sharp-libvips-darwin-arm64": "1.0.0",
     "@img/sharp-libvips-darwin-x64": "1.0.0",
     "@img/sharp-libvips-linux-arm": "1.0.0",
@@ -151,15 +151,15 @@
     "@img/sharp-libvips-linux-x64": "1.0.0",
     "@img/sharp-libvips-linuxmusl-arm64": "1.0.0",
     "@img/sharp-libvips-linuxmusl-x64": "1.0.0",
-    "@img/sharp-linux-arm": "0.33.1-rc.0",
-    "@img/sharp-linux-arm64": "0.33.1-rc.0",
-    "@img/sharp-linux-s390x": "0.33.1-rc.0",
-    "@img/sharp-linux-x64": "0.33.1-rc.0",
-    "@img/sharp-linuxmusl-arm64": "0.33.1-rc.0",
-    "@img/sharp-linuxmusl-x64": "0.33.1-rc.0",
-    "@img/sharp-wasm32": "0.33.1-rc.0",
-    "@img/sharp-win32-ia32": "0.33.1-rc.0",
-    "@img/sharp-win32-x64": "0.33.1-rc.0"
+    "@img/sharp-linux-arm": "0.33.1-rc.3",
+    "@img/sharp-linux-arm64": "0.33.1-rc.3",
+    "@img/sharp-linux-s390x": "0.33.1-rc.3",
+    "@img/sharp-linux-x64": "0.33.1-rc.3",
+    "@img/sharp-linuxmusl-arm64": "0.33.1-rc.3",
+    "@img/sharp-linuxmusl-x64": "0.33.1-rc.3",
+    "@img/sharp-wasm32": "0.33.1-rc.3",
+    "@img/sharp-win32-ia32": "0.33.1-rc.3",
+    "@img/sharp-win32-x64": "0.33.1-rc.3"
   },
   "devDependencies": {
     "@emnapi/runtime": "^0.44.0",

package/src/pipeline.cc

@@ -794,11 +794,15 @@ class PipelineWorker : public Napi::AsyncWorker {
 
       // Apply output ICC profile
       if (!baton->withIccProfile.empty()) {
-        image = image.icc_transform(const_cast<char*>(baton->withIccProfile.data()), VImage::option()
-          ->set("input_profile", processingProfile)
-          ->set("embedded", TRUE)
-          ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
-          ->set("intent", VIPS_INTENT_PERCEPTUAL));
+        try {
+          image = image.icc_transform(const_cast<char*>(baton->withIccProfile.data()), VImage::option()
+            ->set("input_profile", processingProfile)
+            ->set("embedded", TRUE)
+            ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
+            ->set("intent", VIPS_INTENT_PERCEPTUAL));
+        } catch(...) {
+          sharp::VipsWarningCallback(nullptr, G_LOG_LEVEL_WARNING, "Invalid profile", nullptr);
+        }
       } else if (baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) {
         image = sharp::SetProfile(image, inputProfile);
       }