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/image16.h
+++ b/rtengine/image16.h
@@ -0,0 +1,86 @@
+/*
+ *  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/>.
+ */
+//
+// A class representing a 16 bit rgb image with separate planes and 16 byte aligned data
+//
+#ifndef _IMAGE16_
+#define _IMAGE16_
+
+#include <imageio.h>
+#include <rtengine.h>
+
+namespace rtengine {
+
+enum TypeInterpolation { TI_Nearest, TI_Bilinear };
+
+class Image16 : public ImageIO, public IImage16 {
+
+    private:
+        unsigned char* unaligned;
+
+    public:
+        int rowstride;
+        int planestride;
+
+        int width;
+        int height;
+
+        unsigned short* data;
+        
+        unsigned short** r;
+        unsigned short** g;
+        unsigned short** b;
+  
+  
+        Image16 ();
+        Image16 (int width, int height);
+        ~Image16 ();
+
+        Image16* copy ();
+
+        Image16* rotate (int deg);
+        Image16* hflip ();
+        Image16* vflip ();
+        Image16* resize (int nw, int nh, TypeInterpolation interp);
+
+        virtual int     getW            () { return width;  }
+        virtual int     getH            () { return height; }
+        virtual void    allocate        (int width, int height);
+        virtual int     getBPS          () { return 16; }
+        virtual void    getScanline     (int row, unsigned char* buffer, int bps);
+        virtual void    setScanline     (int row, unsigned char* buffer, int bps);
+
+        // functions inherited from IImage16:
+        virtual Glib::Mutex& getMutex () { return mutex (); }
+        virtual cmsHPROFILE getProfile () { return getEmbeddedProfile (); }
+        virtual int getWidth ()  { return width; }
+        virtual int getHeight () { return height; }
+        virtual int getBitsPerPixel () { return 16; }
+        virtual int saveToFile (Glib::ustring fname) { return save (fname); }
+        virtual int saveAsPNG  (Glib::ustring fname, int compression = -1, int bps = -1) { return savePNG (fname, compression, bps); }
+        virtual int saveAsJPEG (Glib::ustring fname, int quality = 100) { return saveJPEG (fname, quality); }
+        virtual int saveAsTIFF (Glib::ustring fname, int bps = -1, bool uncompressed = false) { return saveTIFF (fname, bps, uncompressed); }
+        virtual void setSaveProgressListener (ProgressListener* pl) { return setProgressListener (pl); } 
+        virtual void free () { delete this; }
+        virtual unsigned short** getRPlane () { return r; }
+        virtual unsigned short** getGPlane () { return g; }
+        virtual unsigned short** getBPlane () { return b; }
+};
+};
+#endif