From 38558960978a0741dd9c79c4c7a108b8a1f99eff Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Mon, 19 May 2008 17:02:33 +0000
Subject: EFFECTIVE MERGES: svn merge -r 79616:82632
 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release svn
 merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into
 release

ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release

dataserver-is-deprecated
---
 indra/llimage/llimagejpeg.cpp  |  3 ++-
 indra/llimage/llimagetga.cpp   | 25 ++++++++++++++++++++++++-
 indra/llimage/llpngwrapper.cpp |  9 +++++++--
 indra/llimage/llpngwrapper.h   |  2 +-
 4 files changed, 34 insertions(+), 5 deletions(-)

(limited to 'indra/llimage')

diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
index f9b36bd1f6..1ec92460bd 100644
--- a/indra/llimage/llimagejpeg.cpp
+++ b/indra/llimage/llimagejpeg.cpp
@@ -40,7 +40,8 @@ LLImageJPEG::LLImageJPEG()
 	LLImageFormatted(IMG_CODEC_JPEG),
 	mOutputBuffer( NULL ),
 	mOutputBufferSize( 0 ),
-	mEncodeQuality( 75 ) 		// on a scale from 1 to 100
+	mEncodeQuality( 75 ), // on a scale from 1 to 100
+	mSetjmpBuffer()
 {
 }
 
diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp
index 69a32975a0..a9fc02bf8d 100644
--- a/indra/llimage/llimagetga.cpp
+++ b/indra/llimage/llimagetga.cpp
@@ -63,7 +63,30 @@ LLImageTGA::LLImageTGA()
 	  mColorMapStart( 0 ),
 	  mColorMapLength( 0 ),
 	  mColorMapBytesPerEntry( 0 ),
-	  mIs15Bit( FALSE )
+	  mIs15Bit( FALSE ),
+
+	  mAttributeBits(0),
+	  mColorMapDepth(0),
+	  mColorMapIndexHi(0),
+	  mColorMapIndexLo(0),
+	  mColorMapLengthHi(0),
+	  mColorMapLengthLo(0),
+	  mColorMapType(0),
+	  mDataOffset(0),
+	  mHeightHi(0),
+	  mHeightLo(0),
+	  mIDLength(0),
+	  mImageType(0),
+	  mInterleave(0),
+	  mOriginRightBit(0),
+	  mOriginTopBit(0),
+	  mPixelSize(0),
+	  mWidthHi(0),
+	  mWidthLo(0),
+	  mXOffsetHi(0),
+	  mXOffsetLo(0),
+	  mYOffsetHi(0),
+	  mYOffsetLo(0)
 {
 }
 
diff --git a/indra/llimage/llpngwrapper.cpp b/indra/llimage/llpngwrapper.cpp
index 74a09b2106..7b0c1ea931 100644
--- a/indra/llimage/llpngwrapper.cpp
+++ b/indra/llimage/llpngwrapper.cpp
@@ -42,17 +42,22 @@
 
 LLPngWrapper::LLPngWrapper()
 	: mReadPngPtr( NULL ),
-      mReadInfoPtr( NULL ),
+	  mReadInfoPtr( NULL ),
 	  mWritePngPtr( NULL ),
 	  mWriteInfoPtr( NULL ),
 	  mRowPointers( NULL ),
+	  mWidth( 0 ),
+	  mHeight( 0 ),
 	  mBitDepth( 0 ),
 	  mColorType( 0 ),
 	  mChannels( 0 ),
 	  mInterlaceType( 0 ),
 	  mCompressionType( 0 ),
 	  mFilterMethod( 0 ),
-	  mFinalSize( 0 )
+	  mFinalSize( 0 ),
+	  mHasBKGD(false),
+	  mBackgroundColor(),
+	  mGamma(0.f)
 {
 }
 
diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h
index 1c66b8a31c..fd21ae697f 100644
--- a/indra/llimage/llpngwrapper.h
+++ b/indra/llimage/llpngwrapper.h
@@ -93,7 +93,7 @@ private:
 
 	U32 mFinalSize;
 
-	BOOL mHasBKGD;
+	bool mHasBKGD;
 	png_color_16p mBackgroundColor;
 
 	F64 mGamma;
-- 
cgit v1.2.3