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

Fix flat field correction for multiframe raw files

Browse Source
This commit is contained in:
Ingo Weyrich 2021-01-31 14:09:41 +01:00
parent 6b1e5d6181
commit 7a0d2dddc9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/rawflatfield.cc
View File

@ -263,7 +263,7 @@ void cfaboxblur(const float* const * riFlatFile, float* cfablur, int boxH, int b
namespace rtengine namespace rtengine
{ {
void RawImageSource::processFlatField(const procparams::RAWParams &raw, const RawImage *riFlatFile, const float black[4]) void RawImageSource::processFlatField(const procparams::RAWParams &raw, const RawImage *riFlatFile, array2D<float> &rawData, const float black[4])
{ {
// BENCHFUN // BENCHFUN
std::unique_ptr<float[]> cfablur(new float[H * W]); std::unique_ptr<float[]> cfablur(new float[H * W]);

4
rtengine/rawimagesource.cc
View File

@ -2495,7 +2495,7 @@ void RawImageSource::copyOriginalPixels(const RAWParams &raw, RawImage *src, Raw
if (riFlatFile && W == riFlatFile->get_width() && H == riFlatFile->get_height()) { if (riFlatFile && W == riFlatFile->get_width() && H == riFlatFile->get_height()) {
processFlatField(raw, riFlatFile, black); processFlatField(raw, riFlatFile, rawData, black);
} // flatfield } // flatfield
} else if (ri->get_colors() == 1) { } else if (ri->get_colors() == 1) {
// Monochrome // Monochrome
@ -2517,7 +2517,7 @@ void RawImageSource::copyOriginalPixels(const RAWParams &raw, RawImage *src, Raw
} }
} }
if (riFlatFile && W == riFlatFile->get_width() && H == riFlatFile->get_height()) { if (riFlatFile && W == riFlatFile->get_width() && H == riFlatFile->get_height()) {
processFlatField(raw, riFlatFile, black); processFlatField(raw, riFlatFile, rawData, black);
} // flatfield } // flatfield
} else { } else {
// No bayer pattern // No bayer pattern

2
rtengine/rawimagesource.h
View File

@ -137,7 +137,7 @@ public:
return rgbSourceModified; // tracks whether cached rgb output of demosaic has been modified return rgbSourceModified; // tracks whether cached rgb output of demosaic has been modified
} }
void processFlatField(const procparams::RAWParams &raw, const RawImage *riFlatFile, const float black[4]); void processFlatField(const procparams::RAWParams &raw, const RawImage *riFlatFile, array2D<float> &rawData, const float black[4]);
void copyOriginalPixels(const procparams::RAWParams &raw, RawImage *ri, RawImage *riDark, RawImage *riFlatFile, array2D<float> &rawData ); void copyOriginalPixels(const procparams::RAWParams &raw, RawImage *ri, RawImage *riDark, RawImage *riFlatFile, array2D<float> &rawData );
void scaleColors (int winx, int winy, int winw, int winh, const procparams::RAWParams &raw, array2D<float> &rawData); // raw for cblack void scaleColors (int winx, int winy, int winw, int winh, const procparams::RAWParams &raw, array2D<float> &rawData); // raw for cblack
void WBauto(double &tempref, double &greenref, array2D<float> &redloc, array2D<float> &greenloc, array2D<float> &blueloc, int bfw, int bfh, double &avg_rm, double &avg_gm, double &avg_bm, double &tempitc, double &greenitc, float &studgood, bool &twotimes, const procparams::WBParams & wbpar, int begx, int begy, int yEn, int xEn, int cx, int cy, const procparams::ColorManagementParams &cmp, const procparams::RAWParams &raw) override; void WBauto(double &tempref, double &greenref, array2D<float> &redloc, array2D<float> &greenloc, array2D<float> &blueloc, int bfw, int bfh, double &avg_rm, double &avg_gm, double &avg_bm, double &tempitc, double &greenitc, float &studgood, bool &twotimes, const procparams::WBParams & wbpar, int begx, int begy, int yEn, int xEn, int cx, int cy, const procparams::ColorManagementParams &cmp, const procparams::RAWParams &raw) override;