diff options
| author | Nico Weber <thakis@chromium.org> | 2015-07-02 14:40:08 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2015-07-02 14:40:43 -0700 |
| commit | 37f4ca4042ecb1988d0a3d0f8cab89f61ee77932 (patch) | |
| tree | f38a9a66497ec9ad0bcf7b331aac38ca820bfb50 | |
| parent | 32af0d60cad2d7575698495b931c11f2d619fc47 (diff) | |
| download | pdfium-37f4ca4042ecb1988d0a3d0f8cab89f61ee77932.tar.xz | |
Cherry-pick to XFA: Add parentheses around && within ||.
BUG=504699
R=raymes@chromium.org, thakis@chromium.org
Review URL: https://codereview.chromium.org/1213433005.
| -rw-r--r-- | core/src/fxge/win32/fx_win32_device.cpp | 2 | ||||
| -rw-r--r-- | core/src/fxge/win32/fx_win32_gdipext.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index 5af2af5e65..b7dced9148 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -795,7 +795,7 @@ FX_BOOL CGdiDeviceDriver::DrawPath(const CFX_PathData* pPathData, return FALSE; } if (pPlatform->m_GdiplusExt.IsAvailable()) { - if (bDrawAlpha || ((m_DeviceClass != FXDC_PRINTER && !(fill_mode & FXFILL_FULLCOVER)) || pGraphState && pGraphState->m_DashCount)) { + if (bDrawAlpha || ((m_DeviceClass != FXDC_PRINTER && !(fill_mode & FXFILL_FULLCOVER)) || (pGraphState && pGraphState->m_DashCount))) { if ( !((NULL == pMatrix || _MatrixNoScaled(pMatrix)) && pGraphState && pGraphState->m_LineWidth == 1.f && (pPathData->GetPointCount() == 5 || pPathData->GetPointCount() == 4) && diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index 1cb6912073..3c63efed6a 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -939,7 +939,7 @@ BOOL CGdiplusExt::DrawPath(HDC hDC, const CFX_PathData* pPathData, if (!bSmooth && (fill_mode & 3)) { bSmooth = TRUE; } - if (bSmooth || pGraphState && pGraphState->m_LineWidth > 2) { + if (bSmooth || (pGraphState && pGraphState->m_LineWidth > 2)) { CallFunc(GdipSetSmoothingMode)(pGraphics, SmoothingModeAntiAlias); } } |