Commit 824aa5b6d for imagemagick.org
commit 824aa5b6de3ed2fb6b106ead213ff52842d5491c
Author: Cristy <urban-warrior@imagemagick.org>
Date: Sat May 9 13:03:52 2026 -0400
https://github.com/ImageMagick/ImageMagick/issues/8720
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index c3b9f2f5d..e5d38c1c4 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -5512,7 +5512,7 @@ MagickPrivate MagickBooleanType SyncAuthenticPixelCacheNexus(Image *image,
assert(cache_info->signature == MagickCoreSignature);
if (cache_info->type == UndefinedCache)
return(MagickFalse);
- if (image->mask_trait != UpdatePixelTrait)
+ if ((image->mask_trait & UpdatePixelTrait) != 0)
{
if (((image->channels & WriteMaskChannel) != 0) &&
(ClipPixelCacheNexus(image,nexus_info,exception) == MagickFalse))
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 834933aab..9e9564723 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1041,8 +1041,9 @@ MagickExport Image *BilateralBlurImage(const Image *image,const size_t width,
r=p-(ssize_t) (GetPixelChannels(image)*MagickMax(width,1)*
(size_t) (mid.y-v)+GetPixelChannels(image)*(size_t) (mid.x-u));
- intensity=ScaleQuantumToChar((const Quantum) GetPixelIntensity(image,r))-
- (double) ScaleQuantumToChar((const Quantum) GetPixelIntensity(image,p));
+ intensity=ScaleQuantumToChar((const Quantum)
+ GetPixelIntensity(image,r))-(double)
+ ScaleQuantumToChar((const Quantum) GetPixelIntensity(image,p));
if ((intensity >= -MaxIntensity) && (intensity <= MaxIntensity))
weights[id][n]=intensity_gaussian[(ssize_t) intensity+MaxIntensity]*
spatial_gaussian[n];
@@ -1084,8 +1085,9 @@ MagickExport Image *BilateralBlurImage(const Image *image,const size_t width,
{
for (u=0; u < (ssize_t) MagickMax(width,1); u++)
{
- r=p-(ssize_t) (GetPixelChannels(image)*MagickMax(width,1)*(size_t)
- (mid.y-v)+GetPixelChannels(image)*(size_t) (mid.x-u));
+ r=p-(ssize_t) (GetPixelChannels(image)*MagickMax(width,1)*
+ (size_t) (mid.y-v)+GetPixelChannels(image)*(size_t)
+ (mid.x-u));
pixel+=weights[id][n]*(double) r[i];
gamma+=weights[id][n];
n++;
@@ -1106,8 +1108,8 @@ MagickExport Image *BilateralBlurImage(const Image *image,const size_t width,
alpha,
beta;
- r=p-(ssize_t) (GetPixelChannels(image)*MagickMax(width,1)*(size_t) (mid.y-v)+
- GetPixelChannels(image)*(size_t) (mid.x-u));
+ r=p-(ssize_t) (GetPixelChannels(image)*MagickMax(width,1)*(size_t)
+ (mid.y-v)+GetPixelChannels(image)*(size_t) (mid.x-u));
alpha=(double) (QuantumScale*(double) GetPixelAlpha(image,p));
beta=(double) (QuantumScale*(double) GetPixelAlpha(image,r));
pixel+=weights[id][n]*(double) r[i];
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index e5894517e..48b9f11d4 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -1279,7 +1279,8 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
image->colormap[i].red=luma+color_correction.saturation*cdl_map[
ScaleQuantumToMap(ClampToQuantum(image->colormap[i].red))].red-luma;
image->colormap[i].green=luma+color_correction.saturation*cdl_map[
- ScaleQuantumToMap(ClampToQuantum(image->colormap[i].green))].green-luma;
+ ScaleQuantumToMap(ClampToQuantum(image->colormap[i].green))].green-
+ luma;
image->colormap[i].blue=luma+color_correction.saturation*cdl_map[
ScaleQuantumToMap(ClampToQuantum(image->colormap[i].blue))].blue-luma;
}
@@ -4553,7 +4554,8 @@ MagickExport MagickBooleanType WhiteBalanceImage(Image *image,
#pragma omp atomic
#endif
progress++;
- proceed=SetImageProgress(image,WhiteBalanceImageTag,progress,image->rows);
+ proceed=SetImageProgress(image,WhiteBalanceImageTag,progress,
+ image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
diff --git a/coders/svg.c b/coders/svg.c
index 732f9a14e..85212b8af 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -3418,6 +3418,7 @@ ModuleExport size_t RegisterSVGImage(void)
entry=AcquireMagickInfo("SVG","SVG","Scalable Vector Graphics");
entry->decoder=(DecodeImageHandler *) ReadSVGImage;
entry->encoder=(EncodeImageHandler *) WriteSVGImage;
+ entry->flags^=CoderBlobSupportFlag;
entry->mime_type=ConstantString("image/svg+xml");
if (*version != '\0')
entry->version=ConstantString(version);