diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-02-25 16:55:35 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-02-25 16:55:35 -0500 |
| commit | c3f05185a719e07706dc7f0096f5683c231a2755 (patch) | |
| tree | c6d17f2cf0a9acf1570ec83c3d2942d5e9cb49e4 /indra/llimage/llimagepng.cpp | |
| parent | 692d3b17257ced5b70737d54f47f55a006206f36 (diff) | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
merge
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; |