sharp 0.32.6 → 0.33.4

package/src/pipeline.h

@@ -69,8 +69,7 @@ struct PipelineBaton {
   bool premultiplied;
   bool tileCentre;
   bool fastShrinkOnLoad;
-  double tintA;
-  double tintB;
+  std::vector<double> tint;
   bool flatten;
   std::vector<double> flattenBackground;
   bool unflatten;
@@ -92,6 +91,7 @@ struct PipelineBaton {
   bool thresholdGrayscale;
   std::vector<double> trimBackground;
   double trimThreshold;
+  bool trimLineArt;
   int trimOffsetLeft;
   int trimOffsetTop;
   std::vector<double> linearA;
@@ -169,6 +169,7 @@ struct PipelineBaton {
   VipsForeignTiffPredictor tiffPredictor;
   bool tiffPyramid;
   int tiffBitdepth;
+  bool tiffMiniswhite;
   bool tiffTile;
   int tiffTileHeight;
   int tiffTileWidth;
@@ -180,17 +181,19 @@ struct PipelineBaton {
   int heifEffort;
   std::string heifChromaSubsampling;
   bool heifLossless;
+  int heifBitdepth;
   double jxlDistance;
   int jxlDecodingTier;
   int jxlEffort;
   bool jxlLossless;
   VipsBandFormat rawDepth;
   std::string err;
-  bool withMetadata;
+  int keepMetadata;
   int withMetadataOrientation;
   double withMetadataDensity;
-  std::string withMetadataIcc;
-  std::unordered_map<std::string, std::string> withMetadataStrs;
+  std::string withIccProfile;
+  std::unordered_map<std::string, std::string> withExif;
+  bool withExifMerge;
   int timeoutSeconds;
   std::unique_ptr<double[]> convKernel;
   int convKernelWidth;
@@ -203,7 +206,7 @@ struct PipelineBaton {
   int extractChannel;
   bool removeAlpha;
   double ensureAlpha;
-  VipsInterpretation colourspaceInput;
+  VipsInterpretation colourspacePipeline;
   VipsInterpretation colourspace;
   std::vector<int> delay;
   int loop;
@@ -237,8 +240,7 @@ struct PipelineBaton {
     attentionX(0),
     attentionY(0),
     premultiplied(false),
-    tintA(128.0),
-    tintB(128.0),
+    tint{ -1.0, 0.0, 0.0, 0.0 },
     flatten(false),
     flattenBackground{ 0.0, 0.0, 0.0 },
     unflatten(false),
@@ -259,7 +261,8 @@ struct PipelineBaton {
     threshold(0),
     thresholdGrayscale(true),
     trimBackground{},
-    trimThreshold(0.0),
+    trimThreshold(-1.0),
+    trimLineArt(false),
     trimOffsetLeft(0),
     trimOffsetTop(0),
     linearA{},
@@ -335,6 +338,7 @@ struct PipelineBaton {
     tiffPredictor(VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL),
     tiffPyramid(false),
     tiffBitdepth(8),
+    tiffMiniswhite(false),
     tiffTile(false),
     tiffTileHeight(256),
     tiffTileWidth(256),
@@ -346,14 +350,16 @@ struct PipelineBaton {
     heifEffort(4),
     heifChromaSubsampling("4:4:4"),
     heifLossless(false),
+    heifBitdepth(8),
     jxlDistance(1.0),
     jxlDecodingTier(0),
     jxlEffort(7),
     jxlLossless(false),
     rawDepth(VIPS_FORMAT_UCHAR),
-    withMetadata(false),
+    keepMetadata(0),
     withMetadataOrientation(-1),
     withMetadataDensity(0.0),
+    withExifMerge(true),
     timeoutSeconds(0),
     convKernelWidth(0),
     convKernelHeight(0),
@@ -365,7 +371,7 @@ struct PipelineBaton {
     extractChannel(-1),
     removeAlpha(false),
     ensureAlpha(-1.0),
-    colourspaceInput(VIPS_INTERPRETATION_LAST),
+    colourspacePipeline(VIPS_INTERPRETATION_LAST),
     colourspace(VIPS_INTERPRETATION_LAST),
     loop(-1),
     tileSize(256),

package/src/sharp.cc

@@ -1,6 +1,8 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
+#include <mutex>  // NOLINT(build/c++11)
+
 #include <napi.h>
 #include <vips/vips8>
 
@@ -10,14 +12,11 @@
 #include "utilities.h"
 #include "stats.h"
 
-static void* sharp_vips_init(void*) {
-  vips_init("sharp");
-  return nullptr;
-}
-
 Napi::Object init(Napi::Env env, Napi::Object exports) {
-  static GOnce sharp_vips_init_once = G_ONCE_INIT;
-  g_once(&sharp_vips_init_once, static_cast<GThreadFunc>(sharp_vips_init), nullptr);
+  static std::once_flag sharp_vips_init_once;
+  std::call_once(sharp_vips_init_once, []() {
+    vips_init("sharp");
+  });
 
   g_log_set_handler("VIPS", static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING),
     static_cast<GLogFunc>(sharp::VipsWarningCallback), nullptr);

package/src/stats.cc

@@ -30,7 +30,7 @@ class StatsWorker : public Napi::AsyncWorker {
 
   void Execute() {
     // Decrement queued task counter
-    g_atomic_int_dec_and_test(&sharp::counterQueue);
+    sharp::counterQueue--;
 
     vips::VImage image;
     sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
@@ -106,7 +106,7 @@ class StatsWorker : public Napi::AsyncWorker {
     // Handle warnings
     std::string warning = sharp::VipsWarningPop();
     while (!warning.empty()) {
-      debuglog.MakeCallback(Receiver().Value(), { Napi::String::New(env, warning) });
+      debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) });
       warning = sharp::VipsWarningPop();
     }
 
@@ -141,9 +141,9 @@ class StatsWorker : public Napi::AsyncWorker {
       dominant.Set("g", baton->dominantGreen);
       dominant.Set("b", baton->dominantBlue);
       info.Set("dominant", dominant);
-      Callback().MakeCallback(Receiver().Value(), { env.Null(), info });
+      Callback().Call(Receiver().Value(), { env.Null(), info });
     } else {
-      Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
+      Callback().Call(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
     }
 
     delete baton->input;
@@ -177,7 +177,7 @@ Napi::Value stats(const Napi::CallbackInfo& info) {
   worker->Queue();
 
   // Increment queued task counter
-  g_atomic_int_inc(&sharp::counterQueue);
+  sharp::counterQueue++;
 
   return info.Env().Undefined();
 }

package/src/utilities.cc

@@ -3,6 +3,7 @@
 
 #include <cmath>
 #include <string>
+#include <cstdio>
 
 #include <napi.h>
 #include <vips/vips8>
@@ -70,8 +71,8 @@ Napi::Value concurrency(const Napi::CallbackInfo& info) {
 */
 Napi::Value counters(const Napi::CallbackInfo& info) {
   Napi::Object counters = Napi::Object::New(info.Env());
-  counters.Set("queue", sharp::counterQueue);
-  counters.Set("process", sharp::counterProcess);
+  counters.Set("queue", static_cast<int>(sharp::counterQueue));
+  counters.Set("process", static_cast<int>(sharp::counterProcess));
   return counters;
 }
 
@@ -91,9 +92,23 @@ Napi::Value simd(const Napi::CallbackInfo& info) {
   Get libvips version
 */
 Napi::Value libvipsVersion(const Napi::CallbackInfo& info) {
-  char version[9];
-  g_snprintf(version, sizeof(version), "%d.%d.%d", vips_version(0), vips_version(1), vips_version(2));
-  return Napi::String::New(info.Env(), version);
+  Napi::Env env = info.Env();
+  Napi::Object version = Napi::Object::New(env);
+
+  char semver[9];
+  std::snprintf(semver, sizeof(semver), "%d.%d.%d", vips_version(0), vips_version(1), vips_version(2));
+  version.Set("semver", Napi::String::New(env, semver));
+#ifdef SHARP_USE_GLOBAL_LIBVIPS
+  version.Set("isGlobal", Napi::Boolean::New(env, true));
+#else
+  version.Set("isGlobal", Napi::Boolean::New(env, false));
+#endif
+#ifdef __EMSCRIPTEN__
+  version.Set("isWasm", Napi::Boolean::New(env, true));
+#else
+  version.Set("isWasm", Napi::Boolean::New(env, false));
+#endif
+  return version;
 }
 
 /*

package/install/can-compile.js

@@ -1,14 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const libvips = require('../lib/libvips');
-
-try {
-  if (!(libvips.useGlobalLibvips() || libvips.hasVendoredLibvips())) {
-    process.exitCode = 1;
-  }
-} catch (err) {
-  process.exitCode = 1;
-}

package/install/dll-copy.js

@@ -1,40 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-const libvips = require('../lib/libvips');
-const platform = require('../lib/platform');
-
-const minimumLibvipsVersion = libvips.minimumLibvipsVersion;
-
-const platformAndArch = platform();
-
-if (platformAndArch.startsWith('win32')) {
-  const buildReleaseDir = path.join(__dirname, '..', 'build', 'Release');
-  libvips.log(`Creating ${buildReleaseDir}`);
-  try {
-    libvips.mkdirSync(buildReleaseDir);
-  } catch (err) {}
-  const vendorLibDir = path.join(__dirname, '..', 'vendor', minimumLibvipsVersion, platformAndArch, 'lib');
-  libvips.log(`Copying DLLs from ${vendorLibDir} to ${buildReleaseDir}`);
-  try {
-    fs
-      .readdirSync(vendorLibDir)
-      .filter(function (filename) {
-        return /\.dll$/.test(filename);
-      })
-      .forEach(function (filename) {
-        fs.copyFileSync(
-          path.join(vendorLibDir, filename),
-          path.join(buildReleaseDir, filename)
-        );
-      });
-  } catch (err) {
-    libvips.log(err);
-    process.exit(1);
-  }
-}

package/install/libvips.js

@@ -1,222 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const stream = require('stream');
-const zlib = require('zlib');
-const { createHash } = require('crypto');
-
-const detectLibc = require('detect-libc');
-const semverCoerce = require('semver/functions/coerce');
-const semverLessThan = require('semver/functions/lt');
-const semverSatisfies = require('semver/functions/satisfies');
-const simpleGet = require('simple-get');
-const tarFs = require('tar-fs');
-
-const agent = require('../lib/agent');
-const libvips = require('../lib/libvips');
-const platform = require('../lib/platform');
-
-const minimumGlibcVersionByArch = {
-  arm: '2.28',
-  arm64: '2.17',
-  x64: '2.17'
-};
-
-const hasSharpPrebuild = [
-  'darwin-x64',
-  'darwin-arm64',
-  'linux-arm64',
-  'linux-x64',
-  'linuxmusl-x64',
-  'linuxmusl-arm64',
-  'win32-ia32',
-  'win32-x64'
-];
-
-const { minimumLibvipsVersion, minimumLibvipsVersionLabelled } = libvips;
-const localLibvipsDir = process.env.npm_config_sharp_libvips_local_prebuilds || '';
-const distHost = process.env.npm_config_sharp_libvips_binary_host || 'https://github.com/lovell/sharp-libvips/releases/download';
-const distBaseUrl = process.env.npm_config_sharp_dist_base_url || process.env.SHARP_DIST_BASE_URL || `${distHost}/v${minimumLibvipsVersionLabelled}/`;
-const installationForced = !!(process.env.npm_config_sharp_install_force || process.env.SHARP_INSTALL_FORCE);
-
-const fail = function (err) {
-  libvips.log(err);
-  if (err.code === 'EACCES') {
-    libvips.log('Are you trying to install as a root or sudo user?');
-    libvips.log('- For npm <= v6, try again with the "--unsafe-perm" flag');
-    libvips.log('- For npm >= v8, the user must own the directory "npm install" is run in');
-  }
-  libvips.log('Please see https://sharp.pixelplumbing.com/install for required dependencies');
-  process.exit(1);
-};
-
-const handleError = function (err) {
-  if (installationForced) {
-    libvips.log(`Installation warning: ${err.message}`);
-  } else {
-    throw err;
-  }
-};
-
-const verifyIntegrity = function (platformAndArch) {
-  const expected = libvips.integrity(platformAndArch);
-  if (installationForced || !expected) {
-    libvips.log(`Integrity check skipped for ${platformAndArch}`);
-    return new stream.PassThrough();
-  }
-  const hash = createHash('sha512');
-  return new stream.Transform({
-    transform: function (chunk, _encoding, done) {
-      hash.update(chunk);
-      done(null, chunk);
-    },
-    flush: function (done) {
-      const digest = `sha512-${hash.digest('base64')}`;
-      if (expected !== digest) {
-        try {
-          libvips.removeVendoredLibvips();
-        } catch (err) {
-          libvips.log(err.message);
-        }
-        libvips.log(`Integrity expected: ${expected}`);
-        libvips.log(`Integrity received: ${digest}`);
-        done(new Error(`Integrity check failed for ${platformAndArch}`));
-      } else {
-        libvips.log(`Integrity check passed for ${platformAndArch}`);
-        done();
-      }
-    }
-  });
-};
-
-const extractTarball = function (tarPath, platformAndArch) {
-  const versionedVendorPath = path.join(__dirname, '..', 'vendor', minimumLibvipsVersion, platformAndArch);
-  libvips.mkdirSync(versionedVendorPath);
-
-  const ignoreVendorInclude = hasSharpPrebuild.includes(platformAndArch) && !process.env.npm_config_build_from_source;
-  const ignore = function (name) {
-    return ignoreVendorInclude && name.includes('include/');
-  };
-
-  stream.pipeline(
-    fs.createReadStream(tarPath),
-    verifyIntegrity(platformAndArch),
-    new zlib.BrotliDecompress(),
-    tarFs.extract(versionedVendorPath, { ignore }),
-    function (err) {
-      if (err) {
-        if (/unexpected end of file/.test(err.message)) {
-          fail(new Error(`Please delete ${tarPath} as it is not a valid tarball`));
-        }
-        fail(err);
-      }
-    }
-  );
-};
-
-try {
-  const useGlobalLibvips = libvips.useGlobalLibvips();
-
-  if (useGlobalLibvips) {
-    const globalLibvipsVersion = libvips.globalLibvipsVersion();
-    libvips.log(`Detected globally-installed libvips v${globalLibvipsVersion}`);
-    libvips.log('Building from source via node-gyp');
-    process.exit(1);
-  } else if (libvips.hasVendoredLibvips()) {
-    libvips.log(`Using existing vendored libvips v${minimumLibvipsVersion}`);
-  } else {
-    // Is this arch/platform supported?
-    const arch = process.env.npm_config_arch || process.arch;
-    const platformAndArch = platform();
-    if (arch === 'ia32' && !platformAndArch.startsWith('win32')) {
-      throw new Error(`Intel Architecture 32-bit systems require manual installation of libvips >= ${minimumLibvipsVersion}`);
-    }
-    if (platformAndArch === 'freebsd-x64' || platformAndArch === 'openbsd-x64' || platformAndArch === 'sunos-x64') {
-      throw new Error(`BSD/SunOS systems require manual installation of libvips >= ${minimumLibvipsVersion}`);
-    }
-    // Linux libc version check
-    const libcVersionRaw = detectLibc.versionSync();
-    if (libcVersionRaw) {
-      const libcFamily = detectLibc.familySync();
-      const libcVersion = semverCoerce(libcVersionRaw).version;
-      if (libcFamily === detectLibc.GLIBC && minimumGlibcVersionByArch[arch]) {
-        if (semverLessThan(libcVersion, semverCoerce(minimumGlibcVersionByArch[arch]).version)) {
-          handleError(new Error(`Use with glibc ${libcVersionRaw} requires manual installation of libvips >= ${minimumLibvipsVersion}`));
-        }
-      }
-      if (libcFamily === detectLibc.MUSL) {
-        if (semverLessThan(libcVersion, '1.1.24')) {
-          handleError(new Error(`Use with musl ${libcVersionRaw} requires manual installation of libvips >= ${minimumLibvipsVersion}`));
-        }
-      }
-    }
-    // Node.js minimum version check
-    const supportedNodeVersion = process.env.npm_package_engines_node || require('../package.json').engines.node;
-    if (!semverSatisfies(process.versions.node, supportedNodeVersion)) {
-      handleError(new Error(`Expected Node.js version ${supportedNodeVersion} but found ${process.versions.node}`));
-    }
-    // Download to per-process temporary file
-    const tarFilename = ['libvips', minimumLibvipsVersionLabelled, platformAndArch].join('-') + '.tar.br';
-    const tarPathCache = path.join(libvips.cachePath(), tarFilename);
-    if (fs.existsSync(tarPathCache)) {
-      libvips.log(`Using cached ${tarPathCache}`);
-      extractTarball(tarPathCache, platformAndArch);
-    } else if (localLibvipsDir) {
-      // If localLibvipsDir is given try to use binaries from local directory
-      const tarPathLocal = path.join(path.resolve(localLibvipsDir), `v${minimumLibvipsVersionLabelled}`, tarFilename);
-      libvips.log(`Using local libvips from ${tarPathLocal}`);
-      extractTarball(tarPathLocal, platformAndArch);
-    } else {
-      const url = distBaseUrl + tarFilename;
-      libvips.log(`Downloading ${url}`);
-      simpleGet({ url: url, agent: agent(libvips.log) }, function (err, response) {
-        if (err) {
-          fail(err);
-        } else if (response.statusCode === 404) {
-          fail(new Error(`Prebuilt libvips ${minimumLibvipsVersion} binaries are not yet available for ${platformAndArch}`));
-        } else if (response.statusCode !== 200) {
-          fail(new Error(`Status ${response.statusCode} ${response.statusMessage}`));
-        } else {
-          const tarPathTemp = path.join(os.tmpdir(), `${process.pid}-${tarFilename}`);
-          const tmpFileStream = fs.createWriteStream(tarPathTemp);
-          response
-            .on('error', function (err) {
-              tmpFileStream.destroy(err);
-            })
-            .on('close', function () {
-              if (!response.complete) {
-                tmpFileStream.destroy(new Error('Download incomplete (connection was terminated)'));
-              }
-            })
-            .pipe(tmpFileStream);
-          tmpFileStream
-            .on('error', function (err) {
-              // Clean up temporary file
-              try {
-                fs.unlinkSync(tarPathTemp);
-              } catch (e) {}
-              fail(err);
-            })
-            .on('close', function () {
-              try {
-                // Attempt to rename
-                fs.renameSync(tarPathTemp, tarPathCache);
-              } catch (err) {
-                // Fall back to copy and unlink
-                fs.copyFileSync(tarPathTemp, tarPathCache);
-                fs.unlinkSync(tarPathTemp);
-              }
-              extractTarball(tarPathCache, platformAndArch);
-            });
-        }
-      });
-    }
-  }
-} catch (err) {
-  fail(err);
-}

package/lib/agent.js

@@ -1,44 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const url = require('url');
-const tunnelAgent = require('tunnel-agent');
-
-const is = require('./is');
-
-const proxies = [
-  'HTTPS_PROXY',
-  'https_proxy',
-  'HTTP_PROXY',
-  'http_proxy',
-  'npm_config_https_proxy',
-  'npm_config_proxy'
-];
-
-function env (key) {
-  return process.env[key];
-}
-
-module.exports = function (log) {
-  try {
-    const proxy = new url.URL(proxies.map(env).find(is.string));
-    const tunnel = proxy.protocol === 'https:'
-      ? tunnelAgent.httpsOverHttps
-      : tunnelAgent.httpsOverHttp;
-    const proxyAuth = proxy.username && proxy.password
-      ? `${decodeURIComponent(proxy.username)}:${decodeURIComponent(proxy.password)}`
-      : null;
-    log(`Via proxy ${proxy.protocol}//${proxy.hostname}:${proxy.port} ${proxyAuth ? 'with' : 'no'} credentials`);
-    return tunnel({
-      proxy: {
-        port: Number(proxy.port),
-        host: proxy.hostname,
-        proxyAuth
-      }
-    });
-  } catch (err) {
-    return null;
-  }
-};

package/lib/platform.js

@@ -1,30 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const detectLibc = require('detect-libc');
-
-const env = process.env;
-
-module.exports = function () {
-  const arch = env.npm_config_arch || process.arch;
-  const platform = env.npm_config_platform || process.platform;
-  const libc = process.env.npm_config_libc ||
-    /* istanbul ignore next */
-    (detectLibc.isNonGlibcLinuxSync() ? detectLibc.familySync() : '');
-  const libcId = platform !== 'linux' || libc === detectLibc.GLIBC ? '' : libc;
-
-  const platformId = [`${platform}${libcId}`];
-
-  if (arch === 'arm') {
-    const fallback = process.versions.electron ? '7' : '6';
-    platformId.push(`armv${env.npm_config_arm_version || process.config.variables.arm_version || fallback}`);
-  } else if (arch === 'arm64') {
-    platformId.push(`arm64v${env.npm_config_arm_version || '8'}`);
-  } else {
-    platformId.push(arch);
-  }
-
-  return platformId.join('-');
-};