From 282101785316498f3d7f194e94815608d39017b7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 28 Sep 2012 01:01:23 +0300 Subject: remove unused guichan class. --- src/CMakeLists.txt | 2 - src/Makefile.am | 2 - src/guichan/include/guichan/sdl/sdlimage.hpp | 108 --------------- src/guichan/sdl/sdlgraphics.cpp | 1 - src/guichan/sdl/sdlimage.cpp | 191 --------------------------- 5 files changed, 304 deletions(-) delete mode 100644 src/guichan/include/guichan/sdl/sdlimage.hpp delete mode 100644 src/guichan/sdl/sdlimage.cpp (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 415cd6dfb..f8255c7a2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -672,7 +672,6 @@ SET(SRCS_GUICHAN guichan/include/guichan/selectionevent.hpp guichan/include/guichan/selectionlistener.hpp guichan/include/guichan/sdl/sdlgraphics.hpp - guichan/include/guichan/sdl/sdlimage.hpp guichan/include/guichan/sdl/sdlpixel.hpp guichan/include/guichan/widget.hpp guichan/include/guichan/widgetlistener.hpp @@ -711,7 +710,6 @@ SET(SRCS_GUICHAN guichan/selectionevent.cpp guichan/widget.cpp guichan/sdl/sdlgraphics.cpp - guichan/sdl/sdlimage.cpp guichan/widgets/button.cpp guichan/widgets/checkbox.cpp guichan/widgets/container.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 0c86b8594..35ec3f0a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,7 +52,6 @@ manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \ guichan/include/guichan/selectionevent.hpp \ guichan/include/guichan/selectionlistener.hpp \ guichan/include/guichan/sdl/sdlgraphics.hpp \ - guichan/include/guichan/sdl/sdlimage.hpp \ guichan/include/guichan/sdl/sdlpixel.hpp \ guichan/include/guichan/widget.hpp \ guichan/include/guichan/widgetlistener.hpp \ @@ -92,7 +91,6 @@ manaplus_SOURCES += guichan/actionevent.cpp \ guichan/selectionevent.cpp \ guichan/widget.cpp \ guichan/sdl/sdlgraphics.cpp \ - guichan/sdl/sdlimage.cpp \ guichan/widgets/button.cpp \ guichan/widgets/checkbox.cpp \ guichan/widgets/container.cpp \ diff --git a/src/guichan/include/guichan/sdl/sdlimage.hpp b/src/guichan/include/guichan/sdl/sdlimage.hpp deleted file mode 100644 index 52fb9976b..000000000 --- a/src/guichan/include/guichan/sdl/sdlimage.hpp +++ /dev/null @@ -1,108 +0,0 @@ -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * Copyright (C) 2011-2012 The ManaPlus Developers - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef GCN_SDLIMAGE_HPP -#define GCN_SDLIMAGE_HPP - -#include "SDL.h" - -#include - -#include "guichan/color.hpp" -#include "guichan/platform.hpp" -#include "guichan/image.hpp" - -namespace gcn -{ - /** - * SDL implementation of Image. - */ - class GCN_EXTENSION_DECLSPEC SDLImage : public Image - { - public: - /** - * Constructor. Load an image from an SDL surface. - * - * NOTE: The functions getPixel and putPixel are only guaranteed to work - * before an image has been converted to display format. - * - * @param surface the surface from which to load. - * @param autoFree true if the surface should automatically be deleted. - */ - SDLImage(SDL_Surface *const surface, const bool autoFree); - - /** - * Destructor. - */ - virtual ~SDLImage(); - - /** - * Gets the SDL surface for the image. - * - * @return the SDL surface for the image. - */ - virtual SDL_Surface* getSurface() const; - - - // Inherited from Image - - virtual void free(); - - virtual int getWidth() const; - - virtual int getHeight() const; - - virtual Color getPixel(int x, int y); - - virtual void putPixel(int x, int y, const Color& color); - - virtual void convertToDisplayFormat(); - - protected: - SDL_Surface* mSurface; - bool mAutoFree; - }; -} - -#endif // end GCN_SDLIMAGE_HPP diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp index 2e188991b..952be9093 100644 --- a/src/guichan/sdl/sdlgraphics.cpp +++ b/src/guichan/sdl/sdlgraphics.cpp @@ -51,7 +51,6 @@ #include "guichan/exception.hpp" #include "guichan/font.hpp" #include "guichan/image.hpp" -#include "guichan/sdl/sdlimage.hpp" #include "guichan/sdl/sdlpixel.hpp" #include "debug.h" diff --git a/src/guichan/sdl/sdlimage.cpp b/src/guichan/sdl/sdlimage.cpp deleted file mode 100644 index 30d8f744d..000000000 --- a/src/guichan/sdl/sdlimage.cpp +++ /dev/null @@ -1,191 +0,0 @@ -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * Copyright (C) 2011-2012 The ManaPlus Developers - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * For comments regarding functions please see the header file. - */ - -#include "guichan/sdl/sdlimage.hpp" - -#include "guichan/exception.hpp" -#include "guichan/sdl/sdlpixel.hpp" - -#include "debug.h" - -namespace gcn -{ - SDLImage::SDLImage(SDL_Surface *const surface, const bool autoFree) : - Image(), - mSurface(surface), - mAutoFree(autoFree) - { - } - - SDLImage::~SDLImage() - { - if (mAutoFree) - free(); - } - - SDL_Surface* SDLImage::getSurface() const - { - return mSurface; - } - - int SDLImage::getWidth() const - { - if (!mSurface) - { - throw GCN_EXCEPTION("Trying to get the width of " - "a non loaded image."); - } - - return mSurface->w; - } - - int SDLImage::getHeight() const - { - if (!mSurface) - { - throw GCN_EXCEPTION("Trying to get the height of " - "a non loaded image."); - } - - return mSurface->h; - } - - Color SDLImage::getPixel(int x, int y) - { - if (!mSurface) - { - throw GCN_EXCEPTION("Trying to get a pixel from a " - "non loaded image."); - } - - return SDLgetPixel(mSurface, x, y); - } - - void SDLImage::putPixel(int x, int y, const Color& color) - { - if (!mSurface) - { - throw GCN_EXCEPTION("Trying to put a pixel in a " - "non loaded image."); - } - - SDLputPixel(mSurface, x, y, color); - } - - void SDLImage::convertToDisplayFormat() - { - if (!mSurface) - { - throw GCN_EXCEPTION("Trying to convert a non loaded image " - "to display format."); - } - - int i; - bool hasPink = false; - bool hasAlpha = false; - - for (i = 0; i < mSurface->w * mSurface->h; ++i) - { - if ((static_cast(mSurface->pixels))[i] - == SDL_MapRGB(mSurface->format, 255, 0, 255)) - { - hasPink = true; - break; - } - } - - for (i = 0; i < mSurface->w * mSurface->h; ++i) - { - uint8_t r, g, b, a; - - SDL_GetRGBA((static_cast(mSurface->pixels)[i]), - mSurface->format, &r, &g, &b, &a); - - if (a != 255) - { - hasAlpha = true; - break; - } - } - - SDL_Surface *tmp; - - if (hasAlpha) - { - tmp = SDL_DisplayFormatAlpha(mSurface); - SDL_FreeSurface(mSurface); - mSurface = nullptr; - } - else - { - tmp = SDL_DisplayFormat(mSurface); - SDL_FreeSurface(mSurface); - mSurface = nullptr; - } - - if (!tmp) - throw GCN_EXCEPTION("Unable to convert image to display format."); - - if (hasPink) - { - SDL_SetColorKey(tmp, SDL_SRCCOLORKEY, - SDL_MapRGB(tmp->format, 255, 0, 255)); - } - if (hasAlpha) - { - SDL_SetAlpha(tmp, SDL_SRCALPHA, 255); - } - - mSurface = tmp; - } - - void SDLImage::free() - { - SDL_FreeSurface(mSurface); - } -} -- cgit v1.2.3-60-g2f50