Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempted fox for PNG

Browse Source
This commit is contained in:
Inusaito Sayori
2014-11-20 12:21:35 -05:00
parent 5a045db751
commit 8b658bd628
2 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
indra/llimage/llimagepng.cpp
View File

@@ -122,53 +122,27 @@ BOOL LLImagePNG::encode(const LLImageRaw* raw_image, F32 encode_time)
// Image logical size // Image logical size
setSize(raw_image->getWidth(), raw_image->getHeight(), raw_image->getComponents()); setSize(raw_image->getWidth(), raw_image->getHeight(), raw_image->getComponents());
// Temporary buffer to hold the encoded image. Note: the final image
// size should be much smaller due to compression.
U32 bufferSize = getWidth() * getHeight() * getComponents() + 1024; U32 bufferSize = getWidth() * getHeight() * getComponents() + 1024;
U8* tmpWriteBuffer = new U8[ bufferSize ];
//New implementation
allocateData(bufferSize); //Set to largest possible size.
if(isBufferInvalid()) //Checking
{
setLastError("LLImagePNG::encode failed allocateData");
return FALSE;
}
// Delegate actual encoding work to wrapper
LLPngWrapper pngWrapper;
if (! pngWrapper.writePng(raw_image, getData()))
{
setLastError(pngWrapper.getErrorMessage());
deleteData();
return FALSE;
}
// Resize internal buffer.
if(!reallocateData(pngWrapper.getFinalSize())) //Shrink. Returns NULL on failure.
{
setLastError("LLImagePNG::encode failed reallocateData");
deleteData();
return FALSE;
}
return TRUE;
/*U8* mTmpWriteBuffer = new U8[ bufferSize ];
// Delegate actual encoding work to wrapper // Delegate actual encoding work to wrapper
LLPngWrapper pngWrapper; LLPngWrapper pngWrapper;
if (! pngWrapper.writePng(raw_image, mTmpWriteBuffer)) if (! pngWrapper.writePng(raw_image, tmpWriteBuffer))
{ {
setLastError(pngWrapper.getErrorMessage()); setLastError(pngWrapper.getErrorMessage());
delete[] mTmpWriteBuffer; delete[] tmpWriteBuffer;
return FALSE; return FALSE;
} }
// Resize internal buffer and copy from temp // Resize internal buffer and copy from temp
U32 encodedSize = pngWrapper.getFinalSize(); U32 encodedSize = pngWrapper.getFinalSize();
allocateData(encodedSize); allocateData(encodedSize);
memcpy(getData(), mTmpWriteBuffer, encodedSize); memcpy(getData(), tmpWriteBuffer, encodedSize);
delete[] mTmpWriteBuffer; delete[] tmpWriteBuffer;
return TRUE;*/ return TRUE;
} }

1
indra/llimage/llpngwrapper.cpp
View File

@@ -252,6 +252,7 @@ void LLPngWrapper::normalizeImage()
// Read out the image meta-data // Read out the image meta-data
void LLPngWrapper::updateMetaData() void LLPngWrapper::updateMetaData()
{ {
png_set_interlace_handling(mReadPngPtr); // <alchemy/>
png_read_update_info(mReadPngPtr, mReadInfoPtr); png_read_update_info(mReadPngPtr, mReadInfoPtr);
mWidth = png_get_image_width(mReadPngPtr, mReadInfoPtr); mWidth = png_get_image_width(mReadPngPtr, mReadInfoPtr);
mHeight = png_get_image_height(mReadPngPtr, mReadInfoPtr); mHeight = png_get_image_height(mReadPngPtr, mReadInfoPtr);