Merge branch 'master' into gtk3

2016-04-17 20:12:30 +02:00
parent 8653ed0e22 f7af57d11e
commit 098603c647
7 changed files with 140 additions and 92 deletions
--- a/rtgui/cropwindow.cc
+++ b/rtgui/cropwindow.cc
@@ -1899,6 +1899,7 @@ void CropWindow::zoomFitCrop ()
        int centerX, centerY;
        centerX = cropHandler.cropParams.x + cropHandler.cropParams.w / 2;
        centerY = cropHandler.cropParams.y + cropHandler.cropParams.h / 2;
+        setCropAnchorPosition(centerX, centerY);
        changeZoom (cz, true, centerX, centerY);
        fitZoom = false;
    }
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -27,7 +27,7 @@
 #define MAXTEMP 60000  //12000
 #define CENTERTEMP 4750
 #define MINGREEN 0.02
-#define MAXGREEN 5.0
+#define MAXGREEN 10.0
 #define MINEQUAL 0.8
 #define MAXEQUAL 1.5