From 6d8828b47e291c0e85645adb60c8969a3f8facf4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 5 May 2012 23:08:18 +0300 Subject: Improve images drawing and remove some useless code. --- src/resources/imageloader.h | 70 --------------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 src/resources/imageloader.h (limited to 'src/resources/imageloader.h') diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h deleted file mode 100644 index 1dcd046ca..000000000 --- a/src/resources/imageloader.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2007-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2012 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef IMAGELOADER_H -#define IMAGELOADER_H - -#include -#include - -#include - -class Image; -struct SDL_Surface; - -class ProxyImage : public gcn::Image -{ - public: - ProxyImage(SDL_Surface *); - ~ProxyImage(); - - void free(); - int getWidth() const; - int getHeight() const; - gcn::Color getPixel(int x, int y); - void putPixel(int x, int y, gcn::Color const &color); - void convertToDisplayFormat(); - - /** - * Gets the image handled by this proxy. - */ - ::Image *getImage() const - { return mImage; } - - private: - ::Image *mImage; /**< The real image. */ - - /** - * An SDL surface kept around until Guichan is done reading pixels from - * an OpenGL texture. - */ - SDL_Surface *mSDLImage; -}; - -class ImageLoader : public gcn::ImageLoader -{ - public: - gcn::Image *load(const std::string &filename, - bool convertToDisplayFormat); -}; - -#endif -- cgit v1.2.3-70-g09d2