1 files changed, 84 insertions, 58 deletions

diff --git a/OpenSim/Framework/OpenJpeg/int_.cs b/OpenSim/Framework/OpenJpeg/int_.cs
index dc71728..07321b5 100644
--- a/OpenSim/Framework/OpenJpeg/int_.cs
+++ b/OpenSim/Framework/OpenJpeg/int_.cs
@@ -1,58 +1,84 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Framework.OpenJpeg

-{

-    public static class int_

-    {

-        public static int int_min(int a, int b)

-        {

-            return a < b ? a : b;

-        }

-        

-        public static int int_max(int a, int b)

-        {

-            return (a > b) ? a : b;

-        }

-

-        public static int int_clamp(int a, int min, int max)

-        {

-            if (a < min)

-                return min;

-            if (a > max)

-                return max;

-

-            return a;

-        }

-

-        public static int int_abs(int a)

-        {

-            return a < 0 ? -a : a;

-        }

-

-        public static int int_ceildiv(int a, int b)

-        {

-            return (a + b - 1) / b;

-        }

-

-        public static int int_ceildivpow2(int a, int b)

-        {

-            return (a + (1 << b) - 1) >> b;

-        }

-

-        public static int int_floordivpow2(int a, int b)

-        {

-            return a >> b;

-        }

-

-        public static int int_floorlog2(int a)

-        {

-            for (int l=0; a > 1; l++)

-                a >>= 1;

-

-            return 1;

-        }

-

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework.OpenJpeg
+{
+    public static class int_
+    {
+        public static int int_min(int a, int b)
+        {
+            return a < b ? a : b;
+        }
+        
+        public static int int_max(int a, int b)
+        {
+            return (a > b) ? a : b;
+        }
+
+        public static int int_clamp(int a, int min, int max)
+        {
+            if (a < min)
+                return min;
+            if (a > max)
+                return max;
+
+            return a;
+        }
+
+        public static int int_abs(int a)
+        {
+            return a < 0 ? -a : a;
+        }
+
+        public static int int_ceildiv(int a, int b)
+        {
+            return (a + b - 1) / b;
+        }
+
+        public static int int_ceildivpow2(int a, int b)
+        {
+            return (a + (1 << b) - 1) >> b;
+        }
+
+        public static int int_floordivpow2(int a, int b)
+        {
+            return a >> b;
+        }
+
+        public static int int_floorlog2(int a)
+        {
+            for (int l=0; a > 1; l++)
+                a >>= 1;
+
+            return 1;
+        }
+    }
+}