From 11b65d3d972938e3790b25ccf85453e5080806df Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Tue, 8 Jan 2019 23:01:35 +0100
Subject: [PATCH] Do not render the PSD opacity mask when the image has no
 alpha channel.

---
 coders/psd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/coders/psd.c b/coders/psd.c
index a143aaaad..95dd4e6bb 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -449,6 +449,8 @@ static MagickBooleanType ApplyPSDOpacityMask(Image *image,const Image *mask,
   ssize_t
     y;
 
+  if (image->alpha_trait == UndefinedPixelTrait)
+    return(MagickTrue);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
       "  applying opacity mask");
@@ -466,7 +468,7 @@ static MagickBooleanType ApplyPSDOpacityMask(Image *image,const Image *mask,
       complete_mask=DestroyImage(complete_mask);
       return(status);
     }
-  image->alpha_trait=BlendPixelTrait;
+
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #pragma omp parallel for schedule(static) shared(status) \
   magick_number_threads(image,image,image->rows,1)
-- 
2.40.0