From a3f1d8d7c394e84777956969ff2ecd0966a88172 Mon Sep 17 00:00:00 2001 From: Ingo Date: Wed, 20 Aug 2014 22:34:10 +0200 Subject: [PATCH] Broken Dark Frame subtraction when Auto-selection of Dark Frame is enabled, Issue 2472 --- rtengine/rawimagesource.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index b5fd805e3..f58f907af 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -1003,12 +1003,14 @@ void RawImageSource::preprocess (const RAWParams &raw, const LensProfParams &le MyTime t1,t2; t1.set(); 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; if (!raw.df_autoselect) { if( !raw.dark_frame.empty()) rid = dfm.searchDarkFrame( raw.dark_frame ); } 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){ 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 bp = 0; 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() ) bp = dfm.getHotPixels( raw.dark_frame ); if(bp){