aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-11-14 10:12:42 (GMT)
committerfluxgen <fluxgen>2002-11-14 10:12:42 (GMT)
commitd6ed5970a8f91d42d75dc7106a4ba03e0da23f97 (patch)
tree7e0c66e1ef4b6d2a93f5fde9fe0dd0efbbf50e7a
parent7c24bf9b5a6886a7033927e7338af6f102ec4669 (diff)
downloadfluxbox-d6ed5970a8f91d42d75dc7106a4ba03e0da23f97.zip
fluxbox-d6ed5970a8f91d42d75dc7106a4ba03e0da23f97.tar.bz2
minor cleaning
-rw-r--r--src/Image.cc27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/Image.cc b/src/Image.cc
index 3574679..06da7a2 100644
--- a/src/Image.cc
+++ b/src/Image.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Image.cc,v 1.16 2002/09/15 09:42:00 fluxgen Exp $ 25// $Id: Image.cc,v 1.17 2002/11/14 10:12:42 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -2288,23 +2288,24 @@ Pixmap BImageControl::renderImage(unsigned int width, unsigned int height,
2288 2288
2289 2289
2290void BImageControl::removeImage(Pixmap pixmap) { 2290void BImageControl::removeImage(Pixmap pixmap) {
2291 if (pixmap) { 2291 if (!pixmap)
2292 CacheList::iterator it = cache.begin(); 2292 return;
2293 CacheList::iterator it_end = cache.end(); 2293
2294 for (; it != it_end; ++it) { 2294 CacheList::iterator it = cache.begin();
2295 if ((*it)->pixmap == pixmap) { 2295 CacheList::iterator it_end = cache.end();
2296 if ((*it)->count) { 2296 for (; it != it_end; ++it) {
2297 (*it)->count--; 2297 if ((*it)->pixmap == pixmap) {
2298 if ((*it)->count) {
2299 (*it)->count--;
2298 2300
2299#ifdef TIMEDCACHE 2301#ifdef TIMEDCACHE
2300 timeout(); 2302 timeout();
2301#else // !TIMEDCACHE 2303#else // !TIMEDCACHE
2302 if (! (*it)->count) timeout(); 2304 if (! (*it)->count) timeout();
2303#endif // TIMEDCACHE 2305#endif // TIMEDCACHE
2304 }
2305
2306 return;
2307 } 2306 }
2307
2308 return;
2308 } 2309 }
2309 } 2310 }
2310} 2311}