diff options
author | callum_linden <none@none> | 2017-08-22 14:32:04 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2017-08-22 14:32:04 -0700 |
commit | b5dbb9c52aa8f9379662f1ff1169adadcf8ac5f8 (patch) | |
tree | 438d099240df63608825568d162874e186835994 /indra/llimage/llimagepng.cpp | |
parent | 8e6751efced8d9f5ede5ec5d954ff809d56d1162 (diff) | |
parent | 58176de9574164e31790a148d9b5489a129fc961 (diff) |
Automated merge with head of ll/viewer64 after DRTVWR-439 merge
Diffstat (limited to 'indra/llimage/llimagepng.cpp')
-rw-r--r-- | indra/llimage/llimagepng.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimagepng.cpp b/indra/llimage/llimagepng.cpp index a299602d79..a4823ed859 100644 --- a/indra/llimage/llimagepng.cpp +++ b/indra/llimage/llimagepng.cpp @@ -124,12 +124,12 @@ bool LLImagePNG::encode(const LLImageRaw* raw_image, F32 encode_time) // 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() + 8192; U8* tmpWriteBuffer = new U8[ bufferSize ]; // Delegate actual encoding work to wrapper LLPngWrapper pngWrapper; - if (! pngWrapper.writePng(raw_image, tmpWriteBuffer)) + if (!pngWrapper.writePng(raw_image, tmpWriteBuffer, bufferSize)) { setLastError(pngWrapper.getErrorMessage()); delete[] tmpWriteBuffer; |