LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 01:20:56 +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/ImageData.cpp
+5 -5
View File
@@ -78,7 +78,7 @@ ImageData::ImageData(const ImageData &c)
ImageData::~ImageData()
{
if (decodeHandler.get())
decodeHandler->free(data);
decodeHandler->freeRawPixels(data);
else
delete[] data;
}
@@ -145,13 +145,13 @@ void ImageData::decode(Data *data)
if (decodedimage.size != decodedimage.width * decodedimage.height * getPixelFormatSize(decodedimage.format))
{
decoder->free(decodedimage.data);
decoder->freeRawPixels(decodedimage.data);
throw love::Exception("Could not convert image!");
}
// Clean up any old data.
if (decodeHandler)
decodeHandler->free(this->data);
decodeHandler->freeRawPixels(this->data);
else
delete[] this->data;
@@ -210,12 +210,12 @@ love::filesystem::FileData *ImageData::encode(FormatHandler::EncodedFormat encod
}
catch (love::Exception &)
{
encoder->free(encodedimage.data);
encoder->freeRawPixels(encodedimage.data);
throw;
}
memcpy(filedata->getData(), encodedimage.data, encodedimage.size);
encoder->free(encodedimage.data);
encoder->freeRawPixels(encodedimage.data);
if (writefile)
{