Index: xfa/fxfa/app/xfa_ffwidget.cpp |
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp |
index 47be58e8890c26150f7b9399a7d6f70cda4118c6..a20888931d6357a949770de4d07a6e40afb8beff 100644 |
--- a/xfa/fxfa/app/xfa_ffwidget.cpp |
+++ b/xfa/fxfa/app/xfa_ffwidget.cpp |
@@ -173,7 +173,7 @@ FX_BOOL CXFA_FFWidget::GetCaptionText(CFX_WideString& wsCap) { |
return TRUE; |
} |
FX_BOOL CXFA_FFWidget::IsFocused() { |
dsinclair
2016/05/04 13:11:51
nit: Can these return bool (possibly in a followup
Tom Sepez
2016/05/04 20:21:26
This one yes, the others have overrides .
|
- return m_dwStatus & XFA_WIDGETSTATUS_Focused; |
+ return !!(m_dwStatus & XFA_WIDGETSTATUS_Focused); |
} |
FX_BOOL CXFA_FFWidget::OnMouseEnter() { |
return FALSE; |
@@ -401,7 +401,7 @@ void CXFA_FFWidget::GetMinMaxHeight(FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight) { |
} |
} |
FX_BOOL CXFA_FFWidget::IsMatchVisibleStatus(uint32_t dwStatus) { |
dsinclair
2016/05/04 13:11:51
nit: bool?
Tom Sepez
2016/05/04 20:21:26
Done.
|
- return m_dwStatus & XFA_WIDGETSTATUS_Visible; |
+ return !!(m_dwStatus & XFA_WIDGETSTATUS_Visible); |
} |
void CXFA_FFWidget::EventKillFocus() { |
if (m_dwStatus & XFA_WIDGETSTATUS_Access) { |
@@ -671,8 +671,8 @@ void CXFA_ImageRenderer::CompositeDIBitmap(CFX_DIBitmap* pDIBitmap, |
if (pDIBitmap == NULL) { |
return; |
} |
- FX_BOOL bIsolated = Transparency & PDFTRANS_ISOLATED; |
- FX_BOOL bGroup = Transparency & PDFTRANS_GROUP; |
+ bool bIsolated = !!(Transparency & PDFTRANS_ISOLATED); |
+ bool bGroup = !!(Transparency & PDFTRANS_GROUP); |
if (blend_mode == FXDIB_BLEND_NORMAL) { |
if (!pDIBitmap->IsAlphaMask()) { |
if (bitmap_alpha < 255) { |