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/rtengine/image8.cc
+++ b/rtengine/image8.cc
@@ -23,11 +23,11 @@ using namespace rtengine;


 Image8::Image8 () 
-  : width(-1), height(-1), data(NULL) {
+  : data(NULL), width(-1), height(-1) {
 }

 Image8::Image8 (int w, int h) 
-  : width(w), height (h), data(NULL) {
+  : data(NULL), width(w), height (h) {
  
    allocate (w, h);
 }