Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle

2015-08-11 11:55:03 +02:00
parent effb46c3e1
commit 0e0cfb9b25
452 changed files with 133354 additions and 99460 deletions
--- a/rtengine/stdimagesource.h
+++ b/rtengine/stdimagesource.h
@@ -7,7 +7,7 @@
 *  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
@@ -21,55 +21,93 @@

 #include "imagesource.h"

-namespace rtengine {
+namespace rtengine
+{

-class StdImageSource : public ImageSource {
+class StdImageSource : public ImageSource
+{

-    protected:
-        ImageIO* img;
-        ColorTemp wb;
-        ProgressListener* plistener;
-        bool full;
-        float** hrmap[3];
-        char** needhr;
-        int max[3];
-        bool rgbSourceModified;
+protected:
+    ImageIO* img;
+    ColorTemp wb;
+    ProgressListener* plistener;
+    bool full;
+    float** hrmap[3];
+    char** needhr;
+    int max[3];
+    bool rgbSourceModified;

-        //void transformPixel             (int x, int y, int tran, int& tx, int& ty);
-        void getSampleFormat (Glib::ustring &fname, IIOSampleFormat &sFormat, IIOSampleArrangement &sArrangement);
+    //void transformPixel             (int x, int y, int tran, int& tx, int& ty);
+    void getSampleFormat (Glib::ustring &fname, IIOSampleFormat &sFormat, IIOSampleArrangement &sArrangement);

-    public:
-        StdImageSource ();
-        ~StdImageSource ();
+public:
+    StdImageSource ();
+    ~StdImageSource ();

-        int         load        (Glib::ustring fname, bool batch = false);
-        void        getImage    (ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, ToneCurveParams hrp, ColorManagementParams cmp, RAWParams raw);
-        ColorTemp   getWB       () { return wb; }
-        void        getAutoWBMultipliers (double &rm, double &gm, double &bm);
-        ColorTemp   getSpotWB   (std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, int tran, double equal);
+    int         load        (Glib::ustring fname, bool batch = false);
+    void        getImage    (ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, ToneCurveParams hrp, ColorManagementParams cmp, RAWParams raw);
+    ColorTemp   getWB       ()
+    {
+        return wb;
+    }
+    void        getAutoWBMultipliers (double &rm, double &gm, double &bm);
+    ColorTemp   getSpotWB   (std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, int tran, double equal);

-        bool        isWBProviderReady () { return true; };
+    bool        isWBProviderReady ()
+    {
+        return true;
+    };

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

-        double      getDefGain  () { return 0.0; }
+    double      getDefGain  ()
+    {
+        return 0.0;
+    }

-        void        getFullSize (int& w, int& h, int tr = TR_NONE);
-        void        getSize     (int tran, PreviewProps pp, int& w, int& h);
+    void        getFullSize (int& w, int& h, int tr = TR_NONE);
+    void        getSize     (int tran, PreviewProps pp, int& w, int& h);

-        ImageData*  getImageData () { return idata; }
-        ImageIO*    getImageIO   () { return img; }
-        ImageMatrices* getImageMatrices () { return (ImageMatrices*)NULL; }
-        bool        isRAW() const { return false; }
+    ImageData*  getImageData ()
+    {
+        return idata;
+    }
+    ImageIO*    getImageIO   ()
+    {
+        return img;
+    }
+    ImageMatrices* getImageMatrices ()
+    {
+        return (ImageMatrices*)NULL;
+    }
+    bool        isRAW() const
+    {
+        return false;
+    }

-        void        setProgressListener (ProgressListener* pl) { plistener = pl; }
+    void        setProgressListener (ProgressListener* pl)
+    {
+        plistener = pl;
+    }

-        void        convertColorSpace(Imagefloat* image, ColorManagementParams cmp, ColorTemp &wb);// RAWParams raw will not be used for non-raw files (see imagesource.h)
-        static void colorSpaceConversion (Imagefloat* im, ColorManagementParams cmp, cmsHPROFILE embedded, IIOSampleFormat sampleFormat);
-        //static void colorSpaceConversion16 (Image16* im, ColorManagementParams cmp, cmsHPROFILE embedded);
+    void        convertColorSpace(Imagefloat* image, ColorManagementParams cmp, ColorTemp &wb);// RAWParams raw will not be used for non-raw files (see imagesource.h)
+    static void colorSpaceConversion (Imagefloat* im, ColorManagementParams cmp, cmsHPROFILE embedded, IIOSampleFormat sampleFormat);
+    //static void colorSpaceConversion16 (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; }
-        bool        IsrgbSourceModified() {return rgbSourceModified;}
+    static inline double intpow (double a, int b)
+    {
+        double r = 1.0;
+
+        for (int i = 0; i < b; i++) {
+            r *= a;
+        }
+
+        return r;
+    }
+    bool        IsrgbSourceModified()
+    {
+        return rgbSourceModified;
+    }
 };
 }
 #endif