merge with dev

This commit is contained in:
Desmis
2019-11-04 14:42:22 +01:00
6 changed files with 554 additions and 572 deletions

View File

@@ -138,9 +138,8 @@ public:
return rgbSourceModified; // tracks whether cached rgb output of demosaic has been modified
}
void processFlatField(const RAWParams &raw, RawImage *riFlatFile, unsigned short black[4]);
void processFlatField(const RAWParams &raw, const RawImage *riFlatFile, const unsigned short black[4]);
void copyOriginalPixels(const 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 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;