Removed an unused graphics Image method

--HG--
branch : image-CompressedData
This commit is contained in:
Alex Szpakowski
2013-04-08 21:58:20 -03:00
parent 299ee64320
commit ab2c4aca7e
10 changed files with 24 additions and 68 deletions
+8 -4
View File
@@ -40,16 +40,20 @@ CompressedData::~CompressedData()
void CompressedData::load(love::filesystem::FileData *data)
{
std::vector<SubImage> parsedImages;
// SubImage vector will be populated by a parser.
std::vector<SubImage> parsedimages;
TextureType textype = TYPE_UNKNOWN;
if (ddsHandler::canParse(data))
textype = ddsHandler::parse(data, parsedImages);
textype = ddsHandler::parse(data, parsedimages);
if (textype == TYPE_UNKNOWN)
throw (love::Exception("Could not parse compressed data: Unknown format."));
throw love::Exception("Could not parse compressed data: Unknown format.");
dataImages = parsedImages;
if (parsedimages.size() == 0)
throw love::Exception("Could not parse compressed data: No valid data?");
dataImages = parsedimages;
type = textype;
}
+1 -1
View File
@@ -22,7 +22,7 @@
#define LOVE_IMAGE_MAGPIE_COMPRESSED_DATA_H
// LOVE
#include "filesystem/File.h"
#include "filesystem/FileData.h"
#include "image/CompressedData.h"
namespace love
@@ -23,7 +23,6 @@
// LOVE
#include "common/Exception.h"
#include "common/math.h"
#include "filesystem/File.h"
#include "thread/threads.h"
// DevIL
+1 -1
View File
@@ -22,7 +22,7 @@
#define LOVE_IMAGE_MAGPIE_DEVIL_HANDLER_H
// LOVE
#include "filesystem/File.h"
#include "filesystem/FileData.h"
#include "FormatHandler.h"
namespace love
+1 -1
View File
@@ -23,7 +23,7 @@
// LOVE
#include "image/ImageData.h"
#include "filesystem/File.h"
#include "filesystem/FileData.h"
namespace love
{
+3 -3
View File
@@ -22,7 +22,7 @@
#define LOVE_IMAGE_MAGPIE_DDS_HANDLER_H
// LOVE
#include "filesystem/File.h"
#include "filesystem/FileData.h"
#include "image/CompressedData.h"
// dds parser
@@ -55,8 +55,8 @@ public:
/**
* Parses Compressed image data into a list of sub-images.
* @param[in] data The data to parse.
* @param[out] images The list of sub-images (including byte data for each),
* created by the parser.
* @param[out] images The list of sub-images (including byte data for each)
* parsed from the file data.
* @return The type of CompressedData.
**/
static CompressedData::TextureType parse(filesystem::FileData *data, std::vector<CompressedData::SubImage> &images);