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

Support for Fuji X-Trans-Sensor, Issue 2415 (thanks to Hombre for the changes to gui); Clip Control for Flat Field correction, Issue 2441; Update to dcraw 9.22 1.467

Browse Source
This commit is contained in:
Ingo
2014-07-10 00:33:33 +02:00
parent 3cf0da217a
commit 617b888fa0
65 changed files with 3832 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rtengine/improccoordinator.cc
View File

@@ -146,12 +146,17 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
RAWParams rp = params.raw;
if( !highDetailNeeded ){
// if below 100% magnification, take a fast path
if(rp.dmethod != RAWParams::methodstring[RAWParams::none] && rp.dmethod != RAWParams::methodstring[RAWParams::mono])
rp.dmethod = RAWParams::methodstring[RAWParams::fast];
if(rp.bayersensor.method != RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::none] && rp.bayersensor.method != RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::mono])
rp.bayersensor.method = RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::fast];
//bayerrp.all_enhance = false;
if(rp.xtranssensor.method != RAWParams::XTransSensor::methodstring[RAWParams::XTransSensor::none] && rp.xtranssensor.method != RAWParams::XTransSensor::methodstring[RAWParams::XTransSensor::mono])
rp.xtranssensor.method = RAWParams::XTransSensor::methodstring[RAWParams::XTransSensor::fast];
rp.bayersensor.ccSteps = 0;
rp.xtranssensor.ccSteps = 0;
rp.hotdeadpix_filt = false;
rp.ccSteps = 0;
//rp.all_enhance = false;
}
}
progress ("Applying white balance, color correction & sRGB conversion...",100*readyphase/numofphases);
// raw auto CA is bypassed if no high detail is needed, so we have to compute it when high detail is needed
@@ -181,7 +186,13 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
|| (!params.toneCurve.hrenabled && params.toneCurve.method=="Color" && imgsrc->IsrgbSourceModified()))
{
if (settings->verbose) printf("Demosaic %s\n",rp.dmethod.c_str());
if (settings->verbose) {
if (imgsrc->getSensorType() == ST_BAYER)
printf("Demosaic Bayer image using method: %s\n",rp.bayersensor.method.c_str());
else if (imgsrc->getSensorType() == ST_FUJI_XTRANS)
printf("Demosaic X-Trans image with using method: %s\n",rp.xtranssensor.method.c_str());
}
imgsrc->isRAW();
imgsrc->demosaic( rp );