Merge with 'Beep6581/dev'
This commit is contained in:
@@ -97,7 +97,7 @@ void DarkFrame::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
|
||||
|
||||
if( pp->raw.df_autoselect && dfp && !multiImage) {
|
||||
// retrieve the auto-selected df filename
|
||||
rtengine::RawImage *img = dfp->getDF();
|
||||
const rtengine::RawImage *img = dfp->getDF();
|
||||
|
||||
if( img ) {
|
||||
dfInfo->set_text( Glib::ustring::compose("%1: %2ISO %3s", Glib::path_get_basename(img->get_filename()), img->get_ISOspeed(), img->get_shutter()) );
|
||||
@@ -179,7 +179,7 @@ void DarkFrame::dfAutoChanged()
|
||||
|
||||
if(dfAuto->get_active() && dfp && !batchMode) {
|
||||
// retrieve the auto-selected df filename
|
||||
rtengine::RawImage *img = dfp->getDF();
|
||||
const rtengine::RawImage *img = dfp->getDF();
|
||||
|
||||
if( img ) {
|
||||
dfInfo->set_text( Glib::ustring::compose("%1: %2ISO %3s", Glib::path_get_basename(img->get_filename()), img->get_ISOspeed(), img->get_shutter()) );
|
||||
|
Reference in New Issue
Block a user