From 17be0cb862569c2611bde8da9f898a9b512155c5 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Tue, 9 Jul 2024 07:42:25 +0200 Subject: [PATCH] Updated magick-native --- NOTICE | 43 +++++++++++++++++++++++-------------------- package-lock.json | 11 ++++++----- package.json | 2 +- src/magick-image.ts | 24 ++++++------------------ 4 files changed, 36 insertions(+), 44 deletions(-) diff --git a/NOTICE b/NOTICE index f6809260..4ab015db 100644 --- a/NOTICE +++ b/NOTICE @@ -7,7 +7,7 @@ Licensed under the Apache License, Version 2.0. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -[ ImageMagick 7.1.1-32 (2024-05-05) ] copyright: +[ ImageMagick 7.1.1-35 beta (2024-06-30) ] copyright: ImageMagick License https://imagemagick.org/script/license.php @@ -2689,7 +2689,7 @@ SOFTWARE. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -[ highway 1.1.0 (2024-02-18) ] copyright: +[ highway 1.2.0 (2024-05-31) ] copyright: Apache License Version 2.0, January 2004 @@ -2894,35 +2894,38 @@ SOFTWARE. limitations under the License. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -[ jpeg-turbo 3.0.2 (2024-01-16) ] copyright: +[ jpeg-turbo 3.0.3 (2024-05-08) ] copyright: libjpeg-turbo Licenses ====================== -libjpeg-turbo is covered by three compatible BSD-style open source licenses: +libjpeg-turbo is covered by two compatible BSD-style open source licenses: - The IJG (Independent JPEG Group) License, which is listed in [README.ijg](README.ijg) - This license applies to the libjpeg API library and associated programs - (any code inherited from libjpeg, and any modifications to that code.) + This license applies to the libjpeg API library and associated programs, + including any code inherited from libjpeg and any modifications to that + code. Note that the libjpeg-turbo SIMD source code bears the + [zlib License](https://opensource.org/licenses/Zlib), but in the context of + the overall libjpeg API library, the terms of the zlib License are subsumed + by the terms of the IJG License. - The Modified (3-clause) BSD License, which is listed below - This license covers the TurboJPEG API library and associated programs, as - well as the build system. - -- The [zlib License](https://opensource.org/licenses/Zlib) - - This license is a subset of the other two, and it covers the libjpeg-turbo - SIMD extensions. + This license applies to the TurboJPEG API library and associated programs, as + well as the build system. Note that the TurboJPEG API library wraps the + libjpeg API library, so in the context of the overall TurboJPEG API library, + both the terms of the IJG License and the terms of the Modified (3-clause) + BSD License apply. Complying with the libjpeg-turbo Licenses ========================================= This section provides a roll-up of the libjpeg-turbo licensing terms, to the -best of our understanding. +best of our understanding. This is not a license in and of itself. It is +intended solely for clarification. 1. If you are distributing a modified version of the libjpeg-turbo source, then: @@ -2936,7 +2939,7 @@ best of our understanding. - Clauses 1 and 3 of the zlib License 2. You must add your own copyright notice to the header of each source - file you modified, so others can tell that you modified that file (if + file you modified, so others can tell that you modified that file. (If there is not an existing copyright header in that file, then you can simply add a notice stating that you modified the file.) @@ -3017,8 +3020,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Why Three Licenses? -=================== +Why Two Licenses? +================= The zlib License could have been used instead of the Modified (3-clause) BSD License, and since the IJG License effectively subsumes the distribution @@ -3443,11 +3446,11 @@ be appreciated. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -[ raw 0.21.2 (2023-12-19) ] copyright: +[ raw 0.21.2 (2024-03-29 ] copyright: ** LibRaw: Raw images processing library ** -Copyright (C) 2008-2021 LibRaw LLC (http://www.libraw.org, info@libraw.org) +Copyright (C) 2008-2024 LibRaw LLC (http://www.libraw.org, info@libraw.org) LibRaw is free software; you can redistribute it and/or modify it under the terms of the one of two licenses as you choose: @@ -3538,7 +3541,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -[ xml 2.12.6 (2024-03-15) ] copyright: +[ xml 2.12.7 (2024-05-13) ] copyright: Except where otherwise noted in the source code (e.g. the files dict.c, list.c and the trio files, which are covered by a similar licence but diff --git a/package-lock.json b/package-lock.json index fd3ab66a..1fb4a60f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.29", "license": "Apache-2.0", "devDependencies": { - "@dlemstra/magick-native": "0.202405.171632", + "@dlemstra/magick-native": "0.202407.42140", "@types/jsdom": "21.1.7", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", @@ -48,10 +48,11 @@ } }, "node_modules/@dlemstra/magick-native": { - "version": "0.202405.171632", - "resolved": "https://npm.pkg.github.com/download/@dlemstra/magick-native/0.202405.171632/3db3ec2a9bbb94aeafb76db16a58fa52ffa05a25", - "integrity": "sha512-epU2WBpeQcJGUfSm8JU4v1FdKKSdF719CtWKcLp0NiUiBkq3q7lA3QPS3t+6SVk8yaCyIN0NSW6agop4q2SN3A==", - "dev": true + "version": "0.202407.42140", + "resolved": "https://npm.pkg.github.com/download/@dlemstra/magick-native/0.202407.42140/46d722fd7759671dc607120e58175a6e6a72e67d", + "integrity": "sha512-7ceQz4g0vORQfNVkSfnFbMOG9XQgf9hkIUwCi2cYsVJsGdflwesCjIRkut9Gb6SCoEmhl6O474PJoSJcRM+L1Q==", + "dev": true, + "license": "Apache-2.0" }, "node_modules/@esbuild/aix-ppc64": { "version": "0.21.5", diff --git a/package.json b/package.json index 1e03ca5d..89a74a48 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "update-index": "cd tools && tsc && node update-index.js ../src" }, "devDependencies": { - "@dlemstra/magick-native": "0.202405.171632", + "@dlemstra/magick-native": "0.202407.42140", "@types/jsdom": "21.1.7", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", diff --git a/src/magick-image.ts b/src/magick-image.ts index 41bea895..f02b6424 100644 --- a/src/magick-image.ts +++ b/src/magick-image.ts @@ -1756,9 +1756,7 @@ export class MagickImage extends NativeInstance implements IMagickImage { } get classType(): ClassType { - return this.useExceptionPointer(exception => { - return ImageMagick._api._MagickImage_ClassType_Get(this._instance, exception); - }); + return ImageMagick._api._MagickImage_ClassType_Get(this._instance); } set classType(value: ClassType) { this.useExceptionPointer(exception => { @@ -1770,9 +1768,7 @@ export class MagickImage extends NativeInstance implements IMagickImage { set colorFuzz(value: Percentage) { ImageMagick._api._MagickImage_ColorFuzz_Set(this._instance, value._toQuantum()); } get colormapSize(): number { - return this.useExceptionPointer(exception => { - return ImageMagick._api._MagickImage_ColormapSize_Get(this._instance, exception); - }); + return ImageMagick._api._MagickImage_ColormapSize_Get(this._instance); } set colormapSize(value: number) { this.useExceptionPointer(exception => { @@ -1781,9 +1777,7 @@ export class MagickImage extends NativeInstance implements IMagickImage { } get colorSpace(): ColorSpace { - return this.useExceptionPointer(exception => { - return ImageMagick._api._MagickImage_ColorSpace_Get(this._instance, exception); - }); + return ImageMagick._api._MagickImage_ColorSpace_Get(this._instance); } set colorSpace(value: ColorSpace) { this.useExceptionPointer(exception => { @@ -1796,9 +1790,7 @@ export class MagickImage extends NativeInstance implements IMagickImage { return this.settings.colorType; } - return this.useExceptionPointer(exception => { - return ImageMagick._api._MagickImage_ColorType_Get(this._instance, exception); - }); + return ImageMagick._api._MagickImage_ColorType_Get(this._instance); } set colorType(value: ColorType) { this.useExceptionPointer(exception => { @@ -1858,9 +1850,7 @@ export class MagickImage extends NativeInstance implements IMagickImage { set gifDisposeMethod(value: GifDisposeMethod) { ImageMagick._api._MagickImage_GifDisposeMethod_Set(this._instance, value); } get hasAlpha(): boolean { - return this.useExceptionPointer(exception => { - return this.toBool(ImageMagick._api._MagickImage_HasAlpha_Get(this._instance, exception)); - }); + return this.toBool(ImageMagick._api._MagickImage_HasAlpha_Get(this._instance)); } set hasAlpha(value: boolean) { this.useExceptionPointer(exception => { @@ -1975,9 +1965,7 @@ export class MagickImage extends NativeInstance implements IMagickImage { } get virtualPixelMethod(): VirtualPixelMethod { - return this.useExceptionPointer(exception => { - return ImageMagick._api._MagickImage_VirtualPixelMethod_Get(this._instance, exception); - }); + return ImageMagick._api._MagickImage_VirtualPixelMethod_Get(this._instance); } set virtualPixelMethod(value: VirtualPixelMethod) { this.useExceptionPointer(exception => {