Commit dc950e22f for imagemagick.org
commit dc950e22f0e1fd76dbab9b927353c638b7a8aa2a
Author: Dirk Lemstra <dirk@lemstra.org>
Date: Sat Nov 14 13:40:53 2026 +0100
Serialize ASHLAR tile composition and annotation (GHSA-5545-xpgp-wj32)
diff --git a/coders/ashlar.c b/coders/ashlar.c
index e74356552..1ecee17cd 100644
--- a/coders/ashlar.c
+++ b/coders/ashlar.c
@@ -624,10 +624,6 @@ static Image *ASHLARImage(ImageInfo *image_info,Image *image,
value=GetImageOption(image_info,"label");
extent.width=0;
extent.height=0;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic) shared(status,extent) \
- magick_number_threads(image,image,n,1)
-#endif
for (i=0; i < n; i++)
{
Image
@@ -676,16 +672,11 @@ static Image *ASHLARImage(ImageInfo *image_info,Image *image,
draw_info=DestroyDrawInfo(draw_info);
}
}
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical
-#endif
- {
- if (((ssize_t) tiles[i].width+tiles[i].x) > (ssize_t) extent.width)
- extent.width=(size_t) ((ssize_t) tiles[i].width+tiles[i].x);
- if (((ssize_t) tiles[i].height+tiles[i].y+geometry.y+2) > (ssize_t) extent.height)
- extent.height=(size_t) ((ssize_t) tiles[i].height+tiles[i].y+
- geometry.y+2);
- }
+ if (((ssize_t) tiles[i].width+tiles[i].x) > (ssize_t) extent.width)
+ extent.width=(size_t) ((ssize_t) tiles[i].width+tiles[i].x);
+ if (((ssize_t) tiles[i].height+tiles[i].y+geometry.y+2) > (ssize_t) extent.height)
+ extent.height=(size_t) ((ssize_t) tiles[i].height+tiles[i].y+
+ geometry.y+2);
tile_image=DestroyImage(tile_image);
}
if (image_info->extract != (char *) NULL)