summaryrefslogtreecommitdiff
path: root/indra/llimage/llpngwrapper.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-02-25 16:55:35 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-02-25 16:55:35 -0500
commitc3f05185a719e07706dc7f0096f5683c231a2755 (patch)
treec6d17f2cf0a9acf1570ec83c3d2942d5e9cb49e4 /indra/llimage/llpngwrapper.h
parent692d3b17257ced5b70737d54f47f55a006206f36 (diff)
parent9b45bc992edf8d049d8a1abe2e778870a493295a (diff)
merge
Diffstat (limited to 'indra/llimage/llpngwrapper.h')
-rwxr-xr-xindra/llimage/llpngwrapper.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h
index 739f435996..27d7df3bef 100755
--- a/indra/llimage/llpngwrapper.h
+++ b/indra/llimage/llpngwrapper.h
@@ -44,7 +44,7 @@ public:
};
BOOL isValidPng(U8* src);
- BOOL readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop = NULL);
+ BOOL readPng(U8* src, S32 dataSize, LLImageRaw* rawImage, ImageInfo *infop = NULL);
BOOL writePng(const LLImageRaw* rawImage, U8* dst);
U32 getFinalSize();
const std::string& getErrorMessage();
@@ -61,6 +61,7 @@ private:
{
U8 *mData;
U32 mOffset;
+ S32 mDataSize;
};
static void writeFlush(png_structp png_ptr);