Commit 1e87687ba for imagemagick.org
commit 1e87687ba0512ce68b84524ebcdf69456245e407
Author: Cristy <urban-warrior@imagemagick.org>
Date: Wed Mar 25 08:42:36 2026 -0400
sync image pixels before writing
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 6f5c44152..85cd3d57a 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -1290,7 +1290,7 @@ MagickPrivate cl_mem GetAuthenticOpenCLBuffer(const Image *image,
cache_info=(CacheInfo *) image->cache;
if ((cache_info->type == UndefinedCache) || (cache_info->reference_count > 1))
{
- SyncImagePixelCache((Image *) image,exception);
+ (void) SyncImagePixelCache((Image *) image,exception);
cache_info=(CacheInfo *) image->cache;
}
if ((cache_info->type != MemoryCache) || (cache_info->mapped != MagickFalse))
diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index f57f4656f..d15d7af86 100644
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -46,6 +46,7 @@
#include "MagickCore/exception.h"
#include "MagickCore/exception-private.h"
#include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
#include "MagickCore/client.h"
#include "MagickCore/coder-private.h"
#include "MagickCore/colorspace-private.h"
@@ -1278,6 +1279,7 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
image->endian=(*(char *) &lsb_first) == 1 ? LSBEndian : MSBEndian;
}
}
+ (void) SyncImagePixelCache(image,exception);
SyncImageProfiles(image);
DisassociateImageStream(image);
option=GetImageOption(image_info,"delegate:bimodal");
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 42374f6dc..f7a7197d6 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2529,8 +2529,6 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info,
{
case CMYKColorspace:
{
- if (image->ping != MagickFalse)
- (void) SetImageStorageClass(image,DirectClass,exception);
jpeg_info->input_components=4;
jpeg_info->in_color_space=JCS_CMYK;
break;