LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 07:41:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplified some compressed image parsing code.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-08-30 22:25:26 -03:00
parent 907630b04c
commit a41f78dfe4
26 changed files with 101 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/CompressedImageData.cpp
+5 -5
View File
@@ -27,15 +27,15 @@ namespace image
love::Type CompressedImageData::type("CompressedImageData", &Data::type);
CompressedImageData::CompressedImageData(const std::list<CompressedFormatHandler *> &formats, Data *filedata)
CompressedImageData::CompressedImageData(const std::list<FormatHandler *> &formats, Data *filedata)
: format(PIXELFORMAT_UNKNOWN)
, sRGB(false)
{
CompressedFormatHandler *parser = nullptr;
FormatHandler *parser = nullptr;
for (CompressedFormatHandler *handler : formats)
for (FormatHandler *handler : formats)
{
if (handler->canParse(filedata))
if (handler->canParseCompressed(filedata))
{
parser = handler;
break;
@@ -45,7 +45,7 @@ CompressedImageData::CompressedImageData(const std::list<CompressedFormatHandler
if (parser == nullptr)
throw love::Exception("Could not parse compressed data: Unknown format.");
memory = parser->parse(filedata, dataImages, format, sRGB);
memory = parser->parseCompressed(filedata, dataImages, format, sRGB);
if (memory == nullptr)
throw love::Exception("Could not parse compressed data.");