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

Issue 2206: Error message when opening "MULTICHANNEL" PSD...

Browse Source 
...files (file attached)
This commit is contained in:
Massimo Valentini
2019-07-26 13:39:32 +02:00
committed by Michael Natterer
parent 7486028ec9
commit 0a1e9d1190
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,6 +328,7 @@ read_header_block (PSDimage *img_a,
&& img_a->color_mode != PSD_GRAYSCALE && img_a->color_mode != PSD_GRAYSCALE
&& img_a->color_mode != PSD_INDEXED && img_a->color_mode != PSD_INDEXED
&& img_a->color_mode != PSD_RGB && img_a->color_mode != PSD_RGB
&& img_a->color_mode != PSD_MULTICHANNEL
&& img_a->color_mode != PSD_DUOTONE) && img_a->color_mode != PSD_DUOTONE)
{ {
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
@ -982,6 +983,7 @@ create_gimp_image (PSDimage *img_a,
switch (img_a->color_mode) switch (img_a->color_mode)
{ {
case PSD_MULTICHANNEL:
case PSD_GRAYSCALE: case PSD_GRAYSCALE:
case PSD_DUOTONE: case PSD_DUOTONE:
img_a->base_type = GIMP_GRAY; img_a->base_type = GIMP_GRAY;
@ -1721,6 +1723,7 @@ add_merged_image (GimpImage *image,
bps++; bps++;
if ((img_a->color_mode == PSD_BITMAP || if ((img_a->color_mode == PSD_BITMAP ||
img_a->color_mode == PSD_MULTICHANNEL ||
img_a->color_mode == PSD_GRAYSCALE || img_a->color_mode == PSD_GRAYSCALE ||
img_a->color_mode == PSD_DUOTONE || img_a->color_mode == PSD_DUOTONE ||
img_a->color_mode == PSD_INDEXED) && img_a->color_mode == PSD_INDEXED) &&