sharp 0.35.2 → 0.35.3-rc.2

package/src/pipeline.cc

@@ -608,38 +608,25 @@ class PipelineWorker : public Napi::AsyncWorker {
         baton->width = image.width() + baton->extendLeft + baton->extendRight;
         baton->height = (nPages > 1 ? targetPageHeight : image.height()) + baton->extendTop + baton->extendBottom;
 
+        std::vector<double> background;
         if (baton->extendWith == VIPS_EXTEND_BACKGROUND) {
-          std::vector<double> background;
           std::tie(image, background) = sharp::ApplyAlpha(image, baton->extendBackground, shouldPremultiplyAlpha);
-
-          image = sharp::StaySequential(image, nPages > 1);
-          image = nPages > 1
-            ? sharp::EmbedMultiPage(image,
-                baton->extendLeft, baton->extendTop, baton->width, baton->height,
-                baton->extendWith, background, nPages, &targetPageHeight)
-            : image.embed(baton->extendLeft, baton->extendTop, baton->width, baton->height,
-                VImage::option()->set("extend", baton->extendWith)->set("background", background));
-          if (baton->keepGainMap) {
-            gainMap = gainMap.embed(baton->extendLeft / gainMapScaleFactor, baton->extendTop / gainMapScaleFactor,
-              baton->width / gainMapScaleFactor, baton->height / gainMapScaleFactor, VImage::option()
-                ->set("extend", baton->extendWith)
-                ->set("background", 0));
-          }
-        } else {
-          std::vector<double> ignoredBackground(1);
-          image = sharp::StaySequential(image);
-          image = nPages > 1
-            ? sharp::EmbedMultiPage(image,
-                baton->extendLeft, baton->extendTop, baton->width, baton->height,
-                baton->extendWith, ignoredBackground, nPages, &targetPageHeight)
-            : image.embed(baton->extendLeft, baton->extendTop, baton->width, baton->height,
-                VImage::option()->set("extend", baton->extendWith));
-          if (baton->keepGainMap) {
-            gainMap = gainMap.embed(baton->extendLeft / gainMapScaleFactor, baton->extendTop / gainMapScaleFactor,
-              baton->width / gainMapScaleFactor, baton->height / gainMapScaleFactor, VImage::option()
-                ->set("extend", baton->extendWith)
-                ->set("background", 0));
-          }
+        }
+        image = sharp::StaySequential(image, nPages > 1 || baton->extendWith != VIPS_EXTEND_BACKGROUND);
+        auto options = VImage::option()->set("extend", baton->extendWith);
+        if (baton->extendWith == VIPS_EXTEND_BACKGROUND) {
+          options->set("background", background);
+        }
+        image = nPages > 1
+          ? sharp::EmbedMultiPage(image,
+              baton->extendLeft, baton->extendTop, baton->width, baton->height,
+              baton->extendWith, background, nPages, &targetPageHeight)
+          : image.embed(baton->extendLeft, baton->extendTop, baton->width, baton->height, options);
+        if (baton->keepGainMap) {
+          gainMap = gainMap.embed(baton->extendLeft / gainMapScaleFactor, baton->extendTop / gainMapScaleFactor,
+            baton->width / gainMapScaleFactor, baton->height / gainMapScaleFactor, VImage::option()
+              ->set("extend", baton->extendWith)
+              ->set("background", 0));
         }
       }
       // Median - must happen before blurring, due to the utility of blurring after thresholding
@@ -957,6 +944,7 @@ class PipelineWorker : public Napi::AsyncWorker {
         baton->pageHeightOut = image.get_int(VIPS_META_PAGE_HEIGHT);
         baton->pagesOut = image.get_int(VIPS_META_N_PAGES);
       }
+      baton->hasAlphaOut = image.has_alpha();
 
       // Output
       sharp::SetTimeout(image, baton->timeoutSeconds);
@@ -996,6 +984,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           } else {
             baton->channels = std::min(baton->channels, 3);
           }
+          baton->hasAlphaOut = false;
         } else if (baton->formatOut == "jp2" || (baton->formatOut == "input"
           && inputImageType == sharp::ImageType::JP2)) {
           // Write JP2 to Buffer
@@ -1078,6 +1067,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (baton->tiffCompression == VIPS_FOREIGN_TIFF_COMPRESSION_JPEG) {
             sharp::AssertImageTypeDimensions(image, sharp::ImageType::JPEG);
             baton->channels = std::min(baton->channels, 3);
+            baton->hasAlphaOut = false;
           }
           // Cast pixel values to float, if required
           if (baton->tiffPredictor == VIPS_FOREIGN_TIFF_PREDICTOR_FLOAT) {
@@ -1137,6 +1127,9 @@ class PipelineWorker : public Napi::AsyncWorker {
           area->free_fn = nullptr;
           vips_area_unref(area);
           baton->formatOut = "dz";
+          if (baton->tileFormat == "jpeg") {
+            baton->hasAlphaOut = false;
+          }
         } else if (baton->formatOut == "jxl" ||
           (baton->formatOut == "input" && inputImageType == sharp::ImageType::JXL)) {
           // Write JXL to buffer
@@ -1224,6 +1217,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           }
           baton->formatOut = "jpeg";
           baton->channels = std::min(baton->channels, 3);
+          baton->hasAlphaOut = false;
         } else if (baton->formatOut == "jp2" || (mightMatchInput && isJp2) ||
           (willMatchInput && (inputImageType == sharp::ImageType::JP2))) {
           // Write JP2 to file
@@ -1290,6 +1284,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (baton->tiffCompression == VIPS_FOREIGN_TIFF_COMPRESSION_JPEG) {
             sharp::AssertImageTypeDimensions(image, sharp::ImageType::JPEG);
             baton->channels = std::min(baton->channels, 3);
+            baton->hasAlphaOut = false;
           }
           // Cast pixel values to float, if required
           if (baton->tiffPredictor == VIPS_FOREIGN_TIFF_PREDICTOR_FLOAT) {
@@ -1350,6 +1345,9 @@ class PipelineWorker : public Napi::AsyncWorker {
           vips::VOption *options = BuildOptionsDZ(baton);
           image.dzsave(const_cast<char*>(baton->fileOut.data()), options);
           baton->formatOut = "dz";
+          if (baton->tileFormat == "jpeg") {
+            baton->hasAlphaOut = false;
+          }
         } else if (baton->formatOut == "v" || (mightMatchInput && isV) ||
           (willMatchInput && inputImageType == sharp::ImageType::VIPS)) {
           // Write V to file
@@ -1434,6 +1432,7 @@ class PipelineWorker : public Napi::AsyncWorker {
         info.Set("pageHeight", static_cast<int32_t>(baton->pageHeightOut));
         info.Set("pages", static_cast<int32_t>(baton->pagesOut));
       }
+      info.Set("hasAlpha", baton->hasAlphaOut);
 
       if (baton->bufferOutLength > 0) {
         info.Set("size", static_cast<uint32_t>(baton->bufferOutLength));

package/src/pipeline.h

@@ -49,6 +49,7 @@ struct PipelineBaton {
   int pageHeightOut;
   int pagesOut;
   bool typedArrayOut;
+  bool hasAlphaOut;
   std::vector<Composite *> composite;
   std::vector<sharp::InputDescriptor *> joinChannelIn;
   int topOffsetPre;
@@ -249,6 +250,7 @@ struct PipelineBaton {
     pageHeightOut(0),
     pagesOut(0),
     typedArrayOut(false),
+    hasAlphaOut(false),
     topOffsetPre(-1),
     topOffsetPost(-1),
     channels(0),

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