From 9dc19120c2f91a28e441decf62695e08cb704e54 Mon Sep 17 00:00:00 2001
From: Oliver Duis <oduis@hotmail.com>
Date: Sun, 4 Sep 2011 09:20:33 +0200
Subject: [PATCH] Fixed enabling shadow/highlights on some pics clips
 highlights; weired artifacts with negatives latter fix by Emil; see issue 965

---
 rtengine/improcfun.cc | 12 ++++++------
 rtengine/shmap.cc     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index d4cbf6267..c315f0301 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -304,14 +304,14 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, LUTf & hltone
                 }
                 if (processLCE) {
                     double sub = lceamount*(mapval-factor*(r*lumimul[0] + g*lumimul[1] + b*lumimul[2]));
-                    r = CLIP(factor*r-sub);
-                    g = CLIP(factor*g-sub);
-                    b = CLIP(factor*b-sub);
+                    r = factor*r-sub;
+                    g = factor*g-sub;
+                    b = factor*b-sub;
                 }
                 else {
-                    r = CLIP(factor*r);
-                    g = CLIP(factor*g);
-                    b = CLIP(factor*b);
+                    r = factor*r;
+                    g = factor*g;
+                    b = factor*b;
                 }
             }
 
diff --git a/rtengine/shmap.cc b/rtengine/shmap.cc
index cd0dafce2..9f8d72713 100644
--- a/rtengine/shmap.cc
+++ b/rtengine/shmap.cc
@@ -59,7 +59,7 @@ void SHMap::update (Imagefloat* img, double radius, double lumi[3], bool hq, int
     // fill with luminance
     for (int i=0; i<H; i++)
         for (int j=0; j<W; j++) {
-			map[i][j] = lumi[0]*img->r[i][j] + lumi[1]*img->g[i][j] + lumi[2]*img->b[i][j];
+            map[i][j] = fabs(lumi[0]*img->r[i][j]) + fabs(lumi[1]*img->g[i][j]) + fabs(lumi[2]*img->b[i][j]);
 		}
 #ifdef _OPENMP
 #pragma omp parallel