Changes to black compression and saturation controls. Black compression from 0-50 acts the same as 0-100 on the previous version, compressing dark tones without crushing blacks. 50-100 then starts crushing blacks until by 100 on the slider, all tones up to the set black point are sent to zero. In the new saturation control, negative values of the slider set a linear curve rather than an inverted S curve, and smoothly decrease saturation to zero across the board.

2010-10-26 22:59:18 -05:00
commit 926056c2c2
620 changed files with 130476 additions and 0 deletions
--- a/rtengine/stdimagesource.h
+++ b/rtengine/stdimagesource.h
@@ -0,0 +1,73 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _STDIMAGESOURCE_
+#define _STDIMAGESOURCE_
+
+#include <imagesource.h>
+
+namespace rtengine {
+
+class StdImageSource : public ImageSource {
+
+    protected:
+        Image16* img;
+        ColorTemp wb;
+        ProgressListener* plistener;
+        bool full;
+        float** hrmap[3];
+		char** needhr;
+        int max[3];
+
+        void updateHLRecoveryMap ();
+        void hlRecovery          (unsigned short* red, unsigned short* green, unsigned short* blue, int i, int sx1, int sx2, int skip);
+        void transform           (PreviewProps pp, int tran, int &sx1, int &sy1, int &sx2, int &sy2);
+        void transformPixel      (int x, int y, int tran, int& tx, int& ty);
+        
+    public:
+        StdImageSource ();
+        ~StdImageSource ();
+    
+        int         load        (Glib::ustring fname, bool batch = false);
+        void        getImage    (ColorTemp ctemp, int tran, Image16* image, PreviewProps pp, HRecParams hrp, ColorManagementParams cmp);
+        ColorTemp   getWB       () { return wb; }
+        ColorTemp   getAutoWB   ();
+        ColorTemp   getSpotWB   (std::vector<Coord2D> red, std::vector<Coord2D> green, std::vector<Coord2D>& blue, int tran);
+
+        int         getAEHistogram (unsigned int* histogram, int& histcompr);
+        
+        double      getDefGain  () { return 0.0; }
+        double      getGamma    () { return 0.0; }
+        
+        void        getFullSize (int& w, int& h, int tr = TR_NONE);
+        void        getSize     (int tran, PreviewProps pp, int& w, int& h);
+
+        ImageData*  getImageData () { return idata; }
+        void        setProgressListener (ProgressListener* pl) { plistener = pl; }
+        static void colorSpaceConversion (Image16* im, ColorManagementParams cmp, cmsHPROFILE embedded);
+
+
+        static inline double intpow (double a, int b) { double r = 1.0; for (int i=0; i<b; i++) r *= a; return r; }
+
+    protected:
+        void    getImage_   (ColorTemp ctemp, int tran, Image16* image, PreviewProps pp, bool first, HRecParams hrp);
+        void    hflip       (Image16* im);
+        void    vflip       (Image16* im);
+};
+};
+#endif