diff --git a/include/image/utils.h b/include/image/utils.h index 29e0777..1194055 100644 --- a/include/image/utils.h +++ b/include/image/utils.h @@ -1,13 +1,13 @@ #ifndef UTILS_H #define UTILS_H -#define BYTE_A 0xFF000000 -#define BYTE_R 0x00FF0000 -#define BYTE_G 0x0000FF00 -#define BYTE_B 0x000000FF -#define BYTE_RGB 0x00FFFFFF -#define BYTE 0xFF -#define LONG_BYTE 0xFFFF +#define BYTE_A 0xFF000000u +#define BYTE_R 0x00FF0000u +#define BYTE_G 0x0000FF00u +#define BYTE_B 0x000000FFu +#define BYTE_RGB 0x00FFFFFFu +#define BYTE 0xFFu +#define LONG_BYTE 0xFFFFu #define SHIFT_8 8 #define SHIFT_16 16 @@ -29,9 +29,15 @@ (((unsigned int)(a) << SHIFT_24) | ((unsigned int)(r) << SHIFT_16) | \ ((unsigned int)(g) << SHIFT_8) | (unsigned int)(b)) -#define ENCODE_BGRA(b, g, r, a) \ - (((unsigned int)(b) << SHIFT_24) | ((unsigned int)(g) << SHIFT_16) | \ - ((unsigned int)(r) << SHIFT_8) | (unsigned int)(a)) +#define ENCODE_BGRA(r, g, b, a) \ + (((unsigned int)(a) << 24) | \ + ((unsigned int)(r) << 16) | \ + ((unsigned int)(g) << 8) | \ + ((unsigned int)(b) << 0)) + +// #define ENCODE_BGRA(b, g, r, a) \ +// (((unsigned int)(b) << SHIFT_24) | ((unsigned int)(g) << SHIFT_16) | \ +// ((unsigned int)(r) << SHIFT_8) | (unsigned int)(a)) #define CLAMP_MAX(x) (((x) > MAX) ? MAX : (x)) #define CLAMP_MIN(x) (((x) < 0) ? 0 : (x))