@revizly/sharp 0.35.0-revizly4 → 0.35.0-revizly41

package/src/pipeline.h

@@ -48,6 +48,8 @@ struct PipelineBaton {
   size_t bufferOutLength;
   int pageHeightOut;
   int pagesOut;
+  bool typedArrayOut;
+  bool hasAlphaOut;
   std::vector<Composite *> composite;
   std::vector<sharp::InputDescriptor *> joinChannelIn;
   int topOffsetPre;
@@ -101,6 +103,7 @@ struct PipelineBaton {
   bool trimLineArt;
   int trimOffsetLeft;
   int trimOffsetTop;
+  int trimMargin;
   std::vector<double> linearA;
   std::vector<double> linearB;
   int dilateWidth;
@@ -167,6 +170,7 @@ struct PipelineBaton {
   int webpEffort;
   bool webpMinSize;
   bool webpMixed;
+  bool webpExact;
   int gifBitdepth;
   int gifEffort;
   double gifDither;
@@ -194,6 +198,8 @@ struct PipelineBaton {
   std::string heifChromaSubsampling;
   bool heifLossless;
   int heifBitdepth;
+  std::string heifTune;
+  std::string heifEncoder;
   double jxlDistance;
   int jxlDecodingTier;
   int jxlEffort;
@@ -208,6 +214,8 @@ struct PipelineBaton {
   std::unordered_map<std::string, std::string> withExif;
   bool withExifMerge;
   std::string withXmp;
+  bool withGainMap;
+  bool keepGainMap;
   int timeoutSeconds;
   std::vector<double> convKernel;
   int convKernelWidth;
@@ -242,6 +250,8 @@ struct PipelineBaton {
     bufferOutLength(0),
     pageHeightOut(0),
     pagesOut(0),
+    typedArrayOut(false),
+    hasAlphaOut(false),
     topOffsetPre(-1),
     topOffsetPost(-1),
     channels(0),
@@ -281,6 +291,7 @@ struct PipelineBaton {
     trimLineArt(false),
     trimOffsetLeft(0),
     trimOffsetTop(0),
+    trimMargin(0),
     linearA{},
     linearB{},
     dilateWidth(0),
@@ -344,6 +355,7 @@ struct PipelineBaton {
     webpEffort(4),
     webpMinSize(false),
     webpMixed(false),
+    webpExact(false),
     gifBitdepth(8),
     gifEffort(7),
     gifDither(1.0),
@@ -357,7 +369,7 @@ struct PipelineBaton {
     tiffBigtiff(false),
     tiffPredictor(VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL),
     tiffPyramid(false),
-    tiffBitdepth(8),
+    tiffBitdepth(0),
     tiffMiniswhite(false),
     tiffTile(false),
     tiffTileHeight(256),
@@ -371,6 +383,7 @@ struct PipelineBaton {
     heifChromaSubsampling("4:4:4"),
     heifLossless(false),
     heifBitdepth(8),
+    heifTune("auto"),
     jxlDistance(1.0),
     jxlDecodingTier(0),
     jxlEffort(7),
@@ -381,6 +394,8 @@ struct PipelineBaton {
     withMetadataOrientation(-1),
     withMetadataDensity(0.0),
     withExifMerge(true),
+    withGainMap(false),
+    keepGainMap(false),
     timeoutSeconds(0),
     convKernelWidth(0),
     convKernelHeight(0),

package/src/stats.cc

@@ -39,7 +39,7 @@ class StatsWorker : public Napi::AsyncWorker {
     sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
     try {
       std::tie(image, imageType) = OpenInput(baton->input);
-    } catch (vips::VError const &err) {
+    } catch (std::runtime_error const &err) {
       (baton->err).append(err.what());
     }
     if (imageType != sharp::ImageType::UNKNOWN) {
@@ -92,7 +92,7 @@ class StatsWorker : public Napi::AsyncWorker {
         baton->dominantRed = dx * 16 + 8;
         baton->dominantGreen = dy * 16 + 8;
         baton->dominantBlue = dz * 16 + 8;
-      } catch (vips::VError const &err) {
+      } catch (std::runtime_error const &err) {
         (baton->err).append(err.what());
       }
     }
@@ -109,10 +109,9 @@ class StatsWorker : public Napi::AsyncWorker {
     // Handle warnings
     std::string warning = sharp::VipsWarningPop();
     while (!warning.empty()) {
-      debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) });
+      debuglog.SHARP_CALLBACK_FN_NAME(Receiver().Value(), { Napi::String::New(env, warning) });
       warning = sharp::VipsWarningPop();
     }
-
     if (baton->err.empty()) {
       // Stats Object
       Napi::Object info = Napi::Object::New(env);
@@ -144,9 +143,10 @@ class StatsWorker : public Napi::AsyncWorker {
       dominant.Set("g", baton->dominantGreen);
       dominant.Set("b", baton->dominantBlue);
       info.Set("dominant", dominant);
-      Callback().Call(Receiver().Value(), { env.Null(), info });
+      Callback().SHARP_CALLBACK_FN_NAME(Receiver().Value(), { env.Null(), info });
     } else {
-      Callback().Call(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
+      Callback().SHARP_CALLBACK_FN_NAME(Receiver().Value(),
+        { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
     }
 
     delete baton->input;

package/src/utilities.cc

@@ -23,15 +23,15 @@ Napi::Value cache(const Napi::CallbackInfo& info) {
 
   // Set memory limit
   if (info[size_t(0)].IsNumber()) {
-    vips_cache_set_max_mem(info[size_t(0)].As<Napi::Number>().Int32Value() * 1048576);
+    vips_cache_set_max_mem(static_cast<size_t>(info[size_t(0)].As<Napi::Number>().Uint32Value()) * 1048576);
   }
   // Set file limit
   if (info[size_t(1)].IsNumber()) {
-    vips_cache_set_max_files(info[size_t(1)].As<Napi::Number>().Int32Value());
+    vips_cache_set_max_files(info[size_t(1)].As<Napi::Number>().Uint32Value());
   }
   // Set items limit
   if (info[size_t(2)].IsNumber()) {
-    vips_cache_set_max(info[size_t(2)].As<Napi::Number>().Int32Value());
+    vips_cache_set_max(info[size_t(2)].As<Napi::Number>().Uint32Value());
   }
 
   // Get memory stats
@@ -123,6 +123,7 @@ Napi::Value format(const Napi::CallbackInfo& info) {
     "jpeg", "png", "webp", "tiff", "magick", "openslide", "dz",
     "ppm", "fits", "gif", "svg", "heif", "pdf", "vips", "jp2k", "jxl", "rad", "dcraw"
   }) {
+    std::string id = f == "jp2k" ? "jp2" : f;
     // Input
     const VipsObjectClass *oc = vips_class_find("VipsOperation", (f + "load").c_str());
     Napi::Boolean hasInputFile = Napi::Boolean::New(env, oc);
@@ -154,11 +155,11 @@ Napi::Value format(const Napi::CallbackInfo& info) {
     output.Set("stream", hasOutputBuffer);
     // Other attributes
     Napi::Object container = Napi::Object::New(env);
-    container.Set("id", f);
+    container.Set("id", id);
     container.Set("input", input);
     container.Set("output", output);
     // Add to set of formats
-    format.Set(f, container);
+    format.Set(id, container);
   }
 
   // Raw, uncompressed data
@@ -243,7 +244,7 @@ Napi::Value _maxColourDistance(const Napi::CallbackInfo& info) {
     }
     // Calculate colour distance
     maxColourDistance = image1.dE00(image2).max();
-  } catch (vips::VError const &err) {
+  } catch (std::runtime_error const &err) {
     throw Napi::Error::New(env, err.what());
   }
 

package/install/check.js

@@ -1,14 +0,0 @@
-/*!
-  Copyright 2013 Lovell Fuller and others.
-  SPDX-License-Identifier: Apache-2.0
-*/
-
-try {
-  const { useGlobalLibvips } = require('../lib/libvips');
-  if (useGlobalLibvips() || process.env.npm_config_build_from_source) {
-    process.exit(1);
-  }
-} catch (err) {
-  const summary = err.message.split(/\n/).slice(0, 1);
-  console.log(`sharp: skipping install check: ${summary}`);
-}

package/lib/index.js

@@ -1,16 +0,0 @@
-/*!
-  Copyright 2013 Lovell Fuller and others.
-  SPDX-License-Identifier: Apache-2.0
-*/
-
-const Sharp = require('./constructor');
-require('./input')(Sharp);
-require('./resize')(Sharp);
-require('./composite')(Sharp);
-require('./operation')(Sharp);
-require('./colour')(Sharp);
-require('./channel')(Sharp);
-require('./output')(Sharp);
-require('./utility')(Sharp);
-
-module.exports = Sharp;

package/lib/sharp.js

@@ -1,121 +0,0 @@
-/*!
-  Copyright 2013 Lovell Fuller and others.
-  SPDX-License-Identifier: Apache-2.0
-*/
-
-// Inspects the runtime environment and exports the relevant sharp.node binary
-
-const { familySync, versionSync } = require('detect-libc');
-
-const { runtimePlatformArch, isUnsupportedNodeRuntime, prebuiltPlatforms, minimumLibvipsVersion } = require('./libvips');
-const runtimePlatform = runtimePlatformArch();
-
-const paths = [
-  `../src/build/Release/sharp-${runtimePlatform}.node`,
-  '../src/build/Release/sharp-wasm32.node',
-  `@revizly/sharp-${runtimePlatform}/sharp.node`,
-  '@revizly/sharp-wasm32/sharp.node'
-];
-
-/* node:coverage disable */
-
-let path, sharp;
-const errors = [];
-for (path of paths) {
-  try {
-    sharp = require(path);
-    break;
-  } catch (err) {
-    errors.push(err);
-  }
-}
-
-if (sharp && path.startsWith('@img/sharp-linux-x64') && !sharp._isUsingX64V2()) {
-  const err = new Error('Prebuilt binaries for linux-x64 require v2 microarchitecture');
-  err.code = 'Unsupported CPU';
-  errors.push(err);
-  sharp = null;
-}
-
-if (sharp) {
-  module.exports = sharp;
-} else {
-  const [isLinux, isMacOs, isWindows] = ['linux', 'darwin', 'win32'].map(os => runtimePlatform.startsWith(os));
-
-  const help = [`Could not load the "sharp" module using the ${runtimePlatform} runtime`];
-  errors.forEach(err => {
-    if (err.code !== 'MODULE_NOT_FOUND') {
-      help.push(`${err.code}: ${err.message}`);
-    }
-  });
-  const messages = errors.map(err => err.message).join(' ');
-  help.push('Possible solutions:');
-  // Common error messages
-  if (isUnsupportedNodeRuntime()) {
-    const { found, expected } = isUnsupportedNodeRuntime();
-    help.push(
-      '- Please upgrade Node.js:',
-      `    Found ${found}`,
-      `    Requires ${expected}`
-    );
-  } else if (prebuiltPlatforms.includes(runtimePlatform)) {
-    const [os, cpu] = runtimePlatform.split('-');
-    const libc = os.endsWith('musl') ? ' --libc=musl' : '';
-    help.push(
-      '- Ensure optional dependencies can be installed:',
-      '    npm install --include=optional sharp',
-      '- Ensure your package manager supports multi-platform installation:',
-      '    See https://sharp.pixelplumbing.com/install#cross-platform',
-      '- Add platform-specific dependencies:',
-      `    npm install --os=${os.replace('musl', '')}${libc} --cpu=${cpu} @revizly/sharp`
-    );
-  } else {
-    help.push(
-      `- Manually install libvips >= ${minimumLibvipsVersion}`,
-      '- Add experimental WebAssembly-based dependencies:',
-      '    npm install --cpu=wasm32 sharp',
-      '    npm install @revizly/sharp-wasm32'
-    );
-  }
-  if (isLinux && /(symbol not found|CXXABI_)/i.test(messages)) {
-    try {
-      const { config } = require(`@revizly/sharp-libvips-${runtimePlatform}/package`);
-      const libcFound = `${familySync()} ${versionSync()}`;
-      const libcRequires = `${config.musl ? 'musl' : 'glibc'} ${config.musl || config.glibc}`;
-      help.push(
-        '- Update your OS:',
-        `    Found ${libcFound}`,
-        `    Requires ${libcRequires}`
-      );
-    } catch (_errEngines) {}
-  }
-  if (isLinux && /\/snap\/core[0-9]{2}/.test(messages)) {
-    help.push(
-      '- Remove the Node.js Snap, which does not support native modules',
-      '    snap remove node'
-    );
-  }
-  if (isMacOs && /Incompatible library version/.test(messages)) {
-    help.push(
-      '- Update Homebrew:',
-      '    brew update && brew upgrade vips'
-    );
-  }
-  if (errors.some(err => err.code === 'ERR_DLOPEN_DISABLED')) {
-    help.push('- Run Node.js without using the --no-addons flag');
-  }
-  // Link to installation docs
-  if (isWindows && /The specified procedure could not be found/.test(messages)) {
-    help.push(
-      '- Using the canvas package on Windows?',
-      '    See https://sharp.pixelplumbing.com/install#canvas-and-windows',
-      '- Check for outdated versions of sharp in the dependency tree:',
-      '    npm ls sharp'
-    );
-  }
-  help.push(
-    '- Consult the installation documentation:',
-    '    See https://sharp.pixelplumbing.com/install'
-  );
-  throw new Error(help.join('\n'));
-}