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.h | |
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 '')
-rw-r--r-- | linden/indra/llimage/llpngwrapper.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llimage/llpngwrapper.h b/linden/indra/llimage/llpngwrapper.h index b773b72..bd603c3 100644 --- a/linden/indra/llimage/llpngwrapper.h +++ b/linden/indra/llimage/llpngwrapper.h | |||
@@ -52,7 +52,7 @@ public: | |||
52 | BOOL readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop = NULL); | 52 | BOOL readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop = NULL); |
53 | BOOL writePng(const LLImageRaw* rawImage, U8* dst); | 53 | BOOL writePng(const LLImageRaw* rawImage, U8* dst); |
54 | U32 getFinalSize(); | 54 | U32 getFinalSize(); |
55 | LLString getErrorMessage(); | 55 | const std::string& getErrorMessage(); |
56 | 56 | ||
57 | protected: | 57 | protected: |
58 | void normalizeImage(); | 58 | void normalizeImage(); |
@@ -93,12 +93,12 @@ private: | |||
93 | 93 | ||
94 | U32 mFinalSize; | 94 | U32 mFinalSize; |
95 | 95 | ||
96 | BOOL mHasBKGD; | 96 | bool mHasBKGD; |
97 | png_color_16p mBackgroundColor; | 97 | png_color_16p mBackgroundColor; |
98 | 98 | ||
99 | F64 mGamma; | 99 | F64 mGamma; |
100 | 100 | ||
101 | LLString mErrorMessage; | 101 | std::string mErrorMessage; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | #endif | 104 | #endif |