[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kimgio
From:       George Staikos <staikos () kde ! org>
Date:       2005-02-22 15:56:32
Message-ID: 20050222155632.9EDFDED8A () office ! kde ! org
[Download RAW message or body]

CVS commit by staikos: 

make it easier for gdb to understand this code.  at least something does.  stl roxx


  M +7 -5      ico.cpp   1.24


--- kdelibs/kimgio/ico.cpp  #1.23:1.24
@@ -268,9 +268,11 @@ extern "C" KDE_EXPORT void kimgio_ico_re
         icons.push_back( rec );
     }
-    IconList::const_iterator selected =
-        requestedIndex >= 0 ?
-        std::min( icons.begin() + requestedIndex, icons.end() ) :
-        std::min_element( icons.begin(), icons.end(),
+    IconList::const_iterator selected;
+    if (requestedIndex >= 0) {
+        selected = std::min( icons.begin() + requestedIndex, icons.end() );
+    } else {
+        selected = std::min_element( icons.begin(), icons.end(),
                           LessDifference( requestedSize, requestedColors ) );
+    }
     if ( stream.atEnd() || selected == icons.end() ||
          offset + selected->offset > io->ioDevice()->size() )


[prev in list] [next in list] [prev in thread] [next in thread]