Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 97 insertions, 97 deletions

diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h
index b17e8d1f40..7356a76353 100644
--- a/indra/llimage/llpngwrapper.h
+++ b/indra/llimage/llpngwrapper.h
@@ -1,97 +1,97 @@
-/*
- * @file llpngwrapper.h
- *
- * $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$
- */
-
-#ifndef LL_LLPNGWRAPPER_H
-#define LL_LLPNGWRAPPER_H
-
-#include "png.h"
-#include "llimage.h"
-
-class LLPngWrapper
-{
-public:
-	LLPngWrapper();
-	virtual ~LLPngWrapper();
-
-public:
-	struct ImageInfo
-	{
-		U16 mWidth;
-		U16 mHeight;
-		S8  mComponents;
-	};
-
-    bool isValidPng(U8* src);
-    bool readPng(U8* src, S32 dataSize, LLImageRaw* rawImage, ImageInfo *infop = NULL);
-    bool writePng(const LLImageRaw* rawImage, U8* dst, size_t destSize);
-	U32  getFinalSize();
-	const std::string& getErrorMessage();
-
-protected:
-	void normalizeImage();
-	void updateMetaData();
-
-private:
-
-	// Structure for writing/reading PNG data to/from memory
-	// as opposed to using a file.
-	struct PngDataInfo
-	{
-		U8 *mData;
-		U32 mOffset;
-		S32 mDataSize;
-	};
-
-	static void writeFlush(png_structp png_ptr);
-	static void errorHandler(png_structp png_ptr, png_const_charp msg);
-	static void readDataCallback(png_structp png_ptr, png_bytep dest, png_size_t length);
-	static void writeDataCallback(png_structp png_ptr, png_bytep src, png_size_t length);
-
-	void releaseResources();
-
-	png_structp mReadPngPtr;
-	png_infop mReadInfoPtr;
-	png_structp mWritePngPtr;
-	png_infop mWriteInfoPtr;
-
-	U8 **mRowPointers;
-
-	png_uint_32 mWidth;
-	png_uint_32 mHeight;
-	S32 mBitDepth;
-	S32 mColorType;
-	S32 mChannels;
-	S32 mInterlaceType;
-	S32 mCompressionType;
-	S32 mFilterMethod;
-
-	U32 mFinalSize;
-
-	F64 mGamma;
-
-	std::string mErrorMessage;
-};
-
-#endif
+/*

+ * @file llpngwrapper.h

+ *

+ * $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$

+ */

+

+#ifndef LL_LLPNGWRAPPER_H

+#define LL_LLPNGWRAPPER_H

+

+#include "png.h"

+#include "llimage.h"

+

+class LLPngWrapper

+{

+public:

+    LLPngWrapper();

+    virtual ~LLPngWrapper();

+

+public:

+    struct ImageInfo

+    {

+        U16 mWidth;

+        U16 mHeight;

+        S8  mComponents;

+    };

+

+    bool isValidPng(U8* src);

+    bool readPng(U8* src, S32 dataSize, LLImageRaw* rawImage, ImageInfo *infop = NULL);

+    bool writePng(const LLImageRaw* rawImage, U8* dst, size_t destSize);

+    U32  getFinalSize();

+    const std::string& getErrorMessage();

+

+protected:

+    void normalizeImage();

+    void updateMetaData();

+

+private:

+

+    // Structure for writing/reading PNG data to/from memory

+    // as opposed to using a file.

+    struct PngDataInfo

+    {

+        U8 *mData;

+        U32 mOffset;

+        S32 mDataSize;

+    };

+

+    static void writeFlush(png_structp png_ptr);

+    static void errorHandler(png_structp png_ptr, png_const_charp msg);

+    static void readDataCallback(png_structp png_ptr, png_bytep dest, png_size_t length);

+    static void writeDataCallback(png_structp png_ptr, png_bytep src, png_size_t length);

+

+    void releaseResources();

+

+    png_structp mReadPngPtr;

+    png_infop mReadInfoPtr;

+    png_structp mWritePngPtr;

+    png_infop mWriteInfoPtr;

+

+    U8 **mRowPointers;

+

+    png_uint_32 mWidth;

+    png_uint_32 mHeight;

+    S32 mBitDepth;

+    S32 mColorType;

+    S32 mChannels;

+    S32 mInterlaceType;

+    S32 mCompressionType;

+    S32 mFilterMethod;

+

+    U32 mFinalSize;

+

+    F64 mGamma;

+

+    std::string mErrorMessage;

+};

+

+#endif