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/stdimagesource.cc
+++ b/rtengine/stdimagesource.cc
@@ -43,7 +43,7 @@ template<class T> T** allocArray (int W, int H) {
 }

 #define HR_SCALE 2
-StdImageSource::StdImageSource () : ImageSource(), plistener(NULL), img(NULL) {
+StdImageSource::StdImageSource () : ImageSource(), img(NULL), plistener(NULL) {

    hrmap[0] = NULL;
    hrmap[1] = NULL;