diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llimage/llpngwrapper.cpp | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/llimage/llpngwrapper.cpp')
-rw-r--r-- | linden/indra/llimage/llpngwrapper.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/linden/indra/llimage/llpngwrapper.cpp b/linden/indra/llimage/llpngwrapper.cpp index 0054adf..35b4ec3 100644 --- a/linden/indra/llimage/llpngwrapper.cpp +++ b/linden/indra/llimage/llpngwrapper.cpp | |||
@@ -42,17 +42,22 @@ | |||
42 | 42 | ||
43 | LLPngWrapper::LLPngWrapper() | 43 | LLPngWrapper::LLPngWrapper() |
44 | : mReadPngPtr( NULL ), | 44 | : mReadPngPtr( NULL ), |
45 | mReadInfoPtr( NULL ), | 45 | mReadInfoPtr( NULL ), |
46 | mWritePngPtr( NULL ), | 46 | mWritePngPtr( NULL ), |
47 | mWriteInfoPtr( NULL ), | 47 | mWriteInfoPtr( NULL ), |
48 | mRowPointers( NULL ), | 48 | mRowPointers( NULL ), |
49 | mWidth( 0 ), | ||
50 | mHeight( 0 ), | ||
49 | mBitDepth( 0 ), | 51 | mBitDepth( 0 ), |
50 | mColorType( 0 ), | 52 | mColorType( 0 ), |
51 | mChannels( 0 ), | 53 | mChannels( 0 ), |
52 | mInterlaceType( 0 ), | 54 | mInterlaceType( 0 ), |
53 | mCompressionType( 0 ), | 55 | mCompressionType( 0 ), |
54 | mFilterMethod( 0 ), | 56 | mFilterMethod( 0 ), |
55 | mFinalSize( 0 ) | 57 | mFinalSize( 0 ), |
58 | mHasBKGD(false), | ||
59 | mBackgroundColor(), | ||
60 | mGamma(0.f) | ||
56 | { | 61 | { |
57 | } | 62 | } |
58 | 63 | ||
@@ -384,7 +389,7 @@ U32 LLPngWrapper::getFinalSize() | |||
384 | } | 389 | } |
385 | 390 | ||
386 | // Get last error message, if any | 391 | // Get last error message, if any |
387 | LLString LLPngWrapper::getErrorMessage() | 392 | const std::string& LLPngWrapper::getErrorMessage() |
388 | { | 393 | { |
389 | return mErrorMessage; | 394 | return mErrorMessage; |
390 | } | 395 | } |