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

Fix for darkframe autoselection

Browse Source
This commit is contained in:
ffsup2
2011-02-04 21:52:49 +01:00
parent 3ff0eb3580
commit 86e7f3f2d0
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtengine/dfmanager.cc
View File

@@ -246,7 +246,7 @@ void DFManager::init( Glib::ustring pathname )
return; return;
} }
dfInfo *DFManager::addFileInfo(const Glib::ustring &filename ) dfInfo *DFManager::addFileInfo(const Glib::ustring &filename ,bool pool )
{ {
Glib::RefPtr<Gio::File> file = Gio::File::create_for_path(filename); Glib::RefPtr<Gio::File> file = Gio::File::create_for_path(filename);
if (!file ) if (!file )
@@ -260,9 +260,15 @@ dfInfo *DFManager::addFileInfo(const Glib::ustring &filename )
RawImage ri(filename); RawImage ri(filename);
int res = ri.loadRaw(false); // Read informations about shot int res = ri.loadRaw(false); // Read informations about shot
if( !res ){ if( !res ){
dfList_t::iterator iter;
if(!pool){
dfInfo n(filename,"","",0,0,0);
iter = dfList.insert(std::pair< std::string,dfInfo>( "", n ) );
return &(iter->second);
}
/* Files are added in the map, divided by same maker/model,ISO and shutter*/ /* Files are added in the map, divided by same maker/model,ISO and shutter*/
std::string key( dfInfo::key(ri.get_maker(), ri.get_model(),(int)ri.get_ISOspeed(),ri.get_shutter()) ); std::string key( dfInfo::key(ri.get_maker(), ri.get_model(),(int)ri.get_ISOspeed(),ri.get_shutter()) );
dfList_t::iterator iter = dfList.find( key ); iter = dfList.find( key );
if( iter == dfList.end() ){ if( iter == dfList.end() ){
dfInfo n(filename, ri.get_maker(), ri.get_model(),(int)ri.get_ISOspeed(),ri.get_shutter(),ri.get_timestamp()); dfInfo n(filename, ri.get_maker(), ri.get_model(),(int)ri.get_ISOspeed(),ri.get_shutter(),ri.get_timestamp());
iter = dfList.insert(std::pair< std::string,dfInfo>( key,n ) ); iter = dfList.insert(std::pair< std::string,dfInfo>( key,n ) );
@@ -331,7 +337,7 @@ dfInfo* DFManager::find( const std::string &mak, const std::string &mod, int iso
bestMatch = iter; bestMatch = iter;
} }
} }
return &(bestMatch->second); return bestD != INFINITY ? &(bestMatch->second) : 0 ;
} }
} }
@@ -350,7 +356,7 @@ RawImage* DFManager::searchDarkFrame( const Glib::ustring filename )
if( iter->second.pathname.compare( filename )==0 ) if( iter->second.pathname.compare( filename )==0 )
return iter->second.getRawImage(); return iter->second.getRawImage();
} }
dfInfo *df = addFileInfo( filename ); dfInfo *df = addFileInfo( filename, false );
if(df) if(df)
return df->getRawImage(); return df->getRawImage();
return 0; return 0;
@@ -399,6 +405,7 @@ int DFManager::scanBadPixelsFile( Glib::ustring filename )
int numPixels = bp.size(); int numPixels = bp.size();
if( numPixels >0 ) if( numPixels >0 )
bpList[ makmodel ] = bp; bpList[ makmodel ] = bp;
fclose(file);
return numPixels; return numPixels;
} }

2
rtengine/dfmanager.h
View File

@@ -84,7 +84,7 @@ protected:
bpList_t bpList; bpList_t bpList;
bool initialized; bool initialized;
Glib::ustring currentPath; Glib::ustring currentPath;
dfInfo *addFileInfo(const Glib::ustring &filename ); dfInfo *addFileInfo(const Glib::ustring &filename, bool pool=true );
dfInfo *find( const std::string &mak, const std::string &mod, int isospeed, double shut, time_t t ); dfInfo *find( const std::string &mak, const std::string &mod, int isospeed, double shut, time_t t );
int scanBadPixelsFile( Glib::ustring filename ); int scanBadPixelsFile( Glib::ustring filename );
}; };