Merge branch 'marchcat/w-whitespace' into marchcat/x-mf-merge

1 files changed, 66 insertions, 66 deletions

diff --git a/indra/llimage/llimagepng.cpp b/indra/llimage/llimagepng.cpp
index c4b98d8260..29a86f77f6 100644
--- a/indra/llimage/llimagepng.cpp
+++ b/indra/llimage/llimagepng.cpp
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -58,24 +58,24 @@ bool LLImagePNG::updateData()
         return false;
     }
 
-	// Decode the PNG data and extract sizing information
-	LLPngWrapper pngWrapper;
-	if (!pngWrapper.isValidPng(getData()))
-	{
-		setLastError("LLImagePNG data does not have a valid PNG header!");
-		return false;
-	}
+    // Decode the PNG data and extract sizing information
+    LLPngWrapper pngWrapper;
+    if (!pngWrapper.isValidPng(getData()))
+    {
+        setLastError("LLImagePNG data does not have a valid PNG header!");
+        return false;
+    }
 
-	LLPngWrapper::ImageInfo infop;
-	if (! pngWrapper.readPng(getData(), getDataSize(), NULL, &infop))
-	{
-		setLastError(pngWrapper.getErrorMessage());
-		return false;
-	}
+    LLPngWrapper::ImageInfo infop;
+    if (! pngWrapper.readPng(getData(), getDataSize(), NULL, &infop))
+    {
+        setLastError(pngWrapper.getErrorMessage());
+        return false;
+    }
 
-	setSize(infop.mWidth, infop.mHeight, infop.mComponents);
+    setSize(infop.mWidth, infop.mHeight, infop.mComponents);
 
-	return true;
+    return true;
 }
 
 // Virtual
@@ -83,7 +83,7 @@ bool LLImagePNG::updateData()
 // used within SecondLife.
 bool LLImagePNG::decode(LLImageRaw* raw_image, F32 decode_time)
 {
-	llassert_always(raw_image);
+    llassert_always(raw_image);
 
     resetLastError();
 
@@ -94,60 +94,60 @@ bool LLImagePNG::decode(LLImageRaw* raw_image, F32 decode_time)
         return false;
     }
 
-	// Decode the PNG data into the raw image
-	LLPngWrapper pngWrapper;
-	if (!pngWrapper.isValidPng(getData()))
-	{
-		setLastError("LLImagePNG data does not have a valid PNG header!");
-		return false;
-	}
-
-	if (! pngWrapper.readPng(getData(), getDataSize(), raw_image))
-	{
-		setLastError(pngWrapper.getErrorMessage());
-		return false;
-	}
-
-	return true;
+    // Decode the PNG data into the raw image
+    LLPngWrapper pngWrapper;
+    if (!pngWrapper.isValidPng(getData()))
+    {
+        setLastError("LLImagePNG data does not have a valid PNG header!");
+        return false;
+    }
+
+    if (! pngWrapper.readPng(getData(), getDataSize(), raw_image))
+    {
+        setLastError(pngWrapper.getErrorMessage());
+        return false;
+    }
+
+    return true;
 }
 
 // Virtual
 // Encode the in memory RGB image into PNG format.
 bool LLImagePNG::encode(const LLImageRaw* raw_image, F32 encode_time)
 {
-	llassert_always(raw_image);
+    llassert_always(raw_image);
 
     resetLastError();
 
-	// Image logical size
-	setSize(raw_image->getWidth(), raw_image->getHeight(), raw_image->getComponents());
-
-	// Temporary buffer to hold the encoded image. Note: the final image
-	// size should be much smaller due to compression.
-	U32 bufferSize = getWidth() * getHeight() * getComponents() + 8192;
-	U8* tmpWriteBuffer = new(std::nothrow) U8[ bufferSize ];
-	if (!tmpWriteBuffer)
-	{
-		setLastError("LLImagePNG::out of memory");
-		return false;
-	}
-
-	// Delegate actual encoding work to wrapper
-	LLPngWrapper pngWrapper;
-	if (!pngWrapper.writePng(raw_image, tmpWriteBuffer, bufferSize))
-	{
-		setLastError(pngWrapper.getErrorMessage());
-		delete[] tmpWriteBuffer;
-		return false;
-	}
-
-	// Resize internal buffer and copy from temp
-	U32 encodedSize = pngWrapper.getFinalSize();
-	allocateData(encodedSize);
-	memcpy(getData(), tmpWriteBuffer, encodedSize);
-
-	delete[] tmpWriteBuffer;
-
-	return true;
+    // Image logical size
+    setSize(raw_image->getWidth(), raw_image->getHeight(), raw_image->getComponents());
+
+    // Temporary buffer to hold the encoded image. Note: the final image
+    // size should be much smaller due to compression.
+    U32 bufferSize = getWidth() * getHeight() * getComponents() + 8192;
+    U8* tmpWriteBuffer = new(std::nothrow) U8[ bufferSize ];
+    if (!tmpWriteBuffer)
+    {
+        setLastError("LLImagePNG::out of memory");
+        return false;
+    }
+
+    // Delegate actual encoding work to wrapper
+    LLPngWrapper pngWrapper;
+    if (!pngWrapper.writePng(raw_image, tmpWriteBuffer, bufferSize))
+    {
+        setLastError(pngWrapper.getErrorMessage());
+        delete[] tmpWriteBuffer;
+        return false;
+    }
+
+    // Resize internal buffer and copy from temp
+    U32 encodedSize = pngWrapper.getFinalSize();
+    allocateData(encodedSize);
+    memcpy(getData(), tmpWriteBuffer, encodedSize);
+
+    delete[] tmpWriteBuffer;
+
+    return true;
 }