summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-15 19:02:24 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-15 19:02:24 +0300
commit41d545176ffad2fb33158ca3415d2a0a983fffdb (patch)
tree4a8ae114424477e3b1a30d3dcf8e510f05083d55 /src
parentb5995578d5cf52e8553b668bc9343f02e8a0fc93 (diff)
downloadplus-41d545176ffad2fb33158ca3415d2a0a983fffdb.tar.gz
plus-41d545176ffad2fb33158ca3415d2a0a983fffdb.tar.bz2
plus-41d545176ffad2fb33158ca3415d2a0a983fffdb.tar.xz
plus-41d545176ffad2fb33158ca3415d2a0a983fffdb.zip
Remove unused image base class.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/gui/base/graphics.cpp2
-rw-r--r--src/gui/base/image.cpp83
-rw-r--r--src/gui/base/image.hpp162
5 files changed, 1 insertions, 250 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f540d2552..79280485c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -782,7 +782,6 @@ SET(SRCS
gui/base/font.hpp
gui/base/graphics.hpp
gui/base/gui.hpp
- gui/base/image.hpp
gui/base/input.hpp
gui/base/inputevent.hpp
gui/base/key.hpp
@@ -820,7 +819,6 @@ SET(SRCS
gui/base/font.cpp
gui/base/graphics.cpp
gui/base/gui.cpp
- gui/base/image.cpp
gui/base/inputevent.cpp
gui/base/key.cpp
gui/base/keyevent.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index f53c0f432..028041582 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,7 +171,6 @@ manaplus_SOURCES += gui/base/actionevent.hpp \
gui/base/font.hpp \
gui/base/graphics.hpp \
gui/base/gui.hpp \
- gui/base/image.hpp \
gui/base/input.hpp \
gui/base/inputevent.hpp \
gui/base/key.hpp \
@@ -209,7 +208,6 @@ manaplus_SOURCES += gui/base/actionevent.hpp \
gui/base/font.cpp \
gui/base/graphics.cpp \
gui/base/gui.cpp \
- gui/base/image.cpp \
gui/base/inputevent.cpp \
gui/base/key.cpp \
gui/base/keyevent.cpp \
diff --git a/src/gui/base/graphics.cpp b/src/gui/base/graphics.cpp
index 229543bc9..fd76a1e6f 100644
--- a/src/gui/base/graphics.cpp
+++ b/src/gui/base/graphics.cpp
@@ -69,7 +69,7 @@
#include "gui/base/exception.hpp"
#include "gui/base/font.hpp"
-#include "gui/base/image.hpp"
+#include "resources/image.h"
#include "debug.h"
diff --git a/src/gui/base/image.cpp b/src/gui/base/image.cpp
deleted file mode 100644
index 01e30dc20..000000000
--- a/src/gui/base/image.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2011-2014 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 <http://www.gnu.org/licenses/>.
- */
-
-/* _______ __ __ __ ______ __ __ _______ __ __
- * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
- * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
- * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * 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 "gui/base/image.hpp"
-
-#include "gui/base/exception.hpp"
-
-#include "debug.h"
-
-namespace gcn
-{
- Image::Image()
- {
- }
-
- Image::~Image()
- {
- }
-}
diff --git a/src/gui/base/image.hpp b/src/gui/base/image.hpp
deleted file mode 100644
index c39fe21ab..000000000
--- a/src/gui/base/image.hpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2011-2014 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 <http://www.gnu.org/licenses/>.
- */
-
-/* _______ __ __ __ ______ __ __ _______ __ __
- * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
- * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
- * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- *
- *
- * 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_IMAGE_HPP
-#define GCN_IMAGE_HPP
-
-#include <string>
-
-#include "localconsts.h"
-
-namespace gcn
-{
- class Color;
-
- /**
- * Holds an image. To be able to use this class you must first set an
- * ImageLoader in Image by calling
- * @code Image::setImageLoader(myImageLoader) @endcode
- * The function is static. If this is not done, the constructor taking a
- * filename will throw an exception. The ImageLoader you use must be
- * compatible with the Graphics object you use.
- *
- * EXAMPLE: If you use SDLGraphics you should use SDLImageLoader.
- * Otherwise your program might crash in a most bizarre way.
- * @see AllegroImageLoader, HGEImageLoader, OpenLayerImageLoader,
- * OpenGLAllegroImageLoader, OpenGLSDLImageLoader, SDLImageLoader
- * @since 0.1.0
- */
- class Image
- {
- public:
- /**
- * Constructor.
- */
- Image();
-
- /**
- * Destructor.
- */
- virtual ~Image();
-
- /**
- * Frees an image.
- *
- * @since 0.5.0
- */
- virtual void free() = 0;
-
- /**
- * Gets the width of the image.
- *
- * @return The width of the image.
- *
- * @since 0.1.0
- */
- virtual int getWidth() const A_WARN_UNUSED = 0;
-
- /**
- * Gets the height of the image.
- *
- * @return The height of the image.
- *
- * @since 0.1.0
- */
- virtual int getHeight() const A_WARN_UNUSED = 0;
-
- /**
- * Gets the color of a pixel at coordinate (x, y) in the image.
- *
- * IMPORTANT: Only guaranteed to work before the image has been
- * converted to display format.
- *
- * @param x The x coordinate.
- * @param y The y coordinate.
- * @return The color of the pixel.
- *
- * @since 0.5.0
- */
- virtual Color getPixel(int x, int y) A_WARN_UNUSED = 0;
-
- /**
- * Puts a pixel with a certain color at coordinate (x, y).
- *
- * @param x The x coordinate.
- * @param y The y coordinate.
- * @param color The color of the pixel to put.
- * @since 0.5.0
- */
- virtual void putPixel(int x, int y, const Color& color) = 0;
-
- /**
- * Converts the image, if possible, to display format.
- *
- * IMPORTANT: Only guaranteed to work before the image has been
- * converted to display format.
- * @since 0.5.0
- */
- virtual void convertToDisplayFormat() = 0;
- };
-} // namespace gcn
-
-#endif // end GCN_IMAGE_HPP