diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2011-12-25 16:18:49 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:50 +0100 |
commit | 2636e834c25a42bb2dd01c3c61d075b666dee3bf (patch) | |
tree | c4dde3e6751393aeb3bbf5f48e0dc345ee2da997 /src/utils | |
parent | 6b6a6f4331631bb4ef92a23c80e982f2a6b76109 (diff) | |
download | usdx-2636e834c25a42bb2dd01c3c61d075b666dee3bf.tar.gz usdx-2636e834c25a42bb2dd01c3c61d075b666dee3bf.tar.xz usdx-2636e834c25a42bb2dd01c3c61d075b666dee3bf.zip |
base: moved Image and Texture to more appropriate locations
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/image.cpp | 86 | ||||
-rw-r--r-- | src/utils/image.hpp | 68 |
2 files changed, 154 insertions, 0 deletions
diff --git a/src/utils/image.cpp b/src/utils/image.cpp new file mode 100644 index 00000000..1eb09ac1 --- /dev/null +++ b/src/utils/image.cpp @@ -0,0 +1,86 @@ +/* + * 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 <SDL/SDL_image.h> +#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; + } +}; diff --git a/src/utils/image.hpp b/src/utils/image.hpp new file mode 100644 index 00000000..4c9d911e --- /dev/null +++ b/src/utils/image.hpp @@ -0,0 +1,68 @@ +/* + * 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$ + */ + +#ifndef IMAGE_HPP +#define IMAGE_HPP + +#include <exception> +#include <string> +#include <boost/filesystem.hpp> +#include <SDL/SDL.h> +#include <log4cpp/Category.hh> + +namespace usdx +{ + class ImageLoadException : public std::exception + { + private: + std::string error; + + public: + ImageLoadException(std::string error); + ~ImageLoadException() throw(); + const char* what() const throw(); + }; + + + class Image + { + private: + static log4cpp::Category& log; + + boost::filesystem::wpath filename; + SDL_Surface* surface; + + void load(void); + + public: + Image(boost::filesystem::wpath filename); + virtual ~Image(); + + SDL_Surface* get_surface(void); + }; +}; + +#endif |