diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-17 09:57:38 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-17 09:57:38 -0700 |
| commit | 7c3a81f577307143a6d4bb5cef1606db82397cdd (patch) | |
| tree | 26c531402dbc8f1224185e7461f3b7584b558614 /indra/llimage | |
| parent | 0974f18da5f3b1e69191be19153925930efd6a9d (diff) | |
| parent | 27bbf79c89fb8c737b88d769b2056304aef69dc3 (diff) | |
Merge in lenny work
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llpngwrapper.cpp | 4 | ||||
| -rw-r--r-- | indra/llimage/llpngwrapper.h | 2 |
2 files changed, 3 insertions, 3 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; } diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h index 0721adea3b..47a4207d66 100644 --- a/indra/llimage/llpngwrapper.h +++ b/indra/llimage/llpngwrapper.h @@ -26,7 +26,7 @@ #ifndef LL_LLPNGWRAPPER_H #define LL_LLPNGWRAPPER_H -#include "libpng12/png.h" +#include "png.h" #include "llimage.h" class LLPngWrapper |