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

Bugfix for [XXX.badpixels] file not working

Browse Source 
Previous code cleanup changed int into size_t generating wrong behaviour
in the comparison line
This commit is contained in:
ffsup2 2012-07-12 21:46:07 +02:00
parent 752e1562b3
commit 5ffa1a609a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/dfmanager.cc
View File

@ -402,8 +402,11 @@ int DFManager::scanBadPixelsFile( Glib::ustring filename )
size_t dirpos2 = filename.find_last_of ('\\'); size_t dirpos2 = filename.find_last_of ('\\');
if( dirpos1 == Glib::ustring::npos && dirpos2== Glib::ustring::npos ) if( dirpos1 == Glib::ustring::npos && dirpos2== Glib::ustring::npos )
dirpos1 =0; dirpos1 =0;
else else if( dirpos1 != Glib::ustring::npos && dirpos2 != Glib::ustring::npos )
dirpos1= (dirpos1> dirpos2 ? dirpos1: dirpos2); dirpos1= (dirpos1> dirpos2 ? dirpos1: dirpos2);
else if( dirpos1 == Glib::ustring::npos )
dirpos1= dirpos2;
std::string makmodel(filename,dirpos1+1,lastdot-(dirpos1+1) ); std::string makmodel(filename,dirpos1+1,lastdot-(dirpos1+1) );
std::list<badPix> bp; std::list<badPix> bp;
char line[256]; char line[256];