From 2636e834c25a42bb2dd01c3c61d075b666dee3bf Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 25 Dec 2011 16:18:49 +0100 Subject: base: moved Image and Texture to more appropriate locations --- src/base/image.cpp | 86 ------------------------------------------------------ 1 file changed, 86 deletions(-) delete mode 100644 src/base/image.cpp (limited to 'src/base/image.cpp') diff --git a/src/base/image.cpp b/src/base/image.cpp deleted file mode 100644 index 1eb09ac1..00000000 --- a/src/base/image.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * UltraStar Deluxe - Karaoke Game - * - * UltraStar Deluxe is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * 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 (at your option) 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; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - */ - -#include "image.hpp" -#include -#include "utils/binary_file.hpp" - -namespace usdx -{ - log4cpp::Category& Image::log = - log4cpp::Category::getInstance("usdx.base.Image"); - - ImageLoadException::ImageLoadException(std::string error) : - error(error) - { - } - - ImageLoadException::~ImageLoadException() throw() - { - } - - const char* ImageLoadException::what() const throw() - { - return error.c_str(); - } - - Image::Image(boost::filesystem::wpath filename) : - filename(filename), surface(NULL) - { - } - - Image::~Image() - { - if (surface != NULL) { - SDL_FreeSurface(surface); - surface = NULL; - } - } - - void Image::load(void) - { - BinaryFile file(filename); - - SDL_RWops* source = SDL_RWFromConstMem(file.get_content(), - file.get_filesize()); - surface = IMG_Load_RW(source, 1); - - if (surface == NULL) { - log << log4cpp::Priority::ERROR << - "Error loading image: " << filename; - throw ImageLoadException(IMG_GetError()); - } - } - - SDL_Surface* Image::get_surface(void) - { - if (surface == NULL) { - load(); - } - - return surface; - } -}; -- cgit v1.2.3