[gimp] plug-ins: store a CMYK profile as soft-proof profile in the right place.

[Jehan <jehanp src gnome org>]

commit 8feddf9cd508fdc7412e585611df11bdd27340cd
Author: Jehan <jehan girinstud io>
Date:   Thu Jul 21 14:34:31 2022 +0200

    plug-ins: store a CMYK profile as soft-proof profile in the right place.
    
    Fixing !646. The call to gimp_image_set_simulation_profile() was only
    happening for merged PSD mode (either explicit call or when
    special-cases such as no layers).
    
    This is the right place to store the CMYK profile in all cases.

 plug-ins/file-psd/psd-image-res-load.c | 2 ++
 plug-ins/file-psd/psd-load.c           | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/plug-ins/file-psd/psd-image-res-load.c b/plug-ins/file-psd/psd-image-res-load.c
index 86a1f0f660..7b63b92aee 100644
--- a/plug-ins/file-psd/psd-image-res-load.c
+++ b/plug-ins/file-psd/psd-image-res-load.c
@@ -1161,6 +1161,8 @@ load_resource_1039 (const PSDimageres  *res_a,
           gimp_color_profile_is_cmyk (profile))
         {
           img_a->cmyk_profile = profile;
+          /* Store CMYK profile in GimpImage if attached */
+          gimp_image_set_simulation_profile (image, img_a->cmyk_profile);
         }
       else if (img_a->color_mode == PSD_LAB)
         {
diff --git a/plug-ins/file-psd/psd-load.c b/plug-ins/file-psd/psd-load.c
index b7a601ce89..3ead2ff199 100644
--- a/plug-ins/file-psd/psd-load.c
+++ b/plug-ins/file-psd/psd-load.c
@@ -2472,11 +2472,6 @@ add_merged_image (GimpImage     *image,
                                     error);
           g_free (pixels);
           pixels = dst0;
-
-          /* Store CMYK profile in GimpImage if attached */
-          if (img_a->cmyk_profile &&
-              gimp_color_profile_is_cmyk (img_a->cmyk_profile))
-            gimp_image_set_simulation_profile (image, img_a->cmyk_profile);
        }
       else if (img_a->color_mode == PSD_LAB)
         {