From 5ffa1a609a89e8cecb5ee29ad4d0debb0eb31f1d Mon Sep 17 00:00:00 2001 From: ffsup2 Date: Thu, 12 Jul 2012 21:46:07 +0200 Subject: [PATCH] Bugfix for [XXX.badpixels] file not working Previous code cleanup changed int into size_t generating wrong behaviour in the comparison line --- rtengine/dfmanager.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc index a69c3ae30..683e09fd4 100644 --- a/rtengine/dfmanager.cc +++ b/rtengine/dfmanager.cc @@ -402,8 +402,11 @@ int DFManager::scanBadPixelsFile( Glib::ustring filename ) size_t dirpos2 = filename.find_last_of ('\\'); if( dirpos1 == Glib::ustring::npos && dirpos2== Glib::ustring::npos ) dirpos1 =0; - else + else if( dirpos1 != Glib::ustring::npos && dirpos2 != Glib::ustring::npos ) dirpos1= (dirpos1> dirpos2 ? dirpos1: dirpos2); + else if( dirpos1 == Glib::ustring::npos ) + dirpos1= dirpos2; + std::string makmodel(filename,dirpos1+1,lastdot-(dirpos1+1) ); std::list bp; char line[256];