remove (autotools) generated files

[openjpeg.git] / libopenjpeg / int.h

diff --git a/libopenjpeg/int.h b/libopenjpeg/int.h
index d838e968fe809417e30266809689278a1caf68e5..4e5fe08eb764f175ef4d88666e1c28c30b396bd3 100644 (file)
--- a/libopenjpeg/int.h
+++ b/libopenjpeg/int.h
@@ -1,9 +1,10 @@
 /*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Herv� Drolon, FreeImage Team
- * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,14 +28,13 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
 #ifndef __INT_H
 #define __INT_H
 /**
 @file int.h
 @brief Implementation of operations on integers (INT)
 
-The functions in INT.C have for goal to realize operations on integers.
+The functions in INT.H have for goal to realize operations on integers.
 */
 
 /** @defgroup INT INT - Implementation of operations on integers */
@@ -47,12 +47,16 @@ The functions in INT.C have for goal to realize operations on integers.
 Get the minimum of two integers
 @return Returns a if a < b else b
 */
-int int_min(int a, int b);
+static INLINE int int_min(int a, int b) {
+       return a < b ? a : b;
+}
 /**
 Get the maximum of two integers
 @return Returns a if a > b else b
 */
-int int_max(int a, int b);
+static INLINE int int_max(int a, int b) {
+       return (a > b) ? a : b;
+}
 /**
 Clamp an integer inside an interval
 @return
@@ -62,32 +66,51 @@ Clamp an integer inside an interval
 <li>Returns min if (a < min) 
 </ul>
 */
-int int_clamp(int a, int min, int max);
+static INLINE int int_clamp(int a, int min, int max) {
+       if (a < min)
+               return min;
+       if (a > max)
+               return max;
+       return a;
+}
 /**
 @return Get absolute value of integer
 */
-int int_abs(int a);
+static INLINE int int_abs(int a) {
+       return a < 0 ? -a : a;
+}
 /**
 Divide an integer and round upwards
 @return Returns a divided by b
 */
-int int_ceildiv(int a, int b);
+static INLINE int int_ceildiv(int a, int b) {
+       return (a + b - 1) / b;
+}
 /**
 Divide an integer by a power of 2 and round upwards
 @return Returns a divided by 2^b
 */
-int int_ceildivpow2(int a, int b);
+static INLINE int int_ceildivpow2(int a, int b) {
+       return (a + (1 << b) - 1) >> b;
+}
 /**
 Divide an integer by a power of 2 and round downwards
 @return Returns a divided by 2^b
 */
-int int_floordivpow2(int a, int b);
+static INLINE int int_floordivpow2(int a, int b) {
+       return a >> b;
+}
 /**
 Get logarithm of an integer and round downwards
 @return Returns log2(a)
 */
-int int_floorlog2(int a);
-
+static INLINE int int_floorlog2(int a) {
+       int l;
+       for (l = 0; a > 1; l++) {
+               a >>= 1;
+       }
+       return l;
+}
 /* ----------------------------------------------------------------------- */
 /*@}*/