synced with master (merged master into gtk3)

2015-10-17 16:23:10 +02:00
parent d8e4709458 26b5d4f25e
commit 35775f3b3f
98 changed files with 6601 additions and 1473 deletions
--- a/rtengine/previewimage.cc
+++ b/rtengine/previewimage.cc
@@ -112,6 +112,9 @@ PreviewImage::PreviewImage (const Glib::ustring &fname, const Glib::ustring &ext
            rtengine::Image8 *output = NULL;
            const unsigned char *data = NULL;
            int fw, fh;
+            LUTf cdcurve;
+            bool dehacontlutili = false;
+
            procparams::ProcParams params;
            /*rtengine::RAWParams raw;
            rtengine::LensProfParams lensProf;