Index: core/include/fxge/fx_dib.h |
diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h |
index 818aaac5209adbd867aee6ca91b5cc81bd1ccd33..e22ab58065743b7f331347f47a83c6df7ff1ddee 100644 |
--- a/core/include/fxge/fx_dib.h |
+++ b/core/include/fxge/fx_dib.h |
@@ -196,13 +196,16 @@ class CFX_DIBSource { |
int GetBPP() const { return m_bpp; } |
+ // TODO(thestig): Investigate this. Given the possible values of FXDIB_Format, |
+ // it feels as though this should be implemented as !!(m_AlphaFlag & 1) and |
+ // IsOpaqueImage() below should never be able to return TRUE. |
FX_BOOL IsAlphaMask() const { return m_AlphaFlag == 1; } |
- FX_BOOL HasAlpha() const { return m_AlphaFlag & 2 ? TRUE : FALSE; } |
+ FX_BOOL HasAlpha() const { return !!(m_AlphaFlag & 2); } |
FX_BOOL IsOpaqueImage() const { return !(m_AlphaFlag & 3); } |
- FX_BOOL IsCmykImage() const { return m_AlphaFlag & 4 ? TRUE : FALSE; } |
+ FX_BOOL IsCmykImage() const { return !!(m_AlphaFlag & 4); } |
int GetPaletteSize() const { |
return IsAlphaMask() ? 0 : (m_bpp == 1 ? 2 : (m_bpp == 8 ? 256 : 0)); |