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

Fixed loading and saving 16 bit per component PNGs.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-10-28 00:13:36 -03:00
parent 3de1aa863a
commit c6f8a1535d
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/magpie/PNGHandler.cpp
+31 -2
View File
@@ -189,7 +189,7 @@ PNGHandler::DecodedImage PNGHandler::decode(love::filesystem::FileData *fdata)
if (state.info_raw.bitdepth == 16)
{
uint16 *pixeldata = (uint16 *) img.data;
uint16 numpixelcomponents = img.size / sizeof(uint16);
size_t numpixelcomponents = img.size / sizeof(uint16);
for (size_t i = 0; i < numpixelcomponents; i++)
pixeldata[i] = swapuint16(pixeldata[i]);
@@ -216,8 +216,37 @@ PNGHandler::EncodedImage PNGHandler::encode(const DecodedImage &img, ImageData::
state.encoder.zlibsettings.custom_zlib = zlibCompress;
const uint8 *data = img.data;
uint16 *swappeddata = nullptr;
// LodePNG expects big-endian raw pixel data when encoding a 16 bit image.
#ifndef LOVE_BIG_ENDIAN
if (state.info_raw.bitdepth == 16)
{
try
{
swappeddata = new uint16[img.size / sizeof(uint16)];
}
catch (std::exception &)
{
throw love::Exception("Out of memory.");
}
const uint16 *rawdata = (const uint16 *) img.data;
size_t numpixelcomponents = img.size / sizeof(uint16);
for (size_t i = 0; i < numpixelcomponents; i++)
swappeddata[i] = swapuint16(rawdata[i]);
data = (const uint8 *) swappeddata;
}
#endif
unsigned status = lodepng_encode(&encimg.data, &encimg.size,
img.data, img.width, img.height, &state);
data, img.width, img.height, &state);
if (swappeddata != nullptr)
delete[] swappeddata;
if (status != 0)
{