From c2ed31991bd8faee2882c7f997c5a663e82c5518 Mon Sep 17 00:00:00 2001
From: Ingo Weyrich <heckflosse67@gmx.de>
Date: Thu, 14 Nov 2019 11:57:55 +0100
Subject: [PATCH] Capture sharpening: fix broken non SSE build

---
 rtengine/capturesharpening.cc | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/rtengine/capturesharpening.cc b/rtengine/capturesharpening.cc
index 60f83a652..2866839bf 100644
--- a/rtengine/capturesharpening.cc
+++ b/rtengine/capturesharpening.cc
@@ -503,14 +503,14 @@ bool checkForStop(float** tmpIThr, float** iterCheck, int fullTileSize, int bord
     for (int ii = border; !stopped && ii < fullTileSize - border; ++ii) {
 #ifdef __SSE2__
         for (int jj = border; jj < fullTileSize - border; jj += 4) {
-            if (_mm_movemask_ps((vfloat)vmaskf_lt(vmul2f(LVFU(tmpIThr[ii][jj])), LVFU(iterCheck[ii - border][jj - border])))) {
+            if (_mm_movemask_ps((vfloat)vmaskf_lt(LVFU(tmpIThr[ii][jj]), LVFU(iterCheck[ii - border][jj - border])))) {
                 stopped = true;
                 break;
             }
         }
 #else
         for (int jj = border; jj < fullTileSize - border; ++jj) {
-            if (tmpIThr[ii][jj] * xxx < luminance[i + ii - border][j + jj - border] * clipmask[i + ii - border][j + jj - border]) {
+            if (tmpIThr[ii][jj] < iterCheck[ii - border][jj - border]) {
                 stopped = true;
                 break;
             }
@@ -566,9 +566,11 @@ BENCHFUN
                 // fill tiles
                 if (endOfRow || endOfCol) {
                     // special handling for small tiles at end of row or column
-                    for (int k = 0, ii = endOfCol ? H - fullTileSize + border : i; k < tileSize; ++k, ++ii) {
-                        for (int l = 0, jj = endOfRow ? W - fullTileSize + border : j; l < tileSize; ++l, ++jj) {
-                            iterCheck[k][l] = oldLuminance[ii][jj] * clipmask[ii][jj];
+                    if (checkIterStop) {
+                        for (int k = 0, ii = endOfCol ? H - fullTileSize + border : i; k < tileSize; ++k, ++ii) {
+                            for (int l = 0, jj = endOfRow ? W - fullTileSize + border : j; l < tileSize; ++l, ++jj) {
+                                iterCheck[k][l] = oldLuminance[ii][jj] * clipmask[ii][jj] * 0.5f;
+                            }
                         }
                     }
                     for (int k = 0, ii = endOfCol ? H - fullTileSize : i; k < fullTileSize; ++k, ++ii) {
@@ -578,9 +580,11 @@ BENCHFUN
                         }
                     }
                 } else {
-                    for (int ii = 0; ii < tileSize; ++ii) {
-                        for (int jj = 0; jj < tileSize; ++jj) {
-                            iterCheck[ii][jj] = oldLuminance[i + ii][j + jj] * clipmask[i + ii][j + jj];
+                    if (checkIterStop) {
+                        for (int ii = 0; ii < tileSize; ++ii) {
+                            for (int jj = 0; jj < tileSize; ++jj) {
+                                iterCheck[ii][jj] = oldLuminance[i + ii][j + jj] * clipmask[i + ii][j + jj] * 0.5f;
+                            }
                         }
                     }
                     for (int ii = i; ii < i + fullTileSize; ++ii) {