diff options
| author | weili <weili@chromium.org> | 2016-05-23 10:38:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-23 10:38:07 -0700 |
| commit | 524fa626d71efeb2164c82d565f17f077035b7df (patch) | |
| tree | 0ad13752db2c216dced6872671db7ef179def4a0 /xfa/fgas | |
| parent | 168fc2be3253fdfb8a58685b89d28a471fa4740a (diff) | |
| download | pdfium-524fa626d71efeb2164c82d565f17f077035b7df.tar.xz | |
Clean up more XFA code which causes warnings
This is part of efforts to bring XFA to chromium_code standard.
Most of them will have behavior change.
The details of these problems are:
xfa/fgas/layout/fgas_rtfbreak.cpp:
Wrong condition with misused variable
xfa/fgas/localization/fgas_locale.cpp
Unnecessary condition
xfa/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
xfa/fxfa/app/xfa_fffield.cpp
Unreachable code should be the correct code
xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
xfa/fxbarcode/qrcode/BC_QRDetector.cpp
Wrong condition logic
BUG=pdfium:29
Review-Url: https://codereview.chromium.org/2000073003
Diffstat (limited to 'xfa/fgas')
| -rw-r--r-- | xfa/fgas/layout/fgas_rtfbreak.cpp | 2 | ||||
| -rw-r--r-- | xfa/fgas/localization/fgas_locale.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp index c6a43d3b56..62b3f5f28e 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.cpp +++ b/xfa/fgas/layout/fgas_rtfbreak.cpp @@ -1317,7 +1317,7 @@ int32_t CFX_RTFBreak::GetDisplayPos(const FX_RTFTEXTOBJ* pText, bAdjusted = pAdjustPos(wForm, bMBCSCode, pFont, fFontSize, bVerticalChar, ptOffset); } - if (!pAdjustPos && bVerticalChar && (dwProps & 0x00010000) != 0) { + if (!bAdjusted && bVerticalChar && (dwProps & 0x00010000) != 0) { CFX_Rect rtBBox; rtBBox.Reset(); if (pFont->GetCharBBox(wForm, rtBBox, bMBCSCode)) { diff --git a/xfa/fgas/localization/fgas_locale.cpp b/xfa/fgas/localization/fgas_locale.cpp index 6eed202643..f0d1066397 100644 --- a/xfa/fgas/localization/fgas_locale.cpp +++ b/xfa/fgas/localization/fgas_locale.cpp @@ -3655,9 +3655,8 @@ FX_BOOL FX_TimeFromCanonical(const CFX_WideStringC& wsTime, } millisecond = millisecond * 10 + str[cc++] - '0'; } - if (cc < cc_start + 3 || millisecond >= 1000) { + if (cc < cc_start + 3) return FALSE; - } } if (cc < len) { FX_TIMEZONE tzDiff; |