Commit 0a1e9d11 authored by Massimo Valentini's avatar Massimo Valentini Committed by Michael Natterer

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

...files (file attached)
parent 7486028e
......@@ -328,6 +328,7 @@ read_header_block (PSDimage *img_a,
&& img_a->color_mode != PSD_GRAYSCALE
&& img_a->color_mode != PSD_INDEXED
&& img_a->color_mode != PSD_RGB
&& img_a->color_mode != PSD_MULTICHANNEL
&& img_a->color_mode != PSD_DUOTONE)
{
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)
{
case PSD_MULTICHANNEL:
case PSD_GRAYSCALE:
case PSD_DUOTONE:
img_a->base_type = GIMP_GRAY;
......@@ -1721,6 +1723,7 @@ add_merged_image (GimpImage *image,
bps++;
if ((img_a->color_mode == PSD_BITMAP ||
img_a->color_mode == PSD_MULTICHANNEL ||
img_a->color_mode == PSD_GRAYSCALE ||
img_a->color_mode == PSD_DUOTONE ||
img_a->color_mode == PSD_INDEXED) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment