Fix line endlings

1 files changed, 120 insertions, 120 deletions

diff --git a/indra/llmath/v4coloru.cpp b/indra/llmath/v4coloru.cpp
index 500d8ed8ab..45d310856a 100644
--- a/indra/llmath/v4coloru.cpp
+++ b/indra/llmath/v4coloru.cpp
@@ -1,120 +1,120 @@
-/**

- * @file v4coloru.cpp

- * @brief LLColor4U class implementation.

- *

- * $LicenseInfo:firstyear=2001&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$

- */

-

-#include "linden_common.h"

-

-//#include "v3coloru.h"

-#include "v4coloru.h"

-#include "v4color.h"

-//#include "vmath.h"

-#include "llmath.h"

-

-// LLColor4U

-LLColor4U LLColor4U::white(255, 255, 255, 255);

-LLColor4U LLColor4U::black(  0,   0,   0, 255);

-LLColor4U LLColor4U::red  (255,   0,   0, 255);

-LLColor4U LLColor4U::green(  0, 255,   0, 255);

-LLColor4U LLColor4U::blue (  0,   0, 255, 255);

-

-// conversion

-/* inlined to fix gcc compile link error

-LLColor4U::operator LLColor4()

-{

-    return(LLColor4((F32)mV[VRED]/255.f,(F32)mV[VGREEN]/255.f,(F32)mV[VBLUE]/255.f,(F32)mV[VALPHA]/255.f));

-}

-*/

-

-// Constructors

-

-

-/*

-LLColor4U::LLColor4U(const LLColor3 &vec)

-{

-    mV[VX] = vec.mV[VX];

-    mV[VY] = vec.mV[VY];

-    mV[VZ] = vec.mV[VZ];

-    mV[VW] = 255;

-}

-*/

-

-

-// Clear and Assignment Functions

-

-

-

-// LLColor4U Operators

-

-/*

-LLColor4U LLColor4U::operator=(const LLColor3 &a)

-{

-    mV[VX] = a.mV[VX];

-    mV[VY] = a.mV[VY];

-    mV[VZ] = a.mV[VZ];

-

-// converting from an rgb sets a=1 (opaque)

-    mV[VW] = 255;

-    return (*this);

-}

-*/

-

-

-std::ostream& operator<<(std::ostream& s, const LLColor4U &a)

-{

-    s << "{ " << (S32)a.mV[VX] << ", " << (S32)a.mV[VY] << ", " << (S32)a.mV[VZ] << ", " << (S32)a.mV[VW] << " }";

-    return s;

-}

-

-// static

-bool LLColor4U::parseColor4U(const std::string& buf, LLColor4U* value)

-{

-    if( buf.empty() || value == nullptr)

-    {

-        return false;

-    }

-

-    U32 v[4];

-    S32 count = sscanf( buf.c_str(), "%u, %u, %u, %u", v + 0, v + 1, v + 2, v + 3 );

-    if (1 == count )

-    {

-        // try this format

-        count = sscanf( buf.c_str(), "%u %u %u %u", v + 0, v + 1, v + 2, v + 3 );

-    }

-    if( 4 != count )

-    {

-        return false;

-    }

-

-    for( S32 i = 0; i < 4; i++ )

-    {

-        if( v[i] > U8_MAX )

-        {

-            return false;

-        }

-    }

-

-    value->set( U8(v[0]), U8(v[1]), U8(v[2]), U8(v[3]) );

-    return true;

-}

+/**
+ * @file v4coloru.cpp
+ * @brief LLColor4U class implementation.
+ *
+ * $LicenseInfo:firstyear=2001&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$
+ */
+
+#include "linden_common.h"
+
+//#include "v3coloru.h"
+#include "v4coloru.h"
+#include "v4color.h"
+//#include "vmath.h"
+#include "llmath.h"
+
+// LLColor4U
+LLColor4U LLColor4U::white(255, 255, 255, 255);
+LLColor4U LLColor4U::black(  0,   0,   0, 255);
+LLColor4U LLColor4U::red  (255,   0,   0, 255);
+LLColor4U LLColor4U::green(  0, 255,   0, 255);
+LLColor4U LLColor4U::blue (  0,   0, 255, 255);
+
+// conversion
+/* inlined to fix gcc compile link error
+LLColor4U::operator LLColor4()
+{
+    return(LLColor4((F32)mV[VRED]/255.f,(F32)mV[VGREEN]/255.f,(F32)mV[VBLUE]/255.f,(F32)mV[VALPHA]/255.f));
+}
+*/
+
+// Constructors
+
+
+/*
+LLColor4U::LLColor4U(const LLColor3 &vec)
+{
+    mV[VX] = vec.mV[VX];
+    mV[VY] = vec.mV[VY];
+    mV[VZ] = vec.mV[VZ];
+    mV[VW] = 255;
+}
+*/
+
+
+// Clear and Assignment Functions
+
+
+
+// LLColor4U Operators
+
+/*
+LLColor4U LLColor4U::operator=(const LLColor3 &a)
+{
+    mV[VX] = a.mV[VX];
+    mV[VY] = a.mV[VY];
+    mV[VZ] = a.mV[VZ];
+
+// converting from an rgb sets a=1 (opaque)
+    mV[VW] = 255;
+    return (*this);
+}
+*/
+
+
+std::ostream& operator<<(std::ostream& s, const LLColor4U &a)
+{
+    s << "{ " << (S32)a.mV[VX] << ", " << (S32)a.mV[VY] << ", " << (S32)a.mV[VZ] << ", " << (S32)a.mV[VW] << " }";
+    return s;
+}
+
+// static
+bool LLColor4U::parseColor4U(const std::string& buf, LLColor4U* value)
+{
+    if( buf.empty() || value == nullptr)
+    {
+        return false;
+    }
+
+    U32 v[4];
+    S32 count = sscanf( buf.c_str(), "%u, %u, %u, %u", v + 0, v + 1, v + 2, v + 3 );
+    if (1 == count )
+    {
+        // try this format
+        count = sscanf( buf.c_str(), "%u %u %u %u", v + 0, v + 1, v + 2, v + 3 );
+    }
+    if( 4 != count )
+    {
+        return false;
+    }
+
+    for( S32 i = 0; i < 4; i++ )
+    {
+        if( v[i] > U8_MAX )
+        {
+            return false;
+        }
+    }
+
+    value->set( U8(v[0]), U8(v[1]), U8(v[2]), U8(v[3]) );
+    return true;
+}