summaryrefslogtreecommitdiff
path: root/libopenjpeg
diff options
context:
space:
mode:
authorFreeimage <freeimage@aliceadsl.fr>2006-02-03 23:08:52 +0000
committerFreeimage <freeimage@aliceadsl.fr>2006-02-03 23:08:52 +0000
commit48311061c139ebaaa38015c735c87bce84748bbf (patch)
treee561bfa6b3fc8691796a840ba1c459a3b734dd5a /libopenjpeg
parent39ad332ceedf09b3e3718b7a517e4e3d07c36a85 (diff)
added the 'static' keyword to inline functions to keep gcc happy
Diffstat (limited to 'libopenjpeg')
-rw-r--r--libopenjpeg/fix.h2
-rw-r--r--libopenjpeg/int.h16
2 files changed, 9 insertions, 9 deletions
diff --git a/libopenjpeg/fix.h b/libopenjpeg/fix.h
index 9dd5839a..85575cbc 100644
--- a/libopenjpeg/fix.h
+++ b/libopenjpeg/fix.h
@@ -52,7 +52,7 @@ Multiply two fixed-precision rational numbers.
@param b
@return Returns a * b
*/
-INLINE int fix_mul(int a, int b) {
+static INLINE int fix_mul(int a, int b) {
int64 temp = (int64) a * (int64) b >> 12;
return (int) ((temp >> 1) + (temp & 1)) ;
}
diff --git a/libopenjpeg/int.h b/libopenjpeg/int.h
index 9d738685..d2f8edd7 100644
--- a/libopenjpeg/int.h
+++ b/libopenjpeg/int.h
@@ -46,14 +46,14 @@ The functions in INT.H have for goal to realize operations on integers.
Get the minimum of two integers
@return Returns a if a < b else b
*/
-INLINE 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
*/
-INLINE int int_max(int a, int b) {
+static INLINE int int_max(int a, int b) {
return (a > b) ? a : b;
}
/**
@@ -65,7 +65,7 @@ Clamp an integer inside an interval
<li>Returns min if (a < min)
</ul>
*/
-INLINE 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)
@@ -75,35 +75,35 @@ INLINE int int_clamp(int a, int min, int max) {
/**
@return Get absolute value of integer
*/
-INLINE 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
*/
-INLINE 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
*/
-INLINE 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
*/
-INLINE 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)
*/
-INLINE int int_floorlog2(int a) {
+static INLINE int int_floorlog2(int a) {
int l;
for (l = 0; a > 1; l++) {
a >>= 1;