@imagemagick/magick-wasm 0.0.9 → 0.0.10

package/NOTICE

@@ -7,7 +7,7 @@ Licensed under the Apache License, Version 2.0.
 
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
-[ ImageMagick 7.1.0-20 beta (2021-12-25) ] copyright:
+[ ImageMagick 7.1.0-26 (2022-02-21) ] copyright:
 
 Before we get to the text of the license, lets just review what the license says in simple terms:
 
@@ -49,7 +49,7 @@ Terms and Conditions for Use, Reproduction, and Distribution
 
 The legally binding and authoritative terms and conditions for use, reproduction, and distribution of ImageMagick follow:
 
-Copyright 1999-2021 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.
+Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.
 
 1. Definitions.
 
@@ -113,6 +113,38 @@ To apply the ImageMagick License to your work, attach the following boilerplate
    License for the specific language governing permissions and limitations
    under the License.
 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+[ aom 3.1.3 (2021-10-05) ] copyright:
+
+Copyright (c) 2016, Alliance for Open Media. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 [ exr 3.1.3 (2021-10-28) ] copyright:

package/README.md

@@ -14,4 +14,4 @@ For more information about ImageMagick go to: [http://www.imagemagick.org/](http
 
 ## Release notes
 
-The release notes can be found on [GitHub](https://github.com/dlemstra/magick-wasm/releases/tag/0.0.9).
+The release notes can be found on [GitHub](https://github.com/dlemstra/magick-wasm/releases/tag/0.0.10).

package/auto-threshold-method.d.ts

@@ -0,0 +1,6 @@
+export declare enum AutoThresholdMethod {
+    Undefined = 0,
+    Kapur = 1,
+    OTSU = 2,
+    Triangle = 3
+}

package/auto-threshold-method.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AutoThresholdMethod = void 0;
+var AutoThresholdMethod;
+(function (AutoThresholdMethod) {
+    AutoThresholdMethod[AutoThresholdMethod["Undefined"] = 0] = "Undefined";
+    AutoThresholdMethod[AutoThresholdMethod["Kapur"] = 1] = "Kapur";
+    AutoThresholdMethod[AutoThresholdMethod["OTSU"] = 2] = "OTSU";
+    AutoThresholdMethod[AutoThresholdMethod["Triangle"] = 3] = "Triangle";
+})(AutoThresholdMethod = exports.AutoThresholdMethod || (exports.AutoThresholdMethod = {}));

package/magick-format.d.ts

@@ -69,6 +69,7 @@ export declare enum MagickFormat {
     Flv = "FLV",
     Fractal = "FRACTAL",
     Ftp = "FTP",
+    Ftxt = "FTXT",
     Fts = "FTS",
     G = "G",
     G3 = "G3",
@@ -190,6 +191,7 @@ export declare enum MagickFormat {
     Psd = "PSD",
     Ptif = "PTIF",
     Pwp = "PWP",
+    Qoi = "QOI",
     R = "R",
     RadialGradient = "RADIAL-GRADIENT",
     Raf = "RAF",
@@ -216,6 +218,7 @@ export declare enum MagickFormat {
     Sr2 = "SR2",
     Srf = "SRF",
     Stegano = "STEGANO",
+    StrImg = "STRIMG",
     Sun = "SUN",
     Svg = "SVG",
     Svgz = "SVGZ",

package/magick-format.js

@@ -73,6 +73,7 @@ var MagickFormat;
     MagickFormat["Flv"] = "FLV";
     MagickFormat["Fractal"] = "FRACTAL";
     MagickFormat["Ftp"] = "FTP";
+    MagickFormat["Ftxt"] = "FTXT";
     MagickFormat["Fts"] = "FTS";
     MagickFormat["G"] = "G";
     MagickFormat["G3"] = "G3";
@@ -194,6 +195,7 @@ var MagickFormat;
     MagickFormat["Psd"] = "PSD";
     MagickFormat["Ptif"] = "PTIF";
     MagickFormat["Pwp"] = "PWP";
+    MagickFormat["Qoi"] = "QOI";
     MagickFormat["R"] = "R";
     MagickFormat["RadialGradient"] = "RADIAL-GRADIENT";
     MagickFormat["Raf"] = "RAF";
@@ -220,6 +222,7 @@ var MagickFormat;
     MagickFormat["Sr2"] = "SR2";
     MagickFormat["Srf"] = "SRF";
     MagickFormat["Stegano"] = "STEGANO";
+    MagickFormat["StrImg"] = "STRIMG";
     MagickFormat["Sun"] = "SUN";
     MagickFormat["Svg"] = "SVG";
     MagickFormat["Svgz"] = "SVGZ";

package/magick-geometry.js

@@ -109,6 +109,35 @@ class MagickGeometry {
             result += '@';
         return result;
     }
+    static fromRectangle(rectangle) {
+        if (rectangle === 0)
+            throw new magick_error_1.MagickError('unable to allocate memory');
+        try {
+            const width = image_magick_1.ImageMagick._api._MagickRectangle_Width_Get(rectangle);
+            const height = image_magick_1.ImageMagick._api._MagickRectangle_Height_Get(rectangle);
+            const x = image_magick_1.ImageMagick._api._MagickRectangle_X_Get(rectangle);
+            const y = image_magick_1.ImageMagick._api._MagickRectangle_Y_Get(rectangle);
+            return new MagickGeometry(x, y, width, height);
+        }
+        finally {
+            image_magick_1.ImageMagick._api._MagickRectangle_Dispose(rectangle);
+        }
+    }
+    toRectangle(func) {
+        const rectangle = image_magick_1.ImageMagick._api._MagickRectangle_Create();
+        if (rectangle === 0)
+            throw new magick_error_1.MagickError('unable to allocate memory');
+        try {
+            image_magick_1.ImageMagick._api._MagickRectangle_Width_Set(rectangle, this._width);
+            image_magick_1.ImageMagick._api._MagickRectangle_Height_Set(rectangle, this._height);
+            image_magick_1.ImageMagick._api._MagickRectangle_X_Set(rectangle, this._x);
+            image_magick_1.ImageMagick._api._MagickRectangle_Y_Set(rectangle, this._y);
+            func(rectangle);
+        }
+        finally {
+            image_magick_1.ImageMagick._api._MagickRectangle_Dispose(rectangle);
+        }
+    }
     initialize(instance, flags) {
         this._width = image_magick_1.ImageMagick._api._MagickGeometry_Width_Get(instance);
         this._height = image_magick_1.ImageMagick._api._MagickGeometry_Height_Get(instance);

package/magick-image.d.ts

@@ -1,4 +1,5 @@
 import { AlphaOption } from './alpha-option';
+import { AutoThresholdMethod } from './auto-threshold-method';
 import { Channels } from './channels';
 import { ColorSpace } from './color-space';
 import { CompositeOperator } from './composite-operator';
@@ -34,12 +35,14 @@ export interface IMagickImage extends INativeInstance {
     interpolate: PixelInterpolateMethod;
     readonly height: number;
     orientation: OrientationType;
+    page: MagickGeometry;
     quality: number;
     readonly signature: string | null;
     virtualPixelMethod: VirtualPixelMethod;
     width: number;
     alpha(value: AlphaOption): void;
     autoOrient(): void;
+    autoThreshold(method: AutoThresholdMethod): void;
     blur(): void;
     blur(channels: Channels): void;
     blur(radius: number, sigma: number): void;
@@ -76,6 +79,10 @@ export interface IMagickImage extends INativeInstance {
     compositeGravity(image: IMagickImage, gravity: Gravity, compose: CompositeOperator, point: Point, channels: Channels): void;
     compositeGravity(image: IMagickImage, gravity: Gravity, compose: CompositeOperator, point: Point, args: string): void;
     compositeGravity(image: IMagickImage, gravity: Gravity, compose: CompositeOperator, point: Point, args: string, channels: Channels): void;
+    crop(geometry: MagickGeometry): void;
+    crop(geometry: MagickGeometry, gravity: Gravity): void;
+    crop(width: number, height: number): void;
+    crop(width: number, height: number, gravity: Gravity): void;
     deskew(threshold: Percentage): number;
     distort(method: DistortMethod, params: number[]): void;
     distort(method: DistortMethod, settings: DistortSettings, params: number[]): void;
@@ -95,6 +102,7 @@ export interface IMagickImage extends INativeInstance {
     getWriteMask(func: (mask: IMagickImage | null) => void): void;
     getWriteMask(func: (mask: IMagickImage | null) => Promise<void>): Promise<void>;
     getPixels<TReturnType>(func: (pixels: IPixelCollection) => TReturnType): TReturnType;
+    histogram(): Map<string, number>;
     level(blackPoint: Percentage, whitePoint: Percentage): void;
     level(blackPoint: Percentage, whitePoint: Percentage, gamma: number): void;
     level(channels: Channels, blackPoint: Percentage, whitePoint: Percentage): void;
@@ -112,6 +120,7 @@ export interface IMagickImage extends INativeInstance {
     readFromCanvas(canvas: HTMLCanvasElement): void;
     removeArtifact(name: string): void;
     removeWriteMask(): void;
+    repage(): void;
     resize(geometry: MagickGeometry): void;
     resize(width: number, height: number): void;
     rotate(degrees: number): void;
@@ -165,6 +174,8 @@ export declare class MagickImage extends NativeInstance implements IMagickImage
     get height(): number;
     get orientation(): OrientationType;
     set orientation(value: OrientationType);
+    get page(): MagickGeometry;
+    set page(value: MagickGeometry);
     get quality(): number;
     set quality(value: number);
     get signature(): string | null;
@@ -173,6 +184,7 @@ export declare class MagickImage extends NativeInstance implements IMagickImage
     get width(): number;
     alpha(value: AlphaOption): void;
     autoOrient(): void;
+    autoThreshold(method: AutoThresholdMethod): void;
     blur(): void;
     blur(channels: Channels): void;
     blur(radius: number, sigma: number): void;
@@ -209,6 +221,10 @@ export declare class MagickImage extends NativeInstance implements IMagickImage
     compositeGravity(image: IMagickImage, gravity: Gravity, compose: CompositeOperator, point: Point, channels: Channels): void;
     compositeGravity(image: IMagickImage, gravity: Gravity, compose: CompositeOperator, point: Point, args: string): void;
     compositeGravity(image: IMagickImage, gravity: Gravity, compose: CompositeOperator, point: Point, args: string, channels: Channels): void;
+    crop(geometry: MagickGeometry): void;
+    crop(geometry: MagickGeometry, gravity: Gravity): void;
+    crop(width: number, height: number): void;
+    crop(width: number, height: number, gravity: Gravity): void;
     static create(): IMagickImage;
     deskew(threshold: Percentage): number;
     distort(method: DistortMethod, params: number[]): void;
@@ -229,6 +245,7 @@ export declare class MagickImage extends NativeInstance implements IMagickImage
     getWriteMask(func: (mask: IMagickImage | null) => void): void;
     getWriteMask(func: (mask: IMagickImage | null) => Promise<void>): Promise<void>;
     getPixels<TReturnType>(func: (pixels: IPixelCollection) => TReturnType): TReturnType;
+    histogram(): Map<string, number>;
     level(blackPoint: Percentage, whitePoint: Percentage): void;
     level(blackPoint: Percentage, whitePoint: Percentage, gamma: number): void;
     level(channels: Channels, blackPoint: Percentage, whitePoint: Percentage): void;
@@ -246,6 +263,7 @@ export declare class MagickImage extends NativeInstance implements IMagickImage
     readFromCanvas(canvas: HTMLCanvasElement): void;
     removeArtifact(name: string): void;
     removeWriteMask(): void;
+    repage(): void;
     resize(geometry: MagickGeometry): void;
     resize(width: number, height: number): void;
     rotate(degrees: number): void;

package/magick-image.js

@@ -90,6 +90,15 @@ class MagickImage extends native_instance_1.NativeInstance {
     get height() { return image_magick_1.ImageMagick._api._MagickImage_Height_Get(this._instance); }
     get orientation() { return image_magick_1.ImageMagick._api._MagickImage_Orientation_Get(this._instance); }
     set orientation(value) { image_magick_1.ImageMagick._api._MagickImage_Orientation_Set(this._instance, value); }
+    get page() {
+        const rectangle = image_magick_1.ImageMagick._api._MagickImage_Page_Get(this._instance);
+        return magick_geometry_1.MagickGeometry.fromRectangle(rectangle);
+    }
+    set page(value) {
+        value.toRectangle(rectangle => {
+            image_magick_1.ImageMagick._api._MagickImage_Page_Set(this._instance, rectangle);
+        });
+    }
     get quality() { return image_magick_1.ImageMagick._api._MagickImage_Quality_Get(this._instance); }
     set quality(value) {
         let quality = value < 1 ? 1 : value;
@@ -124,6 +133,11 @@ class MagickImage extends native_instance_1.NativeInstance {
             this._setInstance(instance, exception);
         });
     }
+    autoThreshold(method) {
+        exception_1.Exception.use(exception => {
+            image_magick_1.ImageMagick._api._MagickImage_AutoThreshold(this._instance, method, exception.ptr);
+        });
+    }
     blur(radiusOrChannel, sigma, channels) {
         let radius = 0;
         const sigmaValue = this.valueOrDefault(sigma, 1);
@@ -256,6 +270,24 @@ class MagickImage extends native_instance_1.NativeInstance {
         if (args !== null)
             this.removeArtifact('compose:args');
     }
+    crop(geometryOrWidth, heightOrGravity, gravity) {
+        let geometry;
+        let cropGravity;
+        if (geometryOrWidth instanceof magick_geometry_1.MagickGeometry) {
+            geometry = geometryOrWidth;
+            cropGravity = heightOrGravity !== undefined ? heightOrGravity : gravity_1.Gravity.Undefined;
+        }
+        else if (heightOrGravity !== undefined) {
+            geometry = new magick_geometry_1.MagickGeometry(geometryOrWidth, heightOrGravity);
+            cropGravity = gravity !== undefined ? gravity : gravity_1.Gravity.Undefined;
+        }
+        exception_1.Exception.use(exception => {
+            (0, string_1._withString)(geometry.toString(), geometryPtr => {
+                const instance = image_magick_1.ImageMagick._api._MagickImage_Crop(this._instance, geometryPtr, cropGravity, exception.ptr);
+                this._setInstance(instance, exception);
+            });
+        });
+    }
     static create() {
         return new MagickImage(MagickImage.createInstance(), new magick_settings_1.MagickSettings());
     }
@@ -364,6 +396,25 @@ class MagickImage extends native_instance_1.NativeInstance {
             return func(pixels);
         });
     }
+    histogram() {
+        const result = new Map();
+        exception_1.Exception.usePointer(exception => {
+            pointer_1.Pointer.use(lengthPointer => {
+                const histogram = image_magick_1.ImageMagick._api._MagickImage_Histogram(this._instance, lengthPointer.ptr, exception);
+                if (histogram !== 0) {
+                    const length = lengthPointer.value;
+                    for (let i = 0; i < length; i++) {
+                        const colorPtr = image_magick_1.ImageMagick._api._MagickColorCollection_GetInstance(histogram, i);
+                        const color = magick_color_1.MagickColor._create(colorPtr);
+                        const count = image_magick_1.ImageMagick._api._MagickColor_Count_Get(colorPtr);
+                        result.set(color.toString(), count);
+                    }
+                    image_magick_1.ImageMagick._api._MagickColorCollection_DisposeList(histogram);
+                }
+            });
+        });
+        return result;
+    }
     level(channelsOrBlackPoint, blackPointOrWhitePoint, whitePointPercentageOrGamma, gamma) {
         let channels = channels_1.Channels.Composite;
         let blackPoint;
@@ -458,6 +509,9 @@ class MagickImage extends native_instance_1.NativeInstance {
             image_magick_1.ImageMagick._api._MagickImage_SetWriteMask(this._instance, 0, exception);
         });
     }
+    repage() {
+        this.page = new magick_geometry_1.MagickGeometry(0, 0, 0, 0);
+    }
     resize(widthOrGeometry, height) {
         const geometry = typeof widthOrGeometry === 'number' ? new magick_geometry_1.MagickGeometry(widthOrGeometry, height) : widthOrGeometry;
         exception_1.Exception.use(exception => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@imagemagick/magick-wasm",
-    "version": "0.0.9",
+    "version": "0.0.10",
     "main": "image-magick.js",
     "description": "The WASM library for ImageMagick",
     "repository": {