Fixed type in English translations for false color suppression, as patched by Eric Mountain

rtengine/shmap.cc

@@ -0,0 +1,135 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <shmap.h>
+#include <gauss.h>
+#include <bilateral2.h>
+#include <rtengine.h>
+
+#undef THREAD_PRIORITY_NORMAL
+#define MAXVAL  0xffff
+#define CLIP(a) ((a)>0?((a)<MAXVAL?(a):MAXVAL):0)
+
+namespace rtengine {
+
+extern const Settings* settings;
+
+SHMap::SHMap (int w, int h) : W(w), H(h) {
+
+    map = new unsigned short*[H];
+    for (int i=0; i<H; i++)
+        map[i] = new unsigned short[W];
+}
+
+SHMap::~SHMap () {
+
+    for (int i=0; i<H; i++)
+        delete [] map[i];
+    delete [] map;
+}
+
+void SHMap::update (Image16* img, unsigned short** buffer, double radius, double lumi[3], bool hq) {
+
+    // fill with luminance
+    for (int i=0; i<H; i++)
+        for (int j=0; j<W; j++) {
+			int val = lumi[0]*img->r[i][j] + lumi[1]*img->g[i][j] + lumi[2]*img->b[i][j];
+			map[i][j] = CLIP(val);
+		}
+
+//MyTime t1,t2;
+//t1.set ();
+
+    if (!hq) {
+
+        AlignedBuffer<double>* buffer1 = new AlignedBuffer<double> (MAX(W,H)*5);
+        AlignedBuffer<double>* buffer2 = new AlignedBuffer<double> (MAX(W,H)*5);
+
+        // blur
+        if (settings->dualThreadEnabled) {
+            Glib::Thread *thread1 = Glib::Thread::create(sigc::bind(sigc::ptr_fun(gaussHorizontal_unsigned), map, map, buffer1, W, 0, H/2, radius), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
+            Glib::Thread *thread2 = Glib::Thread::create(sigc::bind(sigc::ptr_fun(gaussHorizontal_unsigned), map, map, buffer2, W, H/2, H, radius), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
+            thread1->join ();
+            thread2->join ();
+            thread1 = Glib::Thread::create(sigc::bind(sigc::ptr_fun(gaussVertical_unsigned), map, map, buffer1, H, 0, W/2, radius), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
+            thread2 = Glib::Thread::create(sigc::bind(sigc::ptr_fun(gaussVertical_unsigned), map, map, buffer2, H, W/2, W, radius), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
+            thread1->join ();
+            thread2->join ();
+        }
+        else {
+            gaussHorizontal_unsigned (map, map, buffer1, W, 0, H, radius);
+            gaussVertical_unsigned (map, map, buffer1, H, 0, W, radius);
+        }    
+
+        delete buffer1;
+        delete buffer2;
+    }
+    else {
+        if (settings->dualThreadEnabled) {
+            bilateralparams r1, r2;
+            r1.row_from = 0;
+            r1.row_to = H/2;
+            r2.row_from = H/2;
+            r2.row_to = H;
+            Glib::Thread *thread1 = Glib::Thread::create(sigc::bind(sigc::ptr_fun(bilateral_box_unsigned), map, buffer, W, H, 8000, radius, r1), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
+            Glib::Thread *thread2 = Glib::Thread::create(sigc::bind(sigc::ptr_fun(bilateral_box_unsigned), map, buffer, W, H, 8000, radius, r2), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
+            thread1->join ();
+            thread2->join ();
+        }
+        else {
+            bilateralparams r1;
+            r1.row_from = 0;
+            r1.row_to = H;
+            bilateral_box_unsigned (map, buffer, W, H, 8000, radius, r1);
+        }
+        for (int i=0; i<H; i++)
+            for (int j=0; j<W; j++)
+                if (i>0 && j>0 && i<H-1 && j<W-1)
+                    map[i][j] = (buffer[i-1][j-1]+buffer[i-1][j]+buffer[i-1][j+1]+buffer[i][j-1]+buffer[i][j]+buffer[i][j+1]+buffer[i+1][j-1]+buffer[i+1][j]+buffer[i+1][j+1])/9;
+                else
+                    map[i][j] = buffer[i][j];
+    }
+
+//    t2.set ();
+//    printf ("shmap: %d\n", t2.etime (t1));
+
+    // update average, minimum, maximum
+    double _avg = 0;
+    int n = 1;
+    min = 65535;
+    max = 0;
+    for (int i=32; i<H-32; i++)
+        for (int j=32; j<W-32; j++) {
+            int val = map[i][j];
+            if (val < min)
+                min = val;
+            if (val > max)
+                max = val;
+            _avg = 1.0/n * val + (1.0 - 1.0/n) * _avg;
+            n++;
+        }
+    avg = (int) _avg;
+}
+
+void SHMap::forceStat (unsigned short max_, unsigned short min_, unsigned short avg_) {
+
+    max = max_;
+    min = min_;
+    avg = avg_;
+}
+}