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

Broken Dark Frame subtraction when Auto-selection of Dark Frame is enabled, Issue 2472

Browse Source
This commit is contained in:
Ingo
2014-08-20 22:34:10 +02:00
parent a288237328
commit a3f1d8d7c3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/rawimagesource.cc
View File

@@ -1003,12 +1003,14 @@ void RawImageSource::preprocess (const RAWParams &raw, const LensProfParams &le
MyTime t1,t2; MyTime t1,t2;
t1.set(); t1.set();
Glib::ustring newDF = raw.dark_frame; Glib::ustring newDF = raw.dark_frame;
Glib::ustring makerstring = ((Glib::ustring)ri->get_maker()).uppercase();
Glib::ustring modelstring = ((Glib::ustring)ri->get_model()).uppercase();
RawImage *rid=NULL; RawImage *rid=NULL;
if (!raw.df_autoselect) { if (!raw.df_autoselect) {
if( !raw.dark_frame.empty()) if( !raw.dark_frame.empty())
rid = dfm.searchDarkFrame( raw.dark_frame ); rid = dfm.searchDarkFrame( raw.dark_frame );
} else { } else {
rid = dfm.searchDarkFrame( ri->get_maker(), ri->get_model(), ri->get_ISOspeed(), ri->get_shutter(), ri->get_timestamp()); rid = dfm.searchDarkFrame( makerstring, modelstring, ri->get_ISOspeed(), ri->get_shutter(), ri->get_timestamp());
} }
if( rid && settings->verbose){ if( rid && settings->verbose){
printf( "Subtracting Darkframe:%s\n",rid->get_filename().c_str()); printf( "Subtracting Darkframe:%s\n",rid->get_filename().c_str());
@@ -1049,7 +1051,7 @@ void RawImageSource::preprocess (const RAWParams &raw, const LensProfParams &le
// If darkframe selected, correct hotpixels found on darkframe // If darkframe selected, correct hotpixels found on darkframe
bp = 0; bp = 0;
if( raw.df_autoselect ){ if( raw.df_autoselect ){
bp = dfm.getHotPixels( ri->get_maker(), ri->get_model(), ri->get_ISOspeed(), ri->get_shutter(), ri->get_timestamp()); bp = dfm.getHotPixels( makerstring, modelstring, ri->get_ISOspeed(), ri->get_shutter(), ri->get_timestamp());
}else if( !raw.dark_frame.empty() ) }else if( !raw.dark_frame.empty() )
bp = dfm.getHotPixels( raw.dark_frame ); bp = dfm.getHotPixels( raw.dark_frame );
if(bp){ if(bp){