diff options
| author | eli_linden <eli@lindenlab.com> | 2010-09-16 15:00:10 -0700 |
|---|---|---|
| committer | eli_linden <eli@lindenlab.com> | 2010-09-16 15:00:10 -0700 |
| commit | 7ef0e0b92ff60f97f115df5779e574de2624159c (patch) | |
| tree | 459987853b9643c901fe10e2272dc6be6fc3c52c /indra/llimage/llpngwrapper.cpp | |
| parent | 54482096c59abc47dbf1c87a3d06abf7accd36f4 (diff) | |
| parent | 586ad99554192d2c868060b94cd462e42e267a64 (diff) | |
Merge
Diffstat (limited to 'indra/llimage/llpngwrapper.cpp')
| -rw-r--r-- | indra/llimage/llpngwrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llpngwrapper.cpp b/indra/llimage/llpngwrapper.cpp index 02043586b2..fe737e2072 100644 --- a/indra/llimage/llpngwrapper.cpp +++ b/indra/llimage/llpngwrapper.cpp @@ -210,7 +210,7 @@ void LLPngWrapper::normalizeImage() } if (mColorType == PNG_COLOR_TYPE_GRAY && mBitDepth < 8) { - png_set_gray_1_2_4_to_8(mReadPngPtr); + png_set_expand_gray_1_2_4_to_8(mReadPngPtr); } if (mColorType == PNG_COLOR_TYPE_GRAY || mColorType == PNG_COLOR_TYPE_GRAY_ALPHA) @@ -358,7 +358,7 @@ void LLPngWrapper::releaseResources() { if (mReadPngPtr || mReadInfoPtr) { - png_destroy_read_struct(&mReadPngPtr, &mReadInfoPtr, png_infopp_NULL); + png_destroy_read_struct(&mReadPngPtr, &mReadInfoPtr, NULL); mReadPngPtr = NULL; mReadInfoPtr = NULL; } |