summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/fxge/dib/cfx_dibitmap.cpp4
-rw-r--r--core/fxge/dib/cfx_dibitmap.h2
-rw-r--r--core/fxge/fx_dib.h16
3 files changed, 15 insertions, 7 deletions
diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index a9764e7550..ae9bf244f0 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -682,7 +682,7 @@ void CFX_DIBitmap::DownSampleScanline(int line,
}
}
-void CFX_DIBitmap::ConvertRGBColorScale(uint32_t forecolor,
+void CFX_DIBitmap::ConvertBGRColorScale(uint32_t forecolor,
uint32_t backcolor) {
int fr = FXSYS_GetRValue(forecolor);
int fg = FXSYS_GetGValue(forecolor);
@@ -807,7 +807,7 @@ bool CFX_DIBitmap::ConvertColorScale(uint32_t forecolor, uint32_t backcolor) {
if (IsCmykImage())
ConvertCMYKColorScale(forecolor, backcolor);
else
- ConvertRGBColorScale(forecolor, backcolor);
+ ConvertBGRColorScale(forecolor, backcolor);
return true;
}
diff --git a/core/fxge/dib/cfx_dibitmap.h b/core/fxge/dib/cfx_dibitmap.h
index 7240829773..00a145af68 100644
--- a/core/fxge/dib/cfx_dibitmap.h
+++ b/core/fxge/dib/cfx_dibitmap.h
@@ -122,7 +122,7 @@ class CFX_DIBitmap : public CFX_DIBSource {
#endif
private:
- void ConvertRGBColorScale(uint32_t forecolor, uint32_t backcolor);
+ void ConvertBGRColorScale(uint32_t forecolor, uint32_t backcolor);
void ConvertCMYKColorScale(uint32_t forecolor, uint32_t backcolor);
};
diff --git a/core/fxge/fx_dib.h b/core/fxge/fx_dib.h
index 0878dfd7fd..4af47907ea 100644
--- a/core/fxge/fx_dib.h
+++ b/core/fxge/fx_dib.h
@@ -76,10 +76,18 @@ extern const int16_t SDP_Table[513];
// TODO(thestig): Rename to FXSYS_BGR() and check callers.
#define FXSYS_RGB(r, g, b) ((r) | ((g) << 8) | ((b) << 16))
-// TODO(thestig): Rename parameter to |bgr| and check callers.
-#define FXSYS_GetRValue(rgb) ((rgb)&0xff)
-#define FXSYS_GetGValue(rgb) (((rgb) >> 8) & 0xff)
-#define FXSYS_GetBValue(rgb) (((rgb) >> 16) & 0xff)
+
+constexpr uint8_t FXSYS_GetRValue(uint32_t bgr) {
+ return bgr & 0xff;
+}
+
+constexpr uint8_t FXSYS_GetGValue(uint32_t bgr) {
+ return (bgr >> 8) & 0xff;
+}
+
+constexpr uint8_t FXSYS_GetBValue(uint32_t bgr) {
+ return (bgr >> 16) & 0xff;
+}
#define FXSYS_GetCValue(cmyk) ((uint8_t)((cmyk) >> 24) & 0xff)
#define FXSYS_GetMValue(cmyk) ((uint8_t)((cmyk) >> 16) & 0xff)