diff options
| author | Ira Rice <irarice@gmail.com> | 2008-09-25 00:15:44 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-09-25 00:15:44 +0000 |
| commit | 489a429bea6739dfa25503b9329bd9e33bffb856 (patch) | |
| tree | 8112f6fd988fdc0610329b6bc14ee3f9d5801092 /src/resources/imageset.cpp | |
| parent | 2dc8eadff1e67bb70b1772ecc19c9e1e2e40a5b4 (diff) | |
| download | mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.gz mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.bz2 mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.xz mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.zip | |
Merged the Tametomo branch into trunk.
Diffstat (limited to 'src/resources/imageset.cpp')
| -rw-r--r-- | src/resources/imageset.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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()) { |