From 489a429bea6739dfa25503b9329bd9e33bffb856 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 25 Sep 2008 00:15:44 +0000
Subject: Merged the Tametomo branch into trunk.

---
 src/resources/imageset.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/resources/imageset.cpp')

diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 6228f4e4..b7263ec3 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -21,8 +21,6 @@
  *  $Id: imageset.cpp 4209 2008-04-29 12:58:21Z b_lindeijer $
  */
 
-#include <algorithm>
-
 #include "imageset.h"
 
 #include "../log.h"
@@ -46,11 +44,10 @@ ImageSet::ImageSet(Image *img, int width, int height)
 
 ImageSet::~ImageSet()
 {
-    for_each(mImages.begin(), mImages.end(), make_dtor(mImages));
+    delete_all(mImages);
 }
 
-Image*
-ImageSet::get(size_type i)
+Image* ImageSet::get(size_type i) const
 {
     if (i >= mImages.size())
     {
-- 
cgit v1.2.3-70-g09d2