From ff64e656bc084916844891298934e45618a3cb12 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Oct 2016 09:39:14 +0200 Subject: [PATCH 1/3] Sets Wavelet sub-tools to "off" by default, #3386 --- rtengine/procparams.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 70b764da1..0b4d2a5b6 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -753,13 +753,13 @@ void WaveletParams::setDefaults() hhcurve.push_back(FCT_Linear); Chcurve.clear (); Chcurve.push_back(FCT_Linear); - expcontrast = true; - expchroma = true; - expedge = true; - expresid = true; - expfinal = true; - exptoning = true; - expnoise = true; + expcontrast = false; + expchroma = false; + expedge = false; + expresid = false; + expfinal = false; + exptoning = false; + expnoise = false; for(int i = 0; i < 9; i ++) { c[i] = 0; From e902091fe9f9d1356ddef7c78c0813bb66055e93 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Oct 2016 09:46:42 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Fix=20crash=20when=20toggling=20Before|Afte?= =?UTF-8?q?r=20view,=20by=20Fl=C3=B6ssie,=20fixes=20#3454?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rtgui/cropwindow.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc index f7d7c3001..a4d7ded47 100644 --- a/rtgui/cropwindow.cc +++ b/rtgui/cropwindow.cc @@ -2535,8 +2535,10 @@ void CropWindow::setCropGUIListener (CropGUIListener* cgl) void CropWindow::setPointerMotionListener (PointerMotionListener* pml) { pmlistener = pml; - pml->signal_cycle_rgb().connect( sigc::mem_fun(*this, &CropWindow::cycleRGB) ); - pml->signal_cycle_hsv().connect( sigc::mem_fun(*this, &CropWindow::cycleHSV) ); + if (pml) { + pml->signal_cycle_rgb().connect( sigc::mem_fun(*this, &CropWindow::cycleRGB) ); + pml->signal_cycle_hsv().connect( sigc::mem_fun(*this, &CropWindow::cycleHSV) ); + } } PointerMotionListener* CropWindow::getPointerMotionListener () From 554bbf18933a43ca90bc6fbbe6dbe9f48247b999 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 11 Oct 2016 22:08:03 +0200 Subject: [PATCH 3/3] Deleted clean.sh --- clean.sh | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100755 clean.sh diff --git a/clean.sh b/clean.sh deleted file mode 100755 index 5500bf28e..000000000 --- a/clean.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -find -name CMakeCache.txt -delete -rm install_manifest.txt - -rm -r ./CMakeFiles -rm -r ./rtengine/CMakeFiles -rm -r ./rtexif/CMakeFiles -rm -r ./rtgui/CMakeFiles -rm -r ./rtdata/CMakeFiles - -rm ./cmake* -rm ./rtengine/cmake* -rm ./rtexif/cmake* -rm ./rtgui/cmake* -rm ./rtdata/cmake* - -rm ./Makefile -rm ./rtengine/Makefile -rm ./rtexif/Makefile -rm ./rtgui/Makefile -rm ./rtdata/Makefile - -rm ./rtengine/librtengine.so -rm ./rtengine/librtengine.a -rm ./rtgui/rawtherapee -rm ./rtexif/librtexif.so -rm ./rtexif/librtexif.a -exit 0