diff --git a/src/base/keys.h b/src/base/keys.h index ca72ec9a2..6c748712a 100644 --- a/src/base/keys.h +++ b/src/base/keys.h @@ -873,7 +873,7 @@ typedef enum _key_code_t { * @const TK_KEY_CANCEL * TK_KEY_CANCEL */ - TK_KEY_CANCEL = 0x20 + 167, + TK_KEY_CANCEL = 0x20 + 167, #endif } key_code_t; diff --git a/src/base/pixel.h b/src/base/pixel.h index 46beb39e3..357eae256 100644 --- a/src/base/pixel.h +++ b/src/base/pixel.h @@ -292,9 +292,10 @@ typedef uint8_t pixel_gray_t; #define pixel_gray_BPP 1 #define pixel_gray_a(p) 0xff #define pixel_gray_format BITMAP_FMT_GRAY -#define pixel_gray_to_rgba(p) { p * 0.2989, p * 0.5870, p * 0.1140, 0xff} -#define pixel_gray_from_rgba(r, g, b, a) (((r)*30 + (g)*59 + (b)*11) / 100) -#define pixel_gray_from_rgb(r, g, b) (((r)*30 + (g)*59 + (b)*11) / 100) +#define pixel_gray_to_rgba(p) \ + { p * 0.2989, p * 0.5870, p * 0.1140, 0xff } +#define pixel_gray_from_rgba(r, g, b, a) (((r)*30 + (g)*59 + (b)*11) / 100) +#define pixel_gray_from_rgb(r, g, b) (((r)*30 + (g)*59 + (b)*11) / 100) #define color_to_mono(c) (((c).rgba.r)) #define color_from_mono(p) color_init(p, 0, 0, 0xff)