pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1248596 from graphics

Browse Source 
- version update to 7.1.1.44
  * Bump azure/trusted-signing-action from 0.5.0 to 0.5.1 in #7895
  * Enable any dither method such as Floyd-Steinberg for Magick::Image::map()
    in #7937
  * Magick++ Documentation Verification in #7906
  * fix type casting in statistic.c in #7982
- removed patched (upstreamed)
  - ImageMagick-0-1-are-special-cases-for-pow.patch
  - ImageMagick-check-for-pow-zero.patch
  - ImageMagick-gamma-should-call-GammaImage.patch

OBS-URL: https://build.opensuse.org/request/show/1248596
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=307
This commit is contained in:
Dominique Leuenberger 2025-02-27 13:49:48 +00:00 committed by Git OBS Bridge
commit 63deb00e9b
9 changed files with 34 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ImageMagick-0-1-are-special-cases-for-pow.patch
View File

@ -1,36 +0,0 @@
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 8489fa4a0d1..377c7256a92 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -377,7 +377,7 @@ static double ApplyEvaluateOperator(RandomInfo *random_info,const Quantum pixel,
}
case PowEvaluateOperator:
{
- if (PerceptibleReciprocal(value) <= MagickEpsilon)
+ if (fabs(value) <= MagickEpsilon)
break;
if (((double) pixel < 0.0) && ((value-floor(value)) > MagickEpsilon))
result=(double) -((double) QuantumRange*pow(-(QuantumScale*(double)
diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 38e3145c321..1d853eedeb5 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -2477,14 +2477,15 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
if (IsGeometry(arg1) == MagickFalse)
CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1);
constant=StringToDouble(arg1,(char **) NULL);
-#if 1
+#if 0
/* Using Gamma, via a cache */
if (IfPlusOp)
constant=PerceptibleReciprocal(constant);
(void) GammaImage(_image,constant,_exception);
#else
/* Using Evaluate POW, direct update of values - more accurate */
- if (IfNormalOp)
+ if (IfNormalOp && (fabs(constant) <= MagickEpsilon) &&
+ ((constant-1.0) > MagickEpsilon))
constant=PerceptibleReciprocal(constant);
(void) EvaluateImage(_image,PowEvaluateOperator,constant,_exception);
_image->gamma*=StringToDouble(arg1,(char **) NULL);

BIN
ImageMagick-7.1.1-43.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

16
ImageMagick-7.1.1-43.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmdoeJIACgkQiatj1IJ3
N3rgoRAAph8B3N6Ssar9NhlOPJ5QlUIjTkBkh/psvKlvYuYAc7g00pQrDdqvnyqn
+hWwX4s49RP2nxfTx1A7HNaWyOw/xhaV/24FLdadw1HP2SelkX2aad1SDjvUMKA1
PGaK7v3/V6krCZINW3Yq7Rm3aN/gRxm428YY2yO5N7GBi5KhdcImOcNdLpZzq9Jw
mr9vXwK9ax/5wop3VAF724qlSNOACS9EqM/Yk+YdGg/ZruVmuVrWG91ySSWzBqSq
wNwKympBQwZeOkEPd5rGNidFdrGKdym4gxcOp/cz/F0ThtFbQjI8A/3CPaRRKAPW
0EtigG8x++l5HSrgxXGqQtR+y+m3J2RJ4JdXThL89sZV/mWy3Gjq8YOSxViPm06H
DIaEDKEV6oK5a8bBs64/JGaKSmjQGqdcpS/FNTRt6OjSZSB+INdmIj19bt8P+WrW
mnMzskbDMvGpW2DKtqQdvQttiWdeJjUtc8hYUUeyA7dvBAMFyS4gJsvSx60IJF2l
Kom6fDBn3ZaFGQs1qyTMukONkKoxhwd4S9sTMhWNWrfGGzfyMpJrRA8BHBqc7naw
yP+ucV4+hYknN7JvuE8ju4PZ6Fyb4fF4TwsiRaN/5FcdBwCMAdNX8oit5PaOBt5u
Xe7mF8k81e5FKs4XyK0DZC2jALo8AIzGICxM5qGEeiGcecD00Ow=
=QK9r
-----END PGP SIGNATURE-----

3
ImageMagick-7.1.1-44.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e244bce3962228055839e020dde0d37fb428745815a09a2250ffe21eb9ec34d
size 10773912

16
ImageMagick-7.1.1-44.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAme6Lf8ACgkQiatj1IJ3
N3oxbhAAq1bkjMt5ULs5nnTRWSsA3V24bOKFAa/ajC1F8XP6cDKTwFAv4cpfJmy/
J8HKFa0AW85U4c30bMpxUGpK2wp2PBhfx4gvlbbNhxFOTj4L/AKK/Ua1vLkEIiVx
zUFI3vg0ASD2uMZ+ehAg+1algK4xbZYKZYA2FJo2PPDSgXo7SroDR3q581z9fIQ3
08O5ESYrPueOq6Hv5eTnUn/+BIIQJAA2QsA5AwIcUT3rO5q0ZTzm3uJZxyPZ9L9K
bSXl4oM8LQkhPMyyt+PaoSlfo9w9FJ74nYCPJpm6tVOHJedPu+JncvD4/zJ/NOrC
UMKwvzPoHmOF+/AgFi/74ImdhbXBiWd3DTCH4aooiRgcJrb+2uSEPTqGd5U9+hDD
4zzQAp0FvppUC97easTpOzUcRo9dW7IxmA2ph37Hj+3KHDxoRvVErQZwC9sDlsX5
qlZn4gFbOM6pVkeBNS0BcKpdAS/s9NVve7kCug9KxjZnsrTCVJvMsZXC5BhE+twI
2Jih29D+RoY3MqNXSnGTnrQbQatnKf472YZNIOOXyMPdaq820gSAvPR3Ir7AhBZ2
sh+Vw81uXtk8jh42podfI5KiufLQPUtTetvd+lbt+NG2FtGJKMABTyCUR2ilRyOg
Hcy59+qFwJGGrkddUPoiWh0cgwjE2Lp6ouYoMH7UckK2nUxsF6c=
=pguB
-----END PGP SIGNATURE-----

23
ImageMagick-check-for-pow-zero.patch
View File

@ -1,23 +0,0 @@
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index caa221e7f34..8489fa4a0d1 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -377,12 +377,13 @@ static double ApplyEvaluateOperator(RandomInfo *random_info,const Quantum pixel,
}
case PowEvaluateOperator:
{
- if (((double) pixel < 0) && ((value-floor(value)) > MagickEpsilon))
+ if (PerceptibleReciprocal(value) <= MagickEpsilon)
+ break;
+ if (((double) pixel < 0.0) && ((value-floor(value)) > MagickEpsilon))
result=(double) -((double) QuantumRange*pow(-(QuantumScale*(double)
- pixel),(double) value));
+ pixel),value));
else
- result=(double) QuantumRange*pow(QuantumScale*(double) pixel,
- (double) value);
+ result=(double) QuantumRange*pow(QuantumScale*(double) pixel,value);
break;
}
case RightShiftEvaluateOperator:

14
ImageMagick-gamma-should-call-GammaImage.patch
View File

@ -1,14 +0,0 @@
diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index bbe00a5e5ca..38e3145c321 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -2477,7 +2477,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
if (IsGeometry(arg1) == MagickFalse)
CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1);
constant=StringToDouble(arg1,(char **) NULL);
-#if 0
+#if 1
/* Using Gamma, via a cache */
if (IfPlusOp)
constant=PerceptibleReciprocal(constant);

14
ImageMagick.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun Feb 23 20:52:21 UTC 2025 - Arjen de Korte <suse+build@de-korte.org>
- version update to 7.1.1.44
* Bump azure/trusted-signing-action from 0.5.0 to 0.5.1 in #7895
* Enable any dither method such as Floyd-Steinberg for Magick::Image::map()
in #7937
* Magick++ Documentation Verification in #7906
* fix type casting in statistic.c in #7982
- removed patched (upstreamed)
- ImageMagick-0-1-are-special-cases-for-pow.patch
- ImageMagick-check-for-pow-zero.patch
- ImageMagick-gamma-should-call-GammaImage.patch
-------------------------------------------------------------------
Mon Jan 20 13:34:51 UTC 2025 - pgajdos@suse.com

11
ImageMagick.spec
View File

@ -20,7 +20,7 @@
%define asan_build 0
%define maj 7
%define mfr_version %{maj}.1.1
%define mfr_revision 43
%define mfr_revision 44
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 10
@ -54,12 +54,6 @@ Patch4: ImageMagick-filter.t-disable-Contrast.patch
#%%endif
#%%ifarch s390x
Patch5: ImageMagick-s390x-disable-tests.patch
# https://github.com/ImageMagick/ImageMagick/commit/1afa38ae2fa87cf4eb48040e47d410aa729ce21e
Patch6: ImageMagick-check-for-pow-zero.patch
# https://github.com/ImageMagick/ImageMagick/commit/056ccdbeac41c9b24b625e0139cd25a4cdffb22a
Patch7: ImageMagick-gamma-should-call-GammaImage.patch
# https://github.com/ImageMagick/ImageMagick/commit/be3b73da674520ad3eab52ade2a3cda62af66d15
Patch8: ImageMagick-0-1-are-special-cases-for-pow.patch
#%%endif
BuildRequires: chrpath
BuildRequires: dejavu-fonts
@ -362,9 +356,6 @@ policy plus disable few other coders for reading and/or writing.
%ifarch s390x
%patch -P 5 -p1
%endif
%patch -P 6 -p1
%patch -P 7 -p1
%patch -P 8 -p1
%build
# bsc#1088463