summaryrefslogtreecommitdiff
path: root/src/resources/image.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-01-22 20:54:38 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-01-24 19:07:50 +0100
commit59c5d1ef260736225ba3ba486f40532949cc293b (patch)
tree1245fcda33ab2cde58868874cfcb72c7a673465d /src/resources/image.h
parentdd1386684b6430337d3b270bec1ca53fa69f9593 (diff)
downloadmana-59c5d1ef260736225ba3ba486f40532949cc293b.tar.gz
mana-59c5d1ef260736225ba3ba486f40532949cc293b.tar.bz2
mana-59c5d1ef260736225ba3ba486f40532949cc293b.tar.xz
mana-59c5d1ef260736225ba3ba486f40532949cc293b.zip
Removed unused function Image::SDLmerge
Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/resources/image.h')
-rw-r--r--src/resources/image.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/resources/image.h b/src/resources/image.h
index 85db0c17..3ec42ace 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -157,15 +157,6 @@ class Image : public Resource
Image* SDLgetScaledImage(int width, int height);
/**
- * Merges two image SDL_Surfaces together. This is for SDL use only, as
- * reducing the number of surfaces that SDL has to render can cut down
- * on the number of blit operations necessary, which in turn can help
- * improve overall framerates. Don't use unless you are using it to
- * reduce the number of overall layers that need to be drawn through SDL.
- */
- Image *SDLmerge(Image *image, int x, int y);
-
- /**
* Get the alpha Channel of a SDL surface.
*/
Uint8 *SDLgetAlphaChannel() const