[gimp/gimp-2-10] Issue 2206: Error message when opening "MULTICHANNEL" PSD...

[Michael Natterer <mitch src gnome org>]

commit 19a8e763394a0c4fe81da6a38668531bbf435f7d
Author: Massimo Valentini <mvalentini335 gmail com>
Date:   Fri Jul 26 13:39:32 2019 +0200

    Issue 2206: Error message when opening "MULTICHANNEL" PSD...
    
    ...files (file attached)
    
    (cherry picked from commit 0a1e9d1190c4d2d2b2e0139c55e31cf6543c7d46)

 plug-ins/file-psd/psd-load.c | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/plug-ins/file-psd/psd-load.c b/plug-ins/file-psd/psd-load.c
index 746c189283..c1a1acce48 100644
--- a/plug-ins/file-psd/psd-load.c
+++ b/plug-ins/file-psd/psd-load.c
@@ -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 (gint32     image_id,
     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) &&