Update sharp to add Apple M1 support - fixes #61.

Author: vseventer

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.0.0
+* Removed `--limitInputPixels` and `--sequentialRead`.
+* Added [`--limitInputPixels`](https://sharp.pixelplumbing.com/api-composite#composite) when compositing images.
+* Updated `sharp` dependency (adding support for Apple M1) ([#61](https://github.com/vseventer/sharp-cli/pull/61)).
+
 ## 1.15.0 (March 13, 2021)
 * Added [`alpha`](https://sharp.pixelplumbing.com/api-channel#extractchannel) band option to `extractChannel`.
 * Added [`density`, `level`, `page`, and `pages`](https://sharp.pixelplumbing.com/api-constructor) to input options.

README.md

@@ -64,8 +64,6 @@ Global Options
           [choices: "input", "heif", "jpeg", "jpg", "png", "raw", "tiff", "webp"] [default: "input"]
   --input, -i             Path to (an) image file(s)             [array] [required] [default: stdin]
   --level                 Level to extract from a multi-level input                         [number]
-  --limitInputPixels, -l  Do not process input images where the number of pixels (width x height)
-                          exceeds this limit                           [number] [default: 268402689]
   --output, -o            Directory or URI template to write the image files to
                                                                [string] [required] [default: stdout]
   --page                  Page number to start extracting from for multi-page input         [number]
@@ -102,8 +100,6 @@ Optimization Options
   --quantisationTable, --quantizationTable  Quantization table to use          [number] [default: 0]
   --reductionEffort                         Level of CPU effort to reduce file size
                                                                                [number] [default: 4]
-  --sequentialRead                          An advanced setting that switches the libvips access
-                                            method to VIPS_ACCESS_SEQUENTIAL               [boolean]
   --smartSubsample                          High quality chroma subsampling                [boolean]
   --squash                                  Squash 8-bit images down to 1 bit              [boolean]
   --tileBackground                          Background colour, parsed by the color module

cmd/compositing/composite.js

@@ -67,6 +67,12 @@ const options = {
     normalize: true,
     type: 'string'
   },
+  limitInputPixels: {
+    defaultDescription: 0x3FFF * 0x3FFF,
+    desc: 'Do not process input images where the number of pixels (width x height) exceeds this limit',
+    nargs: 1,
+    type: 'number'
+  },
   offset: {
     desc: 'The pixel offset from the top and left edges',
     nargs: 2,
@@ -108,6 +114,7 @@ const handler = (args) => {
       density: args.density,
       gravity: args.gravity,
       left,
+      limitInputPixels: args.limitInputPixels,
       premultiplied: args.premultiplied,
       tile: args.tile,
       top

lib/cli.js

@@ -91,16 +91,6 @@ const options = {
     type: 'number'
   },
 
-  // @see https://sharp.pixelplumbing.com/en/stable/api-input/#limitinputpixels
-  limitInputPixels: {
-    alias: 'l',
-    defaultDescription: 0x3FFF * 0x3FFF,
-    desc: 'Do not process input images where the number of pixels (width x height) exceeds this limit',
-    group: _global,
-    nargs: 1,
-    type: 'number'
-  },
-
   // @see https://sharp.pixelplumbing.com/en/stable/api-output/
   output: {
     alias: 'o',
@@ -219,7 +209,7 @@ const options = {
   // @see https://sharp.pixelplumbing.com/en/stable/api-output/#heif
   hcompression: {
     choices: constants.HEIF_COMPRESSION,
-    default: 'hevc',
+    default: 'av1',
     desc: 'Compression format',
     group: optimize,
     nargs: 1,
@@ -316,13 +306,6 @@ const options = {
     type: 'number'
   },
 
-  // @see https://sharp.pixelplumbing.com/en/stable/api-input/#sequentialread
-  sequentialRead: {
-    desc: 'An advanced setting that switches the libvips access method to VIPS_ACCESS_SEQUENTIAL',
-    group: optimize,
-    type: 'boolean'
-  },
-
   // @see https://sharp.pixelplumbing.com/en/stable/api-output/#webp
   smartSubsample: {
     desc: 'High quality chroma subsampling',

lib/constants.js

@@ -38,7 +38,7 @@ module.exports = {
   FIT: Object.keys(sharp.fit),
   FORMAT: ['heif', 'jpeg', 'jpg', 'png', 'raw', 'tiff', 'webp'],
   GRAVITY: Object.keys(sharp.gravity),
-  HEIF_COMPRESSION: ['hevc', 'avc', 'jpeg', 'av1'],
+  HEIF_COMPRESSION: ['hevc', 'av1'],
   KERNEL: Object.keys(sharp.kernel),
   LAYOUT: ['dz', 'google', 'iiif', 'zoomify'],
   POSITION: Object.keys(sharp.position),