Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix regression with demosaiced DNGs caused by 831a9bbd #6997

Merged
merged 2 commits into from
Jun 23, 2024
Merged

Fix regression with demosaiced DNGs caused by 831a9bbd #6997

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91dc97e
Fix regression with demosaiced DNGs caused by 831a9bbd
Entropy512 Mar 17, 2024
51277dc
Move function into anonymous namespace
Lawrence37 Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions rtengine/rawimagesource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,9 +742,19 @@ void RawImageSource::getWBMults(const ColorTemp &ctemp, const RAWParams &raw, st
autoGainComp = camInitialGain / initialGain;
}

bool checkRawDataDimensions(const array2D<float> &rawData, const RawImage &rawImage, int width, int height)
{
const int colors = (rawImage.getSensorType() == rtengine::ST_BAYER ||
rawImage.getSensorType() == rtengine::ST_FUJI_XTRANS ||
rawImage.get_colors() == 1)
? 1
: 3;
return rawData.getHeight() == height && rawData.getWidth() == colors * width;
}

Lawrence37 marked this conversation as resolved.
Show resolved Hide resolved
void RawImageSource::getImage(const ColorTemp &ctemp, int tran, Imagefloat* image, const PreviewProps &pp, const ToneCurveParams &hrp, const RAWParams &raw)
{
assert(rawData.getHeight() == H && rawData.getWidth() == W);
assert(checkRawDataDimensions(rawData, *ri, W, H));

MyMutex::MyLock lock(getImageMutex);

Expand Down Expand Up @@ -1747,7 +1757,7 @@ void RawImageSource::preprocess(const RAWParams &raw, const LensProfParams &lens

void RawImageSource::demosaic(const RAWParams &raw, bool autoContrast, double &contrastThreshold, bool cache)
{
assert(rawData.getHeight() == H && rawData.getWidth() == W);
assert(checkRawDataDimensions(rawData, *ri, W, H));

MyTime t1, t2;
t1.set();
Expand Down Expand Up @@ -3842,7 +3852,7 @@ void RawImageSource::hlRecovery(const std::string &method, float* red, float* gr

void RawImageSource::getAutoExpHistogram(LUTu & histogram, int& histcompr)
{
assert(rawData.getHeight() == H && rawData.getWidth() == W);
assert(checkRawDataDimensions(rawData, *ri, W, H));

// BENCHFUN
histcompr = 3;
Expand Down Expand Up @@ -7487,7 +7497,7 @@ void RawImageSource::getrgbloc(int begx, int begy, int yEn, int xEn, int cx, int

void RawImageSource::getAutoWBMultipliersitc(bool extra, double & tempref, double & greenref, double & tempitc, double & greenitc, float &temp0, float &delta, int &bia, int &dread, int &kcam, int &nocam, float &studgood, float &minchrom, int &kmin, float &minhist, float &maxhist, int begx, int begy, int yEn, int xEn, int cx, int cy, int bf_h, int bf_w, double & rm, double & gm, double & bm, const WBParams & wbpar, const ColorManagementParams & cmp, const RAWParams & raw, const ToneCurveParams &hrp)
{
assert(rawData.getHeight() == H && rawData.getWidth() == W);
assert(checkRawDataDimensions(rawData, *ri, W, H));

// BENCHFUN
constexpr double clipHigh = 64000.0;
Expand Down Expand Up @@ -7713,7 +7723,7 @@ void RawImageSource::getAutoWBMultipliersitc(bool extra, double & tempref, doubl

void RawImageSource::getAutoWBMultipliers(double &rm, double &gm, double &bm)
{
assert(rawData.getHeight() == H && rawData.getWidth() == W);
assert(checkRawDataDimensions(rawData, *ri, W, H));

// BENCHFUN
constexpr double clipHigh = 64000.0;
Expand Down Expand Up @@ -7931,7 +7941,7 @@ void RawImageSource::getAutoWBMultipliers(double &rm, double &gm, double &bm)

ColorTemp RawImageSource::getSpotWB(std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, int tran, double equal, StandardObserver observer)
{
assert(rawData.getHeight() == H && rawData.getWidth() == W);
assert(checkRawDataDimensions(rawData, *ri, W, H));

int x;
int y;
Expand Down Expand Up @@ -8271,7 +8281,7 @@ void RawImageSource::init()

void RawImageSource::getRawValues(int x, int y, int rotate, int &R, int &G, int &B)
{
if (rawData.getWidth() != W || rawData.getHeight() != H || d1x) { // Nikon D1x has special sensor. We just skip it
if (!checkRawDataDimensions(rawData, *ri, W, H) || d1x) { // Nikon D1x has special sensor. We just skip it
R = G = B = 0;
return;
}
Expand Down Expand Up @@ -8319,7 +8329,7 @@ bool RawImageSource::isGainMapSupported() const

void RawImageSource::applyDngGainMap(const float black[4], const std::vector<GainMap> &gainMaps)
{
assert(rawData.getHeight() == H && rawData.getWidth() == W);
assert(checkRawDataDimensions(rawData, *ri, W, H));

// now we can apply each gain map to raw_data
array2D<float> mvals[2][2];
Expand Down
Loading