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

Fix display of raw values in navigator for xtrans

Browse Source
This commit is contained in:
heckflosse 2017-02-06 16:43:49 +01:00
parent c0cb0966f4
commit 2feb43f5d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/rawimagesource.cc
View File

@ -5479,7 +5479,7 @@ void RawImageSource::getRawValues(int x, int y, int rotate, int &R, int &G, int
ynew = H - 1 - ynew; ynew = H - 1 - ynew;
} }
int c = FC(ynew,xnew); int c = ri->getSensorType() == ST_FUJI_XTRANS ? ri->XTRANSFC(ynew,xnew) : ri->FC(ynew,xnew);
int val = round(rawData[ynew][xnew] / scale_mul[c]); int val = round(rawData[ynew][xnew] / scale_mul[c]);
if(c == 0) { if(c == 0) {
R = val; G = 0; B = 0; R = val; G = 0; B = 0;

2
rtgui/cropwindow.cc
View File

@ -1043,7 +1043,7 @@ void CropWindow::pointerMoved (int bstate, int x, int y)
if(ipc) { if(ipc) {
procparams::ProcParams params; procparams::ProcParams params;
ipc->getParams(&params); ipc->getParams(&params);
if(params.raw.bayersensor.method == RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::none]) { if(params.raw.bayersensor.method == RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::none] || params.raw.xtranssensor.method == RAWParams::XTransSensor::methodstring[RAWParams::XTransSensor::none]) {
ImageSource *isrc = static_cast<ImageSource*>(ipc->getInitialImage()); ImageSource *isrc = static_cast<ImageSource*>(ipc->getInitialImage());
isrc->getRawValues(mx, my, params.coarse.rotate, rval, gval, bval); isrc->getRawValues(mx, my, params.coarse.rotate, rval, gval, bval);
} }