Prerelease 0.33.0-alpha.2

docs/api-resize.md

@@ -214,7 +214,7 @@ Extract/crop a region of the image.
 
 - Use `extract` before `resize` for pre-resize extraction.
 - Use `extract` after `resize` for post-resize extraction.
-- Use `extract` before and after for both.
+- Use `extract` twice and `resize` once for extract-then-resize-then-extract in a fixed operation order.
 
 
 **Throws**:

lib/resize.js

@@ -250,6 +250,9 @@ function resize (widthOrOptions, height, options) {
   if (isResizeExpected(this.options)) {
     this.options.debuglog('ignoring previous resize options');
   }
+  if (this.options.widthPost !== -1) {
+    this.options.debuglog('operation order will be: extract, resize, extract');
+  }
   if (is.defined(widthOrOptions)) {
     if (is.object(widthOrOptions) && !is.defined(options)) {
       options = widthOrOptions;
@@ -437,7 +440,7 @@ function extend (extend) {
  *
  * - Use `extract` before `resize` for pre-resize extraction.
  * - Use `extract` after `resize` for post-resize extraction.
- * - Use `extract` before and after for both.
+ * - Use `extract` twice and `resize` once for extract-then-resize-then-extract in a fixed operation order.
  *
  * @example
  * sharp(input)

npm/darwin-x64/package.json

@@ -19,6 +19,9 @@
   "files": [
     "lib"
   ],
+  "publishConfig": {
+    "access": "public"
+  },
   "exports": {
     "./sharp.node": "./lib/sharp-darwin-x64.node",
     "./package": "./package.json"

npm/from-github-release.js

@@ -20,8 +20,25 @@ const mapTarballEntry = (header) => {
   return header;
 };
 
+const licensing = `
+## Licensing
+
+Copyright 2013 Lovell Fuller and others.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+[https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+`;
+
 workspaces.map(async platform => {
-  const url = `https://github.com/lovell/sharp/releases/download/v${version}/sharp-v${version}-napi-v7-${platform}.tar.gz`;
+  const url = `https://github.com/lovell/sharp/releases/download/v${version}/sharp-v${version}-napi-v9-${platform}.tar.gz`;
   const dir = path.join(__dirname, platform);
   const response = await fetch(url);
   if (!response.ok) {
@@ -36,7 +53,7 @@ workspaces.map(async platform => {
   );
   // Generate README
   const { name, description } = require(`./${platform}/package.json`);
-  await writeFile(path.join(dir, 'README.md'), `# ${name}\n${description}`);
+  await writeFile(path.join(dir, 'README.md'), `# \`${name}\`\n\n${description}.\n${licensing}`);
   // Copy Apache-2.0 LICENSE
   await copyFile(path.join(__dirname, '..', 'LICENSE'), path.join(dir, 'LICENSE'));
   // Copy Windows-specific files

package.json

@@ -1,7 +1,7 @@
 {
   "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.0-alpha.1",
+  "version": "0.33.0-alpha.2",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://github.com/lovell/sharp",
   "contributors": [
@@ -140,15 +140,15 @@
     "semver": "^7.5.4"
   },
   "optionalDependencies": {
-    "@sharpen/sharp-darwin-arm64": "0.0.1-alpha.1",
-    "@sharpen/sharp-darwin-x64": "0.0.1-alpha.1",
-    "@sharpen/sharp-linux-arm": "0.0.1-alpha.1",
-    "@sharpen/sharp-linux-arm64": "0.0.1-alpha.1",
-    "@sharpen/sharp-linux-x64": "0.0.1-alpha.1",
-    "@sharpen/sharp-linuxmusl-arm64": "0.0.1-alpha.1",
-    "@sharpen/sharp-linuxmusl-x64": "0.0.1-alpha.1",
-    "@sharpen/sharp-win32-ia32": "0.0.1-alpha.1",
-    "@sharpen/sharp-win32-x64": "0.0.1-alpha.1"
+    "@sharpen/sharp-darwin-arm64": "0.0.1-alpha.2",
+    "@sharpen/sharp-darwin-x64": "0.0.1-alpha.2",
+    "@sharpen/sharp-linux-arm": "0.0.1-alpha.2",
+    "@sharpen/sharp-linux-arm64": "0.0.1-alpha.2",
+    "@sharpen/sharp-linux-x64": "0.0.1-alpha.2",
+    "@sharpen/sharp-linuxmusl-arm64": "0.0.1-alpha.2",
+    "@sharpen/sharp-linuxmusl-x64": "0.0.1-alpha.2",
+    "@sharpen/sharp-win32-ia32": "0.0.1-alpha.2",
+    "@sharpen/sharp-win32-x64": "0.0.1-alpha.2"
   },
   "devDependencies": {
     "@sharpen/sharp-libvips-darwin-arm64": "0.0.1-alpha.1",

src/common.cc

@@ -166,10 +166,10 @@ namespace sharp {
   }
 
   // How many tasks are in the queue?
-  volatile int counterQueue = 0;
+  std::atomic<int> counterQueue{0};
 
   // How many tasks are being processed?
-  volatile int counterProcess = 0;
+  std::atomic<int> counterProcess{0};
 
   // Filename extension checkers
   static bool EndsWith(std::string const &str, std::string const &end) {

src/common.h

@@ -7,6 +7,7 @@
 #include <string>
 #include <tuple>
 #include <vector>
+#include <atomic>
 
 #include <napi.h>
 #include <vips/vips8>
@@ -161,10 +162,10 @@ namespace sharp {
   };
 
   // How many tasks are in the queue?
-  extern volatile int counterQueue;
+  extern std::atomic<int> counterQueue;
 
   // How many tasks are being processed?
-  extern volatile int counterProcess;
+  extern std::atomic<int> counterProcess;
 
   // Filename extension checkers
   bool IsJpeg(std::string const &str);

src/metadata.cc

@@ -18,7 +18,7 @@ class MetadataWorker : 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;
@@ -281,7 +281,7 @@ Napi::Value metadata(const Napi::CallbackInfo& info) {
   worker->Queue();
 
   // Increment queued task counter
-  g_atomic_int_inc(&sharp::counterQueue);
+  sharp::counterQueue++;
 
   return info.Env().Undefined();
 }

src/pipeline.cc

@@ -44,9 +44,9 @@ class PipelineWorker : public Napi::AsyncWorker {
   // libuv worker
   void Execute() {
     // Decrement queued task counter
-    g_atomic_int_dec_and_test(&sharp::counterQueue);
+    sharp::counterQueue--;
     // Increment processing task counter
-    g_atomic_int_inc(&sharp::counterProcess);
+    sharp::counterProcess++;
 
     try {
       // Open input
@@ -1289,8 +1289,8 @@ class PipelineWorker : public Napi::AsyncWorker {
     delete baton;
 
     // Decrement processing task counter
-    g_atomic_int_dec_and_test(&sharp::counterProcess);
-    Napi::Number queueLength = Napi::Number::New(env, static_cast<double>(sharp::counterQueue));
+    sharp::counterProcess--;
+    Napi::Number queueLength = Napi::Number::New(env, static_cast<int>(sharp::counterQueue));
     queueListener.MakeCallback(Receiver().Value(), { queueLength });
   }
 
@@ -1707,8 +1707,7 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
   worker->Queue();
 
   // Increment queued task counter
-  g_atomic_int_inc(&sharp::counterQueue);
-  Napi::Number queueLength = Napi::Number::New(info.Env(), static_cast<double>(sharp::counterQueue));
+  Napi::Number queueLength = Napi::Number::New(info.Env(), static_cast<int>(++sharp::counterQueue));
   queueListener.MakeCallback(info.This(), { queueLength });
 
   return info.Env().Undefined();

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;
@@ -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();
 }

src/utilities.cc

@@ -70,8 +70,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;
 }
 

test/unit/extract.js

@@ -319,5 +319,16 @@ describe('Partial image extraction', function () {
       s.extract(options);
       assert.strictEqual(warningMessage, 'ignoring previous extract options');
     });
+
+    it('Multiple extract+resize emits warning', () => {
+      let warningMessage = '';
+      const s = sharp();
+      s.on('warning', function (msg) { warningMessage = msg; });
+      const options = { top: 0, left: 0, width: 1, height: 1 };
+      s.extract(options).extract(options);
+      assert.strictEqual(warningMessage, '');
+      s.resize(1);
+      assert.strictEqual(warningMessage, 'operation order will be: extract, resize, extract');
+    });
   });
 });