diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-16 20:09:36 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-16 20:09:36 -0700 |
| commit | 8ada6ed3cf562d33cc66f2a5d664b5e1f40e1f0c (patch) | |
| tree | a6430d873ca02f5cee683c95a3a4747c16f8aace /indra/llimage/llpngwrapper.cpp | |
| parent | 657f75b89de4cfd5ade82e3bc30e236cd2533017 (diff) | |
| parent | 30c8979e157a4503509360f0c70d609eb97d6db9 (diff) | |
Pull update from viewer-development
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; } |