diff options
Diffstat (limited to 'source/blender/imbuf/intern/dds/Common.h')
-rw-r--r-- | source/blender/imbuf/intern/dds/Common.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/source/blender/imbuf/intern/dds/Common.h b/source/blender/imbuf/intern/dds/Common.h index 1a7d087ec2e..56f5d54cf42 100644 --- a/source/blender/imbuf/intern/dds/Common.h +++ b/source/blender/imbuf/intern/dds/Common.h @@ -18,39 +18,36 @@ * \ingroup imbdds */ - #ifndef __COMMON_H__ #define __COMMON_H__ #ifndef MIN -#define MIN(a,b) ((a) <= (b) ? (a) : (b)) +# define MIN(a, b) ((a) <= (b) ? (a) : (b)) #endif #ifndef MAX -#define MAX(a,b) ((a) >= (b) ? (a) : (b)) +# define MAX(a, b) ((a) >= (b) ? (a) : (b)) #endif #ifndef CLAMP -#define CLAMP(x,a,b) MIN(MAX((x), (a)), (b)) +# define CLAMP(x, a, b) MIN(MAX((x), (a)), (b)) #endif -template<typename T> -inline void -swap(T & a, T & b) +template<typename T> inline void swap(T &a, T &b) { - T tmp = a; - a = b; - b = tmp; + T tmp = a; + a = b; + b = tmp; } -typedef unsigned char uint8; -typedef unsigned short uint16; -typedef unsigned int uint; -typedef unsigned int uint32; +typedef unsigned char uint8; +typedef unsigned short uint16; +typedef unsigned int uint; +typedef unsigned int uint32; typedef unsigned long long uint64; // copied from nvtt src/nvimage/nvimage.h inline uint computePitch(uint w, uint bitsize, uint alignment) { - return ((w * bitsize + 8 * alignment - 1) / (8 * alignment)) * alignment; + return ((w * bitsize + 8 * alignment - 1) / (8 * alignment)) * alignment; } #endif |