Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated

4 files changed, 5 insertions, 34 deletions

diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
index 1ec92460bd..f9b36bd1f6 100644
--- a/indra/llimage/llimagejpeg.cpp
+++ b/indra/llimage/llimagejpeg.cpp
@@ -40,8 +40,7 @@ LLImageJPEG::LLImageJPEG()
 	LLImageFormatted(IMG_CODEC_JPEG),
 	mOutputBuffer( NULL ),
 	mOutputBufferSize( 0 ),
-	mEncodeQuality( 75 ), // on a scale from 1 to 100
-	mSetjmpBuffer()
+	mEncodeQuality( 75 ) 		// on a scale from 1 to 100
 {
 }
 
diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp
index 682434850a..805297f8ee 100644
--- a/indra/llimage/llimagetga.cpp
+++ b/indra/llimage/llimagetga.cpp
@@ -63,30 +63,7 @@ LLImageTGA::LLImageTGA()
 	  mColorMapStart( 0 ),
 	  mColorMapLength( 0 ),
 	  mColorMapBytesPerEntry( 0 ),
-	  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)
+	  mIs15Bit( FALSE )
 {
 }
 
diff --git a/indra/llimage/llpngwrapper.cpp b/indra/llimage/llpngwrapper.cpp
index 7b0c1ea931..74a09b2106 100644
--- a/indra/llimage/llpngwrapper.cpp
+++ b/indra/llimage/llpngwrapper.cpp
@@ -42,22 +42,17 @@
 
 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 ),
-	  mHasBKGD(false),
-	  mBackgroundColor(),
-	  mGamma(0.f)
+	  mFinalSize( 0 )
 {
 }
 
diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h
index fd21ae697f..1c66b8a31c 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;