callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug-ins: fix incorrect loading of psd cmyk merged images

Browse Source 
I don't know what I was seeing when I added this several years ago,
but I can't find any psd CMYK images where the merged image is RGB.

It is wrong for the CMYK images we have and there are none so far
that do conform to it, so let's remove this code.
This commit is contained in:
Jacob Boerema
2025-01-21 16:52:29 -05:00
parent 4203761708
commit 8b50f186b9
1 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
plug-ins/file-psd/psd-load.c
View File

@ -2816,7 +2816,6 @@ add_merged_image (GimpImage *image,
gint i;
gboolean alpha_visible;
gboolean alpha_channel = FALSE;
gboolean original_mode_CMYK = FALSE;
GeglBuffer *buffer;
GimpImageType image_type;
GeglColor *alpha_rgb;
@ -2848,19 +2847,6 @@ add_merged_image (GimpImage *image,
extra_channels = total_channels - 4;
}
if (img_a->merged_image_only &&
img_a->color_mode == PSD_CMYK &&
img_a->num_layers > 0)
{
/* In this case there is no conversion. Merged image is RGB. */
img_a->color_mode = PSD_RGB;
original_mode_CMYK = TRUE;
if (! img_a->transparency)
{
total_channels--;
}
}
if (extra_channels > 0)
{
if (img_a->transparency)
@ -3030,37 +3016,6 @@ add_merged_image (GimpImage *image,
g_free (pixels);
pixels = dst0;
}
else if (original_mode_CMYK && img_a->transparency)
{
gint irow;
guchar *dst0, *dst;
guchar *data;
dst0 = g_malloc (base_channels * layer_size * sizeof(guchar));
dst = dst0;
data = pixels;
/* CMYKA layers: 5 channels but merged image is RGBA
* with RGB in the first 3 layers and A in 5th layer.
* Move A to 4th layer. */
for (irow = 0; irow < img_a->rows; irow++)
{
gint icol;
for (icol = 0; icol < img_a->columns; icol++)
{
dst[0] = data[0];
dst[1] = data[1];
dst[2] = data[2];
dst[3] = data[4];
dst += 4;
data += 5;
}
}
g_free (pixels);
pixels = dst0;
}
gegl_buffer_set (buffer,
GEGL_RECTANGLE (0, 0,