summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-01-02 22:01:08 (GMT)
committerfluxgen <fluxgen>2004-01-02 22:01:08 (GMT)
commitb9049cefad82bd62a663e4ae4048d7574563bdfc (patch)
treee7a0dcd0b503d4b2a03bad1b9ded860f822ae8a3
parentbaa6a4a42ffead3ed8db11fd84d69706e98b2df7 (diff)
downloadfluxbox_lack-b9049cefad82bd62a663e4ae4048d7574563bdfc.zip
fluxbox_lack-b9049cefad82bd62a663e4ae4048d7574563bdfc.tar.bz2
minor stuff
-rw-r--r--src/FbTk/Image.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc
index 98b602c..4ccda5b 100644
--- a/src/FbTk/Image.cc
+++ b/src/FbTk/Image.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Image.cc,v 1.3 2003/12/16 17:06:51 fluxgen Exp $ 22// $Id: Image.cc,v 1.4 2004/01/02 22:01:08 fluxgen Exp $
23 23
24#include "Image.hh" 24#include "Image.hh"
25#include "StringUtil.hh" 25#include "StringUtil.hh"
@@ -65,14 +65,16 @@ PixmapWithMask *Image::load(const std::string &filename, int screen_num) {
65 if (pm == 0 && s_search_paths.size()) { 65 if (pm == 0 && s_search_paths.size()) {
66 // first we need to get basename of current filename 66 // first we need to get basename of current filename
67 std::string base_filename = StringUtil::basename(filename); 67 std::string base_filename = StringUtil::basename(filename);
68 std::string path = "";
68 // append each search path and try to load 69 // append each search path and try to load
69 StringList::iterator it = s_search_paths.begin(); 70 StringList::iterator it = s_search_paths.begin();
70 StringList::iterator it_end = s_search_paths.end(); 71 StringList::iterator it_end = s_search_paths.end();
71 for (; it != it_end && pm == 0; ++it) { 72 for (; it != it_end && pm == 0; ++it) {
72 // append search path and try load it 73 // append search path and try load it
73 std::string path = StringUtil::expandFilename(*it); 74 path = StringUtil::expandFilename(*it);
74 pm = s_image_map[extension]->load(path + "/" + base_filename, screen_num); 75 pm = s_image_map[extension]->load(path + "/" + base_filename, screen_num);
75 } 76 }
77
76 } 78 }
77 79
78 return pm; 80 return pm;