summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-09-27 17:54:52 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-09-27 17:54:52 -0700
commita4b223248eac077c7d8e00c5fbb9f5fb067cc9bd (patch)
tree760a282276c5bf6e4095b0944b1a08a3bfd32d87 /indra/llimage
parent7fc48fb1259d3dbceed5248d8ccda39048d6ba8d (diff)
parente6688f993f82d2683e3eadce96c893959c94be2d (diff)
Merge
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/llpngwrapper.cpp4
-rw-r--r--indra/llimage/llpngwrapper.h2
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