walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

added the 'static' keyword to inline functions to keep gcc happy

This commit is contained in:
Freeimage 2006-02-03 23:08:52 +00:00
parent 39ad332cee
commit 48311061c1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libopenjpeg/fix.h
View File

@ -52,7 +52,7 @@ Multiply two fixed-precision rational numbers.
@param b @param b
@return Returns a * 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; int64 temp = (int64) a * (int64) b >> 12;
return (int) ((temp >> 1) + (temp & 1)) ; return (int) ((temp >> 1) + (temp & 1)) ;
} }

16
libopenjpeg/int.h
View File

@ -46,14 +46,14 @@ The functions in INT.H have for goal to realize operations on integers.
Get the minimum of two integers Get the minimum of two integers
@return Returns a if a < b else b @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; return a < b ? a : b;
} }
/** /**
Get the maximum of two integers Get the maximum of two integers
@return Returns a if a > b else b @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; return (a > b) ? a : b;
} }
/** /**
@ -65,7 +65,7 @@ Clamp an integer inside an interval
<li>Returns min if (a < min) <li>Returns min if (a < min)
</ul> </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) if (a < min)
return min; return min;
if (a > max) if (a > max)
@ -75,35 +75,35 @@ INLINE int int_clamp(int a, int min, int max) {
/** /**
@return Get absolute value of integer @return Get absolute value of integer
*/ */
INLINE int int_abs(int a) { static INLINE int int_abs(int a) {
return a < 0 ? -a : a; return a < 0 ? -a : a;
} }
/** /**
Divide an integer and round upwards Divide an integer and round upwards
@return Returns a divided by b @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; return (a + b - 1) / b;
} }
/** /**
Divide an integer by a power of 2 and round upwards Divide an integer by a power of 2 and round upwards
@return Returns a divided by 2^b @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; return (a + (1 << b) - 1) >> b;
} }
/** /**
Divide an integer by a power of 2 and round downwards Divide an integer by a power of 2 and round downwards
@return Returns a divided by 2^b @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; return a >> b;
} }
/** /**
Get logarithm of an integer and round downwards Get logarithm of an integer and round downwards
@return Returns log2(a) @return Returns log2(a)
*/ */
INLINE int int_floorlog2(int a) { static INLINE int int_floorlog2(int a) {
int l; int l;
for (l = 0; a > 1; l++) { for (l = 0; a > 1; l++) {
a >>= 1; a >>= 1;