diff options
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/dib/fx_dib_main.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/fx_dib.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp index 6c3a236edd..002fc2e394 100644 --- a/core/fxge/dib/fx_dib_main.cpp +++ b/core/fxge/dib/fx_dib_main.cpp @@ -84,7 +84,7 @@ std::pair<int, FX_COLORREF> ArgbToAlphaAndColorRef(FX_ARGB argb) { } FX_COLORREF ArgbToColorRef(FX_ARGB argb) { - return FXSYS_RGB(FXARGB_R(argb), FXARGB_G(argb), FXARGB_B(argb)); + return FXSYS_BGR(FXARGB_B(argb), FXARGB_G(argb), FXARGB_R(argb)); } FX_ARGB AlphaAndColorRefToArgb(int a, FX_COLORREF colorref) { diff --git a/core/fxge/fx_dib.h b/core/fxge/fx_dib.h index 4af47907ea..9acfa51bbe 100644 --- a/core/fxge/fx_dib.h +++ b/core/fxge/fx_dib.h @@ -74,8 +74,9 @@ extern const int16_t SDP_Table[513]; #define FXDIB_BLEND_LUMINOSITY 24 #define FXDIB_BLEND_UNSUPPORTED -1 -// TODO(thestig): Rename to FXSYS_BGR() and check callers. -#define FXSYS_RGB(r, g, b) ((r) | ((g) << 8) | ((b) << 16)) +constexpr uint32_t FXSYS_BGR(uint8_t b, uint8_t g, uint8_t r) { + return (b << 16) | (g << 8) | r; +} constexpr uint8_t FXSYS_GetRValue(uint32_t bgr) { return bgr & 0xff; |