Merge from default branch

2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
--- a/rtgui/crophandler.cc
+++ b/rtgui/crophandler.cc
@@ -22,11 +22,10 @@
 using namespace rtengine;

 CropHandler::CropHandler () 
-    : crop(NULL), listener(NULL), cropimg(NULL), ipc(NULL),
-    cx(0), cy(0), cw(0), ch(0), 
-    cropX(0), cropY(0), cropW(0), cropH(0),
-    zoom(1000), enabled(false) {
-        
+    : zoom(1000), cx(0), cy(0), cw(0), ch(0),
+    cropX(0), cropY(0), cropW(0), cropH(0), enabled(false),
+    cropimg(NULL), ipc(NULL), crop(NULL), listener(NULL) {
+
    chi = new CropHandlerIdleHelper;
    chi->destroyed = false;
    chi->pending = 0;