Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Transparent PNG fix, by Thickbrick

Browse Source
This commit is contained in:
Siana Gearz
2011-02-16 20:24:03 +01:00
parent 8c02c2bb08
commit da61fc8195
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/llimage/llpngwrapper.cpp
View File

@@ -56,8 +56,6 @@ LLPngWrapper::LLPngWrapper()
mCompressionType( 0 ), mCompressionType( 0 ),
mFilterMethod( 0 ), mFilterMethod( 0 ),
mFinalSize( 0 ), mFinalSize( 0 ),
mHasBKGD(false),
mBackgroundColor(),
mGamma(0.f) mGamma(0.f)
{ {
} }
@@ -117,9 +115,9 @@ void LLPngWrapper::writeFlush(png_structp png_ptr)
} }
// Read the PNG file using the libpng. The low-level interface is used here // Read the PNG file using the libpng. The low-level interface is used here
// because we want to do various transformations (including setting the // because we want to do various transformations (including applying gama)
// matte background if any, and applying gama) which can't be done with // which can't be done with the high-level interface.
// the high-level interface. The scanline also begins at the bottom of // The scanline also begins at the bottom of
// the image (per SecondLife conventions) instead of at the top, so we // the image (per SecondLife conventions) instead of at the top, so we
// must assign row-pointers in "reverse" order. // must assign row-pointers in "reverse" order.
BOOL LLPngWrapper::readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop) BOOL LLPngWrapper::readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop)
@@ -207,8 +205,7 @@ void LLPngWrapper::normalizeImage()
// 2. Convert grayscales to RGB // 2. Convert grayscales to RGB
// 3. Create alpha layer from transparency // 3. Create alpha layer from transparency
// 4. Ensure 8-bpp for all images // 4. Ensure 8-bpp for all images
// 5. Apply background matte if any // 5. Set (or guess) gamma
// 6. Set (or guess) gamma
if (mColorType == PNG_COLOR_TYPE_PALETTE) if (mColorType == PNG_COLOR_TYPE_PALETTE)
{ {
@@ -235,12 +232,6 @@ void LLPngWrapper::normalizeImage()
{ {
png_set_strip_16(mReadPngPtr); png_set_strip_16(mReadPngPtr);
} }
mHasBKGD = png_get_bKGD(mReadPngPtr, mReadInfoPtr, &mBackgroundColor);
if (mHasBKGD)
{
png_set_background(mReadPngPtr, mBackgroundColor,
PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
}
#if LL_DARWIN #if LL_DARWIN
const F64 SCREEN_GAMMA = 1.8; const F64 SCREEN_GAMMA = 1.8;
@@ -267,7 +258,6 @@ void LLPngWrapper::updateMetaData()
mBitDepth = png_get_bit_depth(mReadPngPtr, mReadInfoPtr); mBitDepth = png_get_bit_depth(mReadPngPtr, mReadInfoPtr);
mColorType = png_get_color_type(mReadPngPtr, mReadInfoPtr); mColorType = png_get_color_type(mReadPngPtr, mReadInfoPtr);
mChannels = png_get_channels(mReadPngPtr, mReadInfoPtr); mChannels = png_get_channels(mReadPngPtr, mReadInfoPtr);
mHasBKGD = png_get_bKGD(mReadPngPtr, mReadInfoPtr, &mBackgroundColor);
} }
// Method to write raw image into PNG at dest. The raw scanline begins // Method to write raw image into PNG at dest. The raw scanline begins

3
indra/llimage/llpngwrapper.h
View File

@@ -94,9 +94,6 @@ private:
U32 mFinalSize; U32 mFinalSize;
bool mHasBKGD;
png_color_16p mBackgroundColor;
F64 mGamma; F64 mGamma;
std::string mErrorMessage; std::string mErrorMessage;