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

Merge branch 'dev' into reduce-include-dependencies

Browse Source
This commit is contained in:
Ingo Weyrich
2019-11-03 21:40:27 +01:00
parent ec3ba6d9b8 58f44e96cb
commit e7cbca7d4f
6 changed files with 555 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rtengine/rawimagesource.h
View File

@@ -137,9 +137,8 @@ public:
return rgbSourceModified; // tracks whether cached rgb output of demosaic has been modified
}
void processFlatField(const procparams::RAWParams &raw, RawImage *riFlatFile, unsigned short black[4]);
void processFlatField(const procparams::RAWParams &raw, const RawImage *riFlatFile, const unsigned short black[4]);
void copyOriginalPixels(const procparams::RAWParams &raw, RawImage *ri, RawImage *riDark, RawImage *riFlatFile, array2D<float> &rawData );
void cfaboxblur (RawImage *riFlatFile, float* cfablur, int boxH, int boxW);
void scaleColors (int winx, int winy, int winw, int winh, const procparams::RAWParams &raw, array2D<float> &rawData); // raw for cblack
void getImage (const ColorTemp &ctemp, int tran, Imagefloat* image, const PreviewProps &pp, const procparams::ToneCurveParams &hrp, const procparams::RAWParams &raw) override;