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

Merge branch 'master' into clang-tidy

Browse Source
This commit is contained in:
Flössie
2016-10-18 17:48:50 +02:00
parent f9f4fe9035 cced5756cb
commit 0bbc84b2af
85 changed files with 6870 additions and 2817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/rawimagesource.h
View File

@@ -63,17 +63,11 @@ protected:
bool fuji;
bool d1x;
int border;
//char** hpmap;
float** hrmap[3]; // for color propagation
char** needhr; // for color propagation
int max_3[3];
float chmax[4], hlmax[4], clmax[4];
double initialGain; // initial gain calculated after scale_colors
double camInitialGain;
double defGain;
bool full;
cmsHPROFILE camProfile;
cmsHPROFILE embProfile;
bool rgbSourceModified;
RawImage* ri; // Copy of raw pixels, NOT corrected for initial gain, blackpoint etc.
@@ -157,7 +151,7 @@ public:
}
void getFullSize (int& w, int& h, int tr = TR_NONE);
void getSize (int tran, PreviewProps pp, int& w, int& h);
void getSize (PreviewProps pp, int& w, int& h);
int getRotateDegree() const
{
return ri->get_rotateDegree();