diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-27 09:03:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-27 09:03:04 -0500 |
| commit | 83851db09ab0fecbb6722826055a55844fd98ea6 (patch) | |
| tree | b3c73b1dec463e4d8a8a315f1d713a83e119d99b /indra/llimage/llimagepng.cpp | |
| parent | bdb42b4c716a374ab7a7b54a630ed5b5a481cdb2 (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
merge up to 3.7.25-release
Diffstat (limited to 'indra/llimage/llimagepng.cpp')
| -rwxr-xr-x | 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 294f68b122..7735dc1379 100755 --- a/indra/llimage/llimagepng.cpp +++ b/indra/llimage/llimagepng.cpp @@ -67,7 +67,7 @@ BOOL LLImagePNG::updateData() } LLPngWrapper::ImageInfo infop; - if (! pngWrapper.readPng(getData(), NULL, &infop)) + if (! pngWrapper.readPng(getData(), getDataSize(), NULL, &infop)) { setLastError(pngWrapper.getErrorMessage()); return FALSE; @@ -102,7 +102,7 @@ BOOL LLImagePNG::decode(LLImageRaw* raw_image, F32 decode_time) return FALSE; } - if (! pngWrapper.readPng(getData(), raw_image)) + if (! pngWrapper.readPng(getData(), getDataSize(), raw_image)) { setLastError(pngWrapper.getErrorMessage()); return FALSE; |