liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged master into gtk3, fixed three conflicts.

Browse Source
This commit is contained in:
Beep6581
2016-06-09 22:36:59 +02:00
parent 7040b6e5b1
commit c857bba95e
50 changed files with 6109 additions and 6009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rtengine/stdimagesource.h
View File

@@ -38,15 +38,15 @@ protected:
bool rgbSourceModified;
//void transformPixel (int x, int y, int tran, int& tx, int& ty);
void getSampleFormat (Glib::ustring &fname, IIOSampleFormat &sFormat, IIOSampleArrangement &sArrangement);
void getSampleFormat (const Glib::ustring &fname, IIOSampleFormat &sFormat, IIOSampleArrangement &sArrangement);
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 ()
int load (const Glib::ustring &fname, bool batch = false);
void getImage (const ColorTemp &ctemp, int tran, Imagefloat* image, const PreviewProps &pp, const ToneCurveParams &hrp, const ColorManagementParams &cmp, const RAWParams &raw);
ColorTemp getWB () const
{
return wb;
}
@@ -60,7 +60,7 @@ public:
void getAutoExpHistogram (LUTu &histogram, int& histcompr);
double getDefGain ()
double getDefGain () const
{
return 0.0;
}
@@ -90,20 +90,10 @@ public:
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);
void convertColorSpace(Imagefloat* image, const ColorManagementParams &cmp, const ColorTemp &wb);// RAWParams raw will not be used for non-raw files (see imagesource.h)
static void colorSpaceConversion (Imagefloat* im, const ColorManagementParams &cmp, cmsHPROFILE embedded, IIOSampleFormat sampleFormat);
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()
bool IsrgbSourceModified() const
{
return rgbSourceModified;
}