sharp 0.34.4-rc.4 → 0.34.5-rc.0

package/src/common.h

@@ -1,13 +1,16 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
 #ifndef SRC_COMMON_H_
 #define SRC_COMMON_H_
 
+#include <atomic>
 #include <string>
 #include <tuple>
+#include <utility>
 #include <vector>
-#include <atomic>
 
 #include <napi.h>
 #include <vips/vips8>
@@ -16,8 +19,8 @@
 
 #if (VIPS_MAJOR_VERSION < 8) || \
   (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 17) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 17 && VIPS_MICRO_VERSION < 2)
-#error "libvips version 8.17.2+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 17 && VIPS_MICRO_VERSION < 3)
+#error "libvips version 8.17.3+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if defined(__has_include)
@@ -30,7 +33,7 @@ using vips::VImage;
 
 namespace sharp {
 
-  struct InputDescriptor {  // NOLINT(runtime/indentation_namespace)
+  struct InputDescriptor {
     std::string name;
     std::string file;
     bool autoOrient;

package/src/metadata.cc

@@ -1,15 +1,19 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
+#include <cmath>
 #include <numeric>
+#include <string>
+#include <utility>
 #include <vector>
-#include <cmath>
 
 #include <napi.h>
 #include <vips/vips8>
 
-#include "common.h"
-#include "metadata.h"
+#include "./common.h"
+#include "./metadata.h"
 
 static void* readPNGComment(VipsImage *image, const char *field, GValue *value, void *p);
 
@@ -215,10 +219,10 @@ class MetadataWorker : public Napi::AsyncWorker {
       if (!baton->levels.empty()) {
         int i = 0;
         Napi::Array levels = Napi::Array::New(env, static_cast<size_t>(baton->levels.size()));
-        for (std::pair<int, int> const &l : baton->levels) {
+        for (const auto& [width, height] : baton->levels) {
           Napi::Object level = Napi::Object::New(env);
-          level.Set("width", l.first);
-          level.Set("height", l.second);
+          level.Set("width", width);
+          level.Set("height", height);
           levels.Set(i++, level);
         }
         info.Set("levels", levels);
@@ -275,10 +279,10 @@ class MetadataWorker : public Napi::AsyncWorker {
       if (baton->comments.size() > 0) {
         int i = 0;
         Napi::Array comments = Napi::Array::New(env, baton->comments.size());
-        for (auto &c : baton->comments) {
+        for (const auto& [keyword, text] : baton->comments) {
           Napi::Object comment = Napi::Object::New(env);
-          comment.Set("keyword", c.first);
-          comment.Set("text", c.second);
+          comment.Set("keyword", keyword);
+          comment.Set("text", text);
           comments.Set(i++, comment);
         }
         info.Set("comments", comments);

package/src/metadata.h

@@ -1,10 +1,13 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
 #ifndef SRC_METADATA_H_
 #define SRC_METADATA_H_
 
 #include <string>
+#include <vector>
 #include <napi.h>
 
 #include "./common.h"

package/src/operations.cc

@@ -1,5 +1,7 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
 #include <algorithm>
 #include <functional>
@@ -8,8 +10,8 @@
 #include <vector>
 #include <vips/vips8>
 
-#include "common.h"
-#include "operations.h"
+#include "./common.h"
+#include "./operations.h"
 
 using vips::VImage;
 using vips::VError;

package/src/operations.h

@@ -1,5 +1,7 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
 #ifndef SRC_OPERATIONS_H_
 #define SRC_OPERATIONS_H_
@@ -8,6 +10,7 @@
 #include <functional>
 #include <memory>
 #include <tuple>
+#include <vector>
 #include <vips/vips8>
 
 using vips::VImage;

package/src/pipeline.cc

@@ -1,9 +1,11 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
 #include <algorithm>
 #include <cmath>
-#include <filesystem>
+#include <filesystem>  // NOLINT(build/c++17)
 #include <map>
 #include <memory>
 #include <numeric>
@@ -17,9 +19,9 @@
 #include <vips/vips8>
 #include <napi.h>
 
-#include "common.h"
-#include "operations.h"
-#include "pipeline.h"
+#include "./common.h"
+#include "./operations.h"
+#include "./pipeline.h"
 
 class PipelineWorker : public Napi::AsyncWorker {
  public:
@@ -453,12 +455,10 @@ class PipelineWorker : public Napi::AsyncWorker {
           std::tie(image, background) = sharp::ApplyAlpha(image, baton->resizeBackground, shouldPremultiplyAlpha);
 
           // Embed
-          int left;
-          int top;
-          std::tie(left, top) = sharp::CalculateEmbedPosition(
+          const auto& [left, top] = sharp::CalculateEmbedPosition(
             inputWidth, inputHeight, baton->width, baton->height, baton->position);
-          int width = std::max(inputWidth, baton->width);
-          int height = std::max(inputHeight, baton->height);
+          const int width = std::max(inputWidth, baton->width);
+          const int height = std::max(inputHeight, baton->height);
 
           image = nPages > 1
             ? sharp::EmbedMultiPage(image,
@@ -477,13 +477,10 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Crop
           if (baton->position < 9) {
             // Gravity-based crop
-            int left;
-            int top;
-
-            std::tie(left, top) = sharp::CalculateCrop(
+            const auto& [left, top] = sharp::CalculateCrop(
               inputWidth, inputHeight, baton->width, baton->height, baton->position);
-            int width = std::min(inputWidth, baton->width);
-            int height = std::min(inputHeight, baton->height);
+            const int width = std::min(inputWidth, baton->width);
+            const int height = std::min(inputHeight, baton->height);
 
             image = nPages > 1
               ? sharp::CropMultiPage(image,
@@ -795,20 +792,14 @@ class PipelineWorker : public Napi::AsyncWorker {
         image = sharp::EnsureAlpha(image, baton->ensureAlpha);
       }
 
-      // Convert image to sRGB, if not already
+      // Ensure output colour space
       if (sharp::Is16Bit(image.interpretation())) {
         image = image.cast(VIPS_FORMAT_USHORT);
       }
       if (image.interpretation() != baton->colourspace) {
-        // Convert colourspace, pass the current known interpretation so libvips doesn't have to guess
         image = image.colourspace(baton->colourspace, VImage::option()->set("source_space", image.interpretation()));
-        // Transform colours from embedded profile to output profile
-        if ((baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) && baton->colourspacePipeline != VIPS_INTERPRETATION_CMYK &&
-          baton->withIccProfile.empty() && sharp::HasProfile(image)) {
-          image = image.icc_transform(processingProfile, VImage::option()
-            ->set("embedded", true)
-            ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
-            ->set("intent", VIPS_INTENT_PERCEPTUAL));
+        if (inputProfile.first != nullptr && baton->withIccProfile.empty()) {
+          image = sharp::SetProfile(image, inputProfile);
         }
       }
 
@@ -843,8 +834,6 @@ class PipelineWorker : public Napi::AsyncWorker {
         } catch(...) {
           sharp::VipsWarningCallback(nullptr, G_LOG_LEVEL_WARNING, "Invalid profile", nullptr);
         }
-      } else if (baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) {
-        image = sharp::SetProfile(image, inputProfile);
       }
 
       // Negate the colours in the image
@@ -866,8 +855,8 @@ class PipelineWorker : public Napi::AsyncWorker {
         if (!baton->withExifMerge) {
           image = sharp::RemoveExif(image);
         }
-        for (const auto& s : baton->withExif) {
-          image.set(s.first.data(), s.second.data());
+        for (const auto& [key, value] : baton->withExif) {
+          image.set(key.c_str(), value.c_str());
         }
       }
       // XMP buffer
@@ -1009,6 +998,7 @@ class PipelineWorker : public Napi::AsyncWorker {
             ->set("Q", baton->tiffQuality)
             ->set("bitdepth", baton->tiffBitdepth)
             ->set("compression", baton->tiffCompression)
+            ->set("bigtiff", baton->tiffBigtiff)
             ->set("miniswhite", baton->tiffMiniswhite)
             ->set("predictor", baton->tiffPredictor)
             ->set("pyramid", baton->tiffPyramid)
@@ -1211,6 +1201,7 @@ class PipelineWorker : public Napi::AsyncWorker {
             ->set("Q", baton->tiffQuality)
             ->set("bitdepth", baton->tiffBitdepth)
             ->set("compression", baton->tiffCompression)
+            ->set("bigtiff", baton->tiffBigtiff)
             ->set("miniswhite", baton->tiffMiniswhite)
             ->set("predictor", baton->tiffPredictor)
             ->set("pyramid", baton->tiffPyramid)
@@ -1276,7 +1267,12 @@ class PipelineWorker : public Napi::AsyncWorker {
       if (what && what[0]) {
         (baton->err).append(what);
       } else {
-        (baton->err).append("Unknown error");
+        if (baton->input->failOn == VIPS_FAIL_ON_WARNING) {
+          (baton->err).append("Warning treated as error due to failOn setting");
+          baton->errUseWarning = true;
+        } else {
+          (baton->err).append("Unknown error");
+        }
       }
     }
     // Clean up libvips' per-request data and threads
@@ -1291,7 +1287,11 @@ class PipelineWorker : public Napi::AsyncWorker {
     // Handle warnings
     std::string warning = sharp::VipsWarningPop();
     while (!warning.empty()) {
-      debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) });
+      if (baton->errUseWarning) {
+        (baton->err).append("\n").append(warning);
+      } else {
+        debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) });
+      }
       warning = sharp::VipsWarningPop();
     }
 
@@ -1435,11 +1435,11 @@ class PipelineWorker : public Napi::AsyncWorker {
   std::string
   AssembleSuffixString(std::string extname, std::vector<std::pair<std::string, std::string>> options) {
     std::string argument;
-    for (auto const &option : options) {
+    for (const auto& [key, value] : options) {
       if (!argument.empty()) {
         argument += ",";
       }
-      argument += option.first + "=" + option.second;
+      argument += key + "=" + value;
     }
     return extname + "[" + argument + "]";
   }
@@ -1750,6 +1750,7 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
   baton->gifReuse = sharp::AttrAsBool(options, "gifReuse");
   baton->gifProgressive = sharp::AttrAsBool(options, "gifProgressive");
   baton->tiffQuality = sharp::AttrAsUint32(options, "tiffQuality");
+  baton->tiffBigtiff = sharp::AttrAsBool(options, "tiffBigtiff");
   baton->tiffPyramid = sharp::AttrAsBool(options, "tiffPyramid");
   baton->tiffMiniswhite = sharp::AttrAsBool(options, "tiffMiniswhite");
   baton->tiffBitdepth = sharp::AttrAsUint32(options, "tiffBitdepth");

package/src/pipeline.h

@@ -1,13 +1,15 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
 #ifndef SRC_PIPELINE_H_
 #define SRC_PIPELINE_H_
 
 #include <memory>
 #include <string>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 #include <napi.h>
 #include <vips/vips8>
@@ -175,6 +177,7 @@ struct PipelineBaton {
   bool gifProgressive;
   int tiffQuality;
   VipsForeignTiffCompression tiffCompression;
+  bool tiffBigtiff;
   VipsForeignTiffPredictor tiffPredictor;
   bool tiffPyramid;
   int tiffBitdepth;
@@ -197,6 +200,7 @@ struct PipelineBaton {
   bool jxlLossless;
   VipsBandFormat rawDepth;
   std::string err;
+  bool errUseWarning;
   int keepMetadata;
   int withMetadataOrientation;
   double withMetadataDensity;
@@ -350,6 +354,7 @@ struct PipelineBaton {
     gifProgressive(false),
     tiffQuality(80),
     tiffCompression(VIPS_FOREIGN_TIFF_COMPRESSION_JPEG),
+    tiffBigtiff(false),
     tiffPredictor(VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL),
     tiffPyramid(false),
     tiffBitdepth(8),
@@ -371,6 +376,7 @@ struct PipelineBaton {
     jxlEffort(7),
     jxlLossless(false),
     rawDepth(VIPS_FORMAT_UCHAR),
+    errUseWarning(false),
     keepMetadata(0),
     withMetadataOrientation(-1),
     withMetadataDensity(0.0),

package/src/sharp.cc

@@ -1,16 +1,18 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 
 #include <napi.h>
 #include <vips/vips8>
 
-#include "common.h"
-#include "metadata.h"
-#include "pipeline.h"
-#include "utilities.h"
-#include "stats.h"
+#include "./common.h"
+#include "./metadata.h"
+#include "./pipeline.h"
+#include "./stats.h"
+#include "./utilities.h"
 
 Napi::Object init(Napi::Env env, Napi::Object exports) {
   static std::once_flag sharp_vips_init_once;

package/src/stats.cc

@@ -1,15 +1,18 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
+#include <iostream>
 #include <numeric>
+#include <string>
 #include <vector>
-#include <iostream>
 
 #include <napi.h>
 #include <vips/vips8>
 
-#include "common.h"
-#include "stats.h"
+#include "./common.h"
+#include "./stats.h"
 
 class StatsWorker : public Napi::AsyncWorker {
  public:

package/src/stats.h

@@ -1,10 +1,13 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
 #ifndef SRC_STATS_H_
 #define SRC_STATS_H_
 
 #include <string>
+#include <vector>
 #include <napi.h>
 
 #include "./common.h"
@@ -24,7 +27,7 @@ struct ChannelStats {
 
   ChannelStats(int minVal, int maxVal, double sumVal, double squaresSumVal,
     double meanVal, double stdevVal, int minXVal, int minYVal, int maxXVal, int maxYVal):
-    min(minVal), max(maxVal), sum(sumVal), squaresSum(squaresSumVal),
+    min(minVal), max(maxVal), sum(sumVal), squaresSum(squaresSumVal),  // NOLINT(build/include_what_you_use)
     mean(meanVal), stdev(stdevVal), minX(minXVal), minY(minYVal), maxX(maxXVal), maxY(maxYVal) {}
 };
 

package/src/utilities.cc

@@ -1,17 +1,19 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
 #include <cmath>
-#include <string>
 #include <cstdio>
+#include <string>
 
 #include <napi.h>
 #include <vips/vips8>
 #include <vips/vector.h>
 
-#include "common.h"
-#include "operations.h"
-#include "utilities.h"
+#include "./common.h"
+#include "./operations.h"
+#include "./utilities.h"
 
 /*
   Get and set cache limits

package/src/utilities.h

@@ -1,5 +1,7 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
 
 #ifndef SRC_UTILITIES_H_
 #define SRC_UTILITIES_H_