Merge from default. Hope I did it right...

2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
--- a/rtengine/stdimagesource.h
+++ b/rtengine/stdimagesource.h
@@ -46,6 +46,7 @@ class StdImageSource : public ImageSource {
        ColorTemp   getWB       () { return wb; }
        ColorTemp   getAutoWB   ();
        ColorTemp   getSpotWB   (std::vector<Coord2D> red, std::vector<Coord2D> green, std::vector<Coord2D>& blue, int tran);
+        bool        isWBProviderReady () { return true; };

        void        getAutoExpHistogram (LUTu &histogram, int& histcompr);