From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 12 Apr 2014 22:59:20 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2453
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=216b90f9cd72e8dbcc34653fe1e040ab4f876a5e;p=imagemagick

---

diff --git a/coders/psd.c b/coders/psd.c
index 86ffbe195..557af04fb 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -245,20 +245,21 @@ static const char *CompositeOperatorToPSDBlendMode(CompositeOperator op)
 
   switch (op)
   {
-    case OverCompositeOp:    blend_mode = "norm";  break;
-    case MultiplyCompositeOp:  blend_mode = "mul ";  break;
-    case DissolveCompositeOp:  blend_mode = "diss";  break;
-    case DifferenceCompositeOp:  blend_mode = "diff";  break;
-    case DarkenCompositeOp:    blend_mode = "dark";  break;
-    case LightenCompositeOp:  blend_mode = "lite";  break;
-    case HueCompositeOp:    blend_mode = "hue ";  break;
-    case SaturateCompositeOp:  blend_mode = "sat ";  break;
-    case ColorizeCompositeOp:  blend_mode = "colr";  break;
-    case LuminizeCompositeOp:  blend_mode = "lum ";  break;
-    case ScreenCompositeOp:    blend_mode = "scrn";  break;
-    case OverlayCompositeOp:  blend_mode = "over";  break;
-    default:
-      blend_mode = "norm";
+    case ColorizeCompositeOp:   blend_mode = "colr";  break;
+    case DarkenCompositeOp:     blend_mode = "dark";  break;
+    case DifferenceCompositeOp: blend_mode = "diff";  break;
+    case DissolveCompositeOp:   blend_mode = "diss";  break;
+    case HardLightCompositeOp:  blend_mode = "hLit";  break;
+    case HueCompositeOp:        blend_mode = "hue ";  break;
+    case LightenCompositeOp:    blend_mode = "lite";  break;
+    case LuminizeCompositeOp:   blend_mode = "lum ";  break;
+    case MultiplyCompositeOp:   blend_mode = "mul ";  break;
+    case OverCompositeOp:       blend_mode = "norm";  break;
+    case OverlayCompositeOp:    blend_mode = "over";  break;
+    case SaturateCompositeOp:   blend_mode = "sat ";  break;
+    case ScreenCompositeOp:     blend_mode = "scrn";  break;
+    case SoftLightCompositeOp:  blend_mode = "sLit";  break;
+    default:                    blend_mode = "norm";
   }
   return(blend_mode);
 }
@@ -613,9 +614,9 @@ static CompositeOperator PSDBlendModeToCompositeOperator(const char *mode)
   if (LocaleNCompare(mode,"over",4) == 0)
     return(OverlayCompositeOp);
   if (LocaleNCompare(mode,"hLit",4) == 0)
-    return(OverCompositeOp);
+    return(HardLightCompositeOp);
   if (LocaleNCompare(mode,"sLit",4) == 0)
-    return(OverCompositeOp);
+    return(SoftLightCompositeOp);
   if (LocaleNCompare(mode,"smud",4) == 0)
     return(OverCompositeOp);
   if (LocaleNCompare(mode,"div ",4) == 0)