From 738b08ce6b9f80d93b815411b47c2b11c2f090f6 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 1 Mar 2016 14:45:20 -0500 Subject: Fix and enable lint checks. This CL fixes and enables: * readability/namespace * readability/multiline_string * readability/multiline_comment * readability/inheritance * readability/function * readability/braces R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1747123002 . --- PRESUBMIT.py | 6 - core/include/fpdfapi/fpdf_resource.h | 2 +- core/include/fxcrt/fx_basic.h | 11 +- core/include/fxcrt/fx_memory.h | 2 +- core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp | 2 +- core/src/fpdfapi/fpdf_font/font_int.h | 2 +- core/src/fpdfapi/fpdf_font/fpdf_font.cpp | 25 ++-- core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 5 +- core/src/fpdfapi/fpdf_page/pageint.h | 6 +- core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp | 10 +- core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp | 21 ++- core/src/fpdfapi/fpdf_render/render_int.h | 2 +- core/src/fxcrt/fx_system_unittest.cpp | 2 +- core/src/fxge/dib/fx_dib_composite.cpp | 159 ++++++++++++--------- core/src/fxge/dib/fx_dib_convert.cpp | 7 +- core/src/fxge/dib/fx_dib_main.cpp | 21 ++- core/src/fxge/freetype/fx_freetype.cpp | 3 +- core/src/fxge/ge/fx_ge_device.cpp | 3 +- core/src/fxge/skia/fx_skia_blitter_new.cpp | 8 +- core/src/fxge/win32/fx_win32_gdipext.cpp | 4 +- fpdfsdk/src/fpdf_transformpage.cpp | 4 +- fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp | 9 +- fpdfsdk/src/fsdk_baseform.cpp | 3 +- fpdfsdk/src/javascript/Consts.cpp | 30 ++-- fpdfsdk/src/javascript/JS_Runtime_Stub.cpp | 6 +- fpdfsdk/src/javascript/JS_Value.cpp | 3 +- fpdfsdk/src/javascript/JS_Value.h | 20 +-- samples/image_diff_png.cc | 2 +- samples/pdfium_test.cc | 15 +- xfa/include/fwl/lightwidget/picturebox.h | 2 +- xfa/src/fdp/src/css/fde_cssdatatable.h | 2 +- xfa/src/fdp/src/css/fde_cssdeclaration.cpp | 3 +- xfa/src/fdp/src/fde/fde_object.h | 2 +- xfa/src/fgas/src/font/fx_gefont.h | 2 +- xfa/src/fgas/src/font/fx_stdfontmgr.cpp | 12 +- xfa/src/fgas/src/font/fx_stdfontmgr.h | 21 +-- xfa/src/fgas/src/layout/fx_rtfbreak.cpp | 14 +- xfa/src/fgas/src/layout/fx_rtfbreak.h | 4 +- xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp | 2 +- xfa/src/fwl/src/basewidget/fwl_editimp.cpp | 5 +- .../src/basewidget/include/fwl_tooltipctrlimp.h | 4 +- xfa/src/fwl/src/core/fwl_noteimp.cpp | 5 +- xfa/src/fxbarcode/BC_BarCode.cpp | 2 +- xfa/src/fxbarcode/BC_TwoDimWriter.h | 2 +- xfa/src/fxbarcode/oned/BC_OneDimWriter.h | 4 +- xfa/src/fxfa/src/app/xfa_textlayout.h | 2 +- xfa/src/fxfa/src/common/xfa_script.h | 2 +- xfa/src/fxfa/src/fm2js/xfa_error.h | 4 +- xfa/src/fxfa/src/fm2js/xfa_expression.h | 2 +- xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp | 4 +- xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 9 +- xfa/src/fxjse/src/runtime.h | 2 +- 52 files changed, 261 insertions(+), 243 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 143eb3a288..502aaac9b3 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -15,14 +15,8 @@ LINT_FILTERS = [ '-build/include_what_you_use', '-build/namespaces', '-build/storage_class', - '-readability/braces', '-readability/casting', '-readability/fn_size', - '-readability/function', - '-readability/inheritance', - '-readability/multiline_comment', - '-readability/multiline_string', - '-readability/namespace', '-readability/todo', '-readability/utf8', '-runtime/arrays', diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h index 23e1b55efb..450e878fa1 100644 --- a/core/include/fpdfapi/fpdf_resource.h +++ b/core/include/fpdfapi/fpdf_resource.h @@ -166,7 +166,7 @@ class CPDF_Font { CFX_ByteString*& pCharNames, FX_BOOL bEmbedded, FX_BOOL bTrueType); - void LoadFontDescriptor(CPDF_Dictionary*); + void LoadFontDescriptor(CPDF_Dictionary* pDict); void CheckFontMetrics(); CFX_ByteString m_BaseFont; diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 6e092dd540..006b2b377d 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -315,13 +315,12 @@ class CFX_ArrayTemplate : public CFX_BasicArray { TYPE* GetData() { return (TYPE*)m_pData; } FX_BOOL SetAtGrow(int nIndex, TYPE newElement) { - if (nIndex < 0) { + if (nIndex < 0) return FALSE; - } - if (nIndex >= m_nSize) - if (!SetSize(nIndex + 1)) { - return FALSE; - } + + if (nIndex >= m_nSize && !SetSize(nIndex + 1)) + return FALSE; + ((TYPE*)m_pData)[nIndex] = newElement; return TRUE; } diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h index d64844e743..b9b1888930 100644 --- a/core/include/fxcrt/fx_memory.h +++ b/core/include/fxcrt/fx_memory.h @@ -98,7 +98,7 @@ class CFX_GrowOnlyPool { void* Realloc(void* p, size_t new_size) { return NULL; } - void Free(void*) {} + void Free(void* mem) {} void FreeAll(); diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp index bcac9d87d4..bc3de20857 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp @@ -472,7 +472,7 @@ static FX_WORD FX_GetCsFromLangCode(uint32_t uCode) { } else { iStart = iMid + 1; } - }; + } return 0; } static FX_WORD FX_GetCharsetFromLang(const FX_CHAR* pLang, int32_t iLength) { diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h index 1d1f006115..dc28010de3 100644 --- a/core/src/fpdfapi/fpdf_font/font_int.h +++ b/core/src/fpdfapi/fpdf_font/font_int.h @@ -89,7 +89,7 @@ class CPDF_CMapParser { public: CPDF_CMapParser(); ~CPDF_CMapParser() {} - FX_BOOL Initialize(CPDF_CMap*); + FX_BOOL Initialize(CPDF_CMap* pMap); void ParseWord(const CFX_ByteStringC& str); CFX_BinaryBuf m_AddMaps; diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index 411f77254b..a9deba665c 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -966,22 +966,21 @@ FX_BOOL CPDF_Type1Font::Load() { m_Base14Font = PDF_GetStandardFontName(&m_BaseFont); if (m_Base14Font >= 0) { CPDF_Dictionary* pFontDesc = m_pFontDict->GetDictBy("FontDescriptor"); - if (pFontDesc && pFontDesc->KeyExist("Flags")) { + if (pFontDesc && pFontDesc->KeyExist("Flags")) m_Flags = pFontDesc->GetIntegerBy("Flags"); - } else { + else m_Flags = m_Base14Font >= 12 ? PDFFONT_SYMBOLIC : PDFFONT_NONSYMBOLIC; - } - if (m_Base14Font < 4) - for (int i = 0; i < 256; i++) { + + if (m_Base14Font < 4) { + for (int i = 0; i < 256; i++) m_CharWidth[i] = 600; - } - if (m_Base14Font == 12) { + } + if (m_Base14Font == 12) m_BaseEncoding = PDFFONT_ENCODING_ADOBE_SYMBOL; - } else if (m_Base14Font == 13) { + else if (m_Base14Font == 13) m_BaseEncoding = PDFFONT_ENCODING_ZAPFDINGBATS; - } else if (m_Flags & PDFFONT_NONSYMBOLIC) { + else if (m_Flags & PDFFONT_NONSYMBOLIC) m_BaseEncoding = PDFFONT_ENCODING_STANDARD; - } } return LoadCommon(); } @@ -1302,10 +1301,10 @@ CPDF_FontEncoding::CPDF_FontEncoding(int PredefinedEncoding) { const FX_WORD* pSrc = PDF_UnicodesForPredefinedCharSet(PredefinedEncoding); if (!pSrc) { FXSYS_memset(m_Unicodes, 0, sizeof(m_Unicodes)); - } else - for (int i = 0; i < 256; i++) { + } else { + for (int i = 0; i < 256; i++) m_Unicodes[i] = pSrc[i]; - } + } } FX_BOOL CPDF_FontEncoding::IsIdentical(CPDF_FontEncoding* pAnother) const { diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 1a78b1f93c..3cbd67633f 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -1545,12 +1545,11 @@ int CPDF_CIDFont::GlyphFromCharCode(FX_DWORD charcode, FX_BOOL* pVertGlyph) { if (m_Charset == CIDSET_JAPAN1) { if (unicode == '\\') { unicode = '/'; - } #if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ - else if (unicode == 0xa5) { + } else if (unicode == 0xa5) { unicode = 0x5c; - } #endif + } } if (!face) return unicode; diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index ec06187b6c..e8d155b656 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -138,13 +138,13 @@ class CPDF_StreamContentParser { CPDF_Image* pImage, FX_BOOL bInline); void AddDuplicateImage(); - void AddForm(CPDF_Stream*); + void AddForm(CPDF_Stream* pStream); void SetGraphicStates(CPDF_PageObject* pObj, FX_BOOL bColor, FX_BOOL bText, FX_BOOL bGraph); - void SaveStates(CPDF_AllStates*); - void RestoreStates(CPDF_AllStates*); + void SaveStates(CPDF_AllStates* pState); + void RestoreStates(CPDF_AllStates* pState); CPDF_Font* FindFont(const CFX_ByteString& name); CPDF_ColorSpace* FindColorSpace(const CFX_ByteString& name); CPDF_Pattern* FindPattern(const CFX_ByteString& name, FX_BOOL bShading); diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp index 954d3886b5..b91f258371 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -247,12 +247,11 @@ void CPDF_DIBTransferFunc::TranslateScanline(uint8_t* dest_buf, *dest_buf++ = m_RampR[*(src_buf++)]; if (!bSkip) { *dest_buf++ = *src_buf; - } #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ - else { + } else { dest_buf++; - } #endif + } src_buf++; } break; @@ -284,7 +283,7 @@ void CPDF_DIBTransferFunc::TranslateDownSamples(uint8_t* dest_buf, dest_buf++; src_buf++; } - } else + } else { #endif for (int i = 0; i < pixels; i++) { *dest_buf++ = m_RampB[*(src_buf++)]; @@ -292,6 +291,9 @@ void CPDF_DIBTransferFunc::TranslateDownSamples(uint8_t* dest_buf, *dest_buf++ = m_RampR[*(src_buf++)]; *dest_buf++ = *(src_buf++); } +#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ + } +#endif } } CPDF_ImageRenderer::CPDF_ImageRenderer() { diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp index 215b104162..42c378666e 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -74,25 +74,24 @@ void CPDF_Type3Glyphs::AdjustBlue(FX_FLOAT top, top_line = _AdjustBlue(top, m_TopBlueCount, m_TopBlue); bottom_line = _AdjustBlue(bottom, m_BottomBlueCount, m_BottomBlue); } + static FX_BOOL _IsScanLine1bpp(uint8_t* pBuf, int width) { int size = width / 8; - for (int i = 0; i < size; i++) - if (pBuf[i]) { - return TRUE; - } - if (width % 8) - if (pBuf[width / 8] & (0xff << (8 - width % 8))) { + for (int i = 0; i < size; i++) { + if (pBuf[i]) return TRUE; - } - return FALSE; + } + return (width % 8) && (pBuf[width / 8] & (0xff << (8 - width % 8))); } + static FX_BOOL _IsScanLine8bpp(uint8_t* pBuf, int width) { - for (int i = 0; i < width; i++) - if (pBuf[i] > 0x40) { + for (int i = 0; i < width; i++) { + if (pBuf[i] > 0x40) return TRUE; - } + } return FALSE; } + static int _DetectFirstLastScan(const CFX_DIBitmap* pBitmap, FX_BOOL bFirst) { int height = pBitmap->GetHeight(), pitch = pBitmap->GetPitch(), width = pBitmap->GetWidth(); diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index b7f007dd5d..d691f7dc52 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -498,7 +498,7 @@ class CPDF_DIBSource : public CFX_DIBSource { void SetDownSampleSize(int dest_width, int dest_height) override; CFX_DIBitmap* GetBitmap() const; - void ReleaseBitmap(CFX_DIBitmap*) const; + void ReleaseBitmap(CFX_DIBitmap* pBitmap) const; void ClearImageData(); FX_DWORD GetMatteColor() const { return m_MatteColor; } diff --git a/core/src/fxcrt/fx_system_unittest.cpp b/core/src/fxcrt/fx_system_unittest.cpp index d9f4cc645e..4a07a77ad2 100644 --- a/core/src/fxcrt/fx_system_unittest.cpp +++ b/core/src/fxcrt/fx_system_unittest.cpp @@ -127,7 +127,7 @@ TEST(fxcrt, FXSYS_i64toa_InvalidRadix) { FXSYS_i64toa(42, buf, -1); EXPECT_EQ(std::string(""), buf); -}; +} TEST(fxcrt, FXSYS_i64toa) { Check64BitBase16Itoa(std::numeric_limits::min(), diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/src/fxge/dib/fx_dib_composite.cpp index 8bf36e523a..e2781d6244 100644 --- a/core/src/fxge/dib/fx_dib_composite.cpp +++ b/core/src/fxge/dib/fx_dib_composite.cpp @@ -285,10 +285,10 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, const uint8_t* src_alpha_scan, uint8_t* dst_alpha_scan, void* pIccTransform) { - ICodec_IccModule* pIccModule = NULL; - if (pIccTransform) { + ICodec_IccModule* pIccModule = nullptr; + if (pIccTransform) pIccModule = CFX_GEModule::Get()->GetCodecModule()->GetIccModule(); - } + if (blend_type) { FX_BOOL bNonseparableBlend = blend_type >= FXDIB_BLEND_NONSEPARABLE; int blended_color; @@ -297,9 +297,9 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, uint8_t back_alpha = *dst_alpha_scan; if (back_alpha == 0) { int src_alpha = *src_alpha_scan++; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha) { if (pIccTransform) { pIccModule->TranslateScanline(pIccTransform, dest_scan, src_scan, @@ -315,9 +315,9 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, continue; } uint8_t src_alpha = *src_alpha_scan++; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha == 0) { dest_scan++; dst_alpha_scan++; @@ -343,14 +343,14 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, dst_alpha_scan++; src_scan += 3; } - } else + } else { for (int col = 0; col < pixel_count; col++) { uint8_t back_alpha = *dst_alpha_scan; if (back_alpha == 0) { int src_alpha = src_scan[3]; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha) { if (pIccTransform) { pIccModule->TranslateScanline(pIccTransform, dest_scan, src_scan, @@ -366,9 +366,9 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, continue; } uint8_t src_alpha = src_scan[3]; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha == 0) { dest_scan++; dst_alpha_scan++; @@ -378,16 +378,17 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, *dst_alpha_scan = FXDIB_ALPHA_UNION(back_alpha, src_alpha); int alpha_ratio = src_alpha * 255 / (*dst_alpha_scan); uint8_t gray; - if (pIccTransform) { + if (pIccTransform) pIccModule->TranslateScanline(pIccTransform, &gray, src_scan, 1); - } else { + else gray = FXRGB2GRAY(src_scan[2], src_scan[1], *src_scan); - } + *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, gray, alpha_ratio); dest_scan++; dst_alpha_scan++; src_scan += 4; } + } return; } if (src_alpha_scan) { @@ -395,9 +396,9 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, uint8_t back_alpha = *dst_alpha_scan; if (back_alpha == 0) { int src_alpha = *src_alpha_scan++; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha) { if (pIccTransform) { pIccModule->TranslateScanline(pIccTransform, dest_scan, src_scan, @@ -413,9 +414,9 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, continue; } uint8_t src_alpha = *src_alpha_scan++; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha == 0) { dest_scan++; dst_alpha_scan++; @@ -425,24 +426,24 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, *dst_alpha_scan = FXDIB_ALPHA_UNION(back_alpha, src_alpha); int alpha_ratio = src_alpha * 255 / (*dst_alpha_scan); uint8_t gray; - if (pIccTransform) { + if (pIccTransform) pIccModule->TranslateScanline(pIccTransform, &gray, src_scan, 1); - } else { + else gray = FXRGB2GRAY(src_scan[2], src_scan[1], *src_scan); - } + *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, gray, alpha_ratio); dest_scan++; dst_alpha_scan++; src_scan += 3; } - } else + } else { for (int col = 0; col < pixel_count; col++) { uint8_t back_alpha = *dst_alpha_scan; if (back_alpha == 0) { int src_alpha = src_scan[3]; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha) { if (pIccTransform) { pIccModule->TranslateScanline(pIccTransform, dest_scan, src_scan, @@ -458,9 +459,9 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, continue; } uint8_t src_alpha = src_scan[3]; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha == 0) { dest_scan++; dst_alpha_scan++; @@ -470,17 +471,19 @@ void _CompositeRow_Argb2Graya(uint8_t* dest_scan, *dst_alpha_scan = FXDIB_ALPHA_UNION(back_alpha, src_alpha); int alpha_ratio = src_alpha * 255 / (*dst_alpha_scan); uint8_t gray; - if (pIccTransform) { + if (pIccTransform) pIccModule->TranslateScanline(pIccTransform, &gray, src_scan, 1); - } else { + else gray = FXRGB2GRAY(src_scan[2], src_scan[1], *src_scan); - } + *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, gray, alpha_ratio); dest_scan++; dst_alpha_scan++; src_scan += 4; } + } } + inline void _CompositeRow_Argb2Gray(uint8_t* dest_scan, const uint8_t* src_scan, int pixel_count, @@ -490,24 +493,24 @@ inline void _CompositeRow_Argb2Gray(uint8_t* dest_scan, void* pIccTransform) { ICodec_IccModule* pIccModule = NULL; uint8_t gray; - if (pIccTransform) { + if (pIccTransform) pIccModule = CFX_GEModule::Get()->GetCodecModule()->GetIccModule(); - } + if (blend_type) { FX_BOOL bNonseparableBlend = blend_type >= FXDIB_BLEND_NONSEPARABLE; int blended_color; if (src_alpha_scan) { for (int col = 0; col < pixel_count; col++) { int src_alpha = *src_alpha_scan++; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha) { - if (pIccTransform) { + if (pIccTransform) pIccModule->TranslateScanline(pIccTransform, &gray, src_scan, 1); - } else { + else gray = FXRGB2GRAY(src_scan[2], src_scan[1], *src_scan); - } + if (bNonseparableBlend) { blended_color = blend_type == FXDIB_BLEND_LUMINOSITY ? gray : *dest_scan; @@ -519,18 +522,18 @@ inline void _CompositeRow_Argb2Gray(uint8_t* dest_scan, dest_scan++; src_scan += 3; } - } else + } else { for (int col = 0; col < pixel_count; col++) { int src_alpha = src_scan[3]; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha) { - if (pIccTransform) { + if (pIccTransform) pIccModule->TranslateScanline(pIccTransform, &gray, src_scan, 1); - } else { + else gray = FXRGB2GRAY(src_scan[2], src_scan[1], *src_scan); - } + if (bNonseparableBlend) { blended_color = blend_type == FXDIB_BLEND_LUMINOSITY ? gray : *dest_scan; @@ -542,43 +545,46 @@ inline void _CompositeRow_Argb2Gray(uint8_t* dest_scan, dest_scan++; src_scan += 4; } + } return; } if (src_alpha_scan) { for (int col = 0; col < pixel_count; col++) { int src_alpha = *src_alpha_scan++; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha) { - if (pIccTransform) { + if (pIccTransform) pIccModule->TranslateScanline(pIccTransform, &gray, src_scan, 1); - } else { + else gray = FXRGB2GRAY(src_scan[2], src_scan[1], *src_scan); - } + *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, gray, src_alpha); } dest_scan++; src_scan += 3; } - } else + } else { for (int col = 0; col < pixel_count; col++) { int src_alpha = src_scan[3]; - if (clip_scan) { + if (clip_scan) src_alpha = clip_scan[col] * src_alpha / 255; - } + if (src_alpha) { - if (pIccTransform) { + if (pIccTransform) pIccModule->TranslateScanline(pIccTransform, &gray, src_scan, 1); - } else { + else gray = FXRGB2GRAY(src_scan[2], src_scan[1], *src_scan); - } + *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, gray, src_alpha); } dest_scan++; src_scan += 4; } + } } + inline void _CompositeRow_Rgb2Gray(uint8_t* dest_scan, const uint8_t* src_scan, int src_Bpp, @@ -2329,7 +2335,7 @@ inline void _CompositeRow_8bppRgb2Argb_NoBlend(uint8_t* dest_scan, dest_scan++; dest_scan++; } - } else + } else { for (int col = 0; col < width; col++) { FX_ARGB argb = pPalette[*src_scan]; int src_r = FXARGB_R(argb); @@ -2363,7 +2369,9 @@ inline void _CompositeRow_8bppRgb2Argb_NoBlend(uint8_t* dest_scan, dest_scan++; src_scan++; } + } } + void _CompositeRow_8bppRgb2Rgba_NoBlend(uint8_t* dest_scan, const uint8_t* src_scan, int width, @@ -2414,7 +2422,7 @@ void _CompositeRow_8bppRgb2Rgba_NoBlend(uint8_t* dest_scan, *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, src_r, alpha_ratio); dest_scan++; } - } else + } else { for (int col = 0; col < width; col++) { FX_ARGB argb = pPalette[*src_scan]; int src_r = FXARGB_R(argb); @@ -2448,7 +2456,9 @@ void _CompositeRow_8bppRgb2Rgba_NoBlend(uint8_t* dest_scan, dest_scan++; src_scan++; } + } } + inline void _CompositeRow_1bppRgb2Argb_NoBlend(uint8_t* dest_scan, const uint8_t* src_scan, int src_left, @@ -4120,12 +4130,13 @@ inline void _ScanlineCompositor_InitSourcePalette(FXDIB_Format src_format, g, b); *gray_pal++ = FXRGB2GRAY(r, g, b); } - } else + } else { for (int i = 0; i < pal_count; i++) { FX_ARGB argb = pSrcPalette[i]; *gray_pal++ = FXRGB2GRAY(FXARGB_R(argb), FXARGB_G(argb), FXARGB_B(argb)); } + } } else { int palsize = 1 << (src_format & 0xff); pDestPalette = FX_Alloc(FX_DWORD, palsize); @@ -4586,27 +4597,29 @@ void CFX_ScanlineCompositor::CompositeByteMaskLine(uint8_t* dest_scan, width, clip_scan); } } else if (m_bRgbByteOrder) { - if (m_DestFormat == FXDIB_Argb) + if (m_DestFormat == FXDIB_Argb) { _CompositeRow_ByteMask2Argb_RgbByteOrder( dest_scan, src_scan, m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, width, m_BlendType, clip_scan); - else + } else { _CompositeRow_ByteMask2Rgb_RgbByteOrder( dest_scan, src_scan, m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, width, m_BlendType, (m_DestFormat & 0xff) >> 3, clip_scan); + } return; - } else if (m_DestFormat == FXDIB_Argb) + } else if (m_DestFormat == FXDIB_Argb) { _CompositeRow_ByteMask2Argb(dest_scan, src_scan, m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, width, m_BlendType, clip_scan); - else if (m_DestFormat == FXDIB_Rgb || m_DestFormat == FXDIB_Rgb32) + } else if (m_DestFormat == FXDIB_Rgb || m_DestFormat == FXDIB_Rgb32) { _CompositeRow_ByteMask2Rgb(dest_scan, src_scan, m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, width, m_BlendType, (m_DestFormat & 0xff) >> 3, clip_scan); - else if (m_DestFormat == FXDIB_Rgba) + } else if (m_DestFormat == FXDIB_Rgba) { _CompositeRow_ByteMask2Rgba(dest_scan, src_scan, m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, width, m_BlendType, clip_scan, dst_extra_alpha); + } } void CFX_ScanlineCompositor::CompositeBitMaskLine(uint8_t* dest_scan, const uint8_t* src_scan, @@ -4618,32 +4631,35 @@ void CFX_ScanlineCompositor::CompositeBitMaskLine(uint8_t* dest_scan, _CompositeRow_BitMask2Mask(dest_scan, src_scan, m_MaskAlpha, src_left, width, clip_scan); } else if ((m_DestFormat & 0xff) == 8) { - if (m_DestFormat & 0x0200) + if (m_DestFormat & 0x0200) { _CompositeRow_BitMask2Graya(dest_scan, src_scan, m_MaskAlpha, m_MaskRed, src_left, width, clip_scan, dst_extra_alpha); - else { + } else { _CompositeRow_BitMask2Gray(dest_scan, src_scan, m_MaskAlpha, m_MaskRed, src_left, width, clip_scan); } } else if (m_bRgbByteOrder) { - if (m_DestFormat == FXDIB_Argb) + if (m_DestFormat == FXDIB_Argb) { _CompositeRow_BitMask2Argb_RgbByteOrder( dest_scan, src_scan, m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, src_left, width, m_BlendType, clip_scan); - else + } else { _CompositeRow_BitMask2Rgb_RgbByteOrder( dest_scan, src_scan, m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, src_left, width, m_BlendType, (m_DestFormat & 0xff) >> 3, clip_scan); + } return; - } else if (m_DestFormat == FXDIB_Argb) + } else if (m_DestFormat == FXDIB_Argb) { _CompositeRow_BitMask2Argb(dest_scan, src_scan, m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, src_left, width, m_BlendType, clip_scan); - else if (m_DestFormat == FXDIB_Rgb || m_DestFormat == FXDIB_Rgb32) + } else if (m_DestFormat == FXDIB_Rgb || m_DestFormat == FXDIB_Rgb32) { _CompositeRow_BitMask2Rgb( dest_scan, src_scan, m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, src_left, width, m_BlendType, (m_DestFormat & 0xff) >> 3, clip_scan); + } } + FX_BOOL CFX_DIBitmap::CompositeBitmap(int dest_left, int dest_top, int width, @@ -4838,11 +4854,12 @@ FX_BOOL CFX_DIBitmap::CompositeRect(int left, uint8_t* dest_scan = m_pBuffer + row * m_Pitch + rect.left; if (src_alpha == 255) { FXSYS_memset(dest_scan, gray, width); - } else + } else { for (int col = 0; col < width; col++) { *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, gray, src_alpha); dest_scan++; } + } } return TRUE; } @@ -4894,11 +4911,11 @@ FX_BOOL CFX_DIBitmap::CompositeRect(int left, CFX_GEModule::Get()->GetCodecModule()->GetIccModule(); pIccModule->TranslateScanline(pIccTransform, color_p, color_p, 1); } else { - if (alpha_flag >> 8 && !IsCmykImage()) + if (alpha_flag >> 8 && !IsCmykImage()) { AdobeCMYK_to_sRGB1(FXSYS_GetCValue(color), FXSYS_GetMValue(color), FXSYS_GetYValue(color), FXSYS_GetKValue(color), color_p[2], color_p[1], color_p[0]); - else if (!(alpha_flag >> 8) && IsCmykImage()) { + } else if (!(alpha_flag >> 8) && IsCmykImage()) { return FALSE; } } diff --git a/core/src/fxge/dib/fx_dib_convert.cpp b/core/src/fxge/dib/fx_dib_convert.cpp index 91ccfc109e..a1c18ae121 100644 --- a/core/src/fxge/dib/fx_dib_convert.cpp +++ b/core/src/fxge/dib/fx_dib_convert.cpp @@ -389,11 +389,12 @@ FX_BOOL ConvertBuffer_8bppPlt2Gray(uint8_t* dest_buf, FXSYS_GetYValue(src_plt[i]), FXSYS_GetKValue(src_plt[i]), r, g, b); gray[i] = FXRGB2GRAY(r, g, b); } - } else + } else { for (int i = 0; i < 256; i++) { gray[i] = FXRGB2GRAY(FXARGB_R(src_plt[i]), FXARGB_G(src_plt[i]), FXARGB_B(src_plt[i])); } + } } for (int row = 0; row < height; row++) { uint8_t* dest_scan = dest_buf + row * dest_pitch; @@ -1104,10 +1105,10 @@ CFX_DIBitmap* CFX_DIBSource::CloneConvert(FXDIB_Format dest_format, } } if (dest_format & 0x0200) { - if (dest_format == FXDIB_Argb) + if (dest_format == FXDIB_Argb) { ret = pSrcAlpha ? pClone->LoadChannel(FXDIB_Alpha, pSrcAlpha, FXDIB_Alpha) : pClone->LoadChannel(FXDIB_Alpha, 0xff); - else { + } else { ret = pClone->CopyAlphaMask(pSrcAlpha); } } diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 7c27d5451b..4922373ec0 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -470,11 +470,11 @@ FX_BOOL CFX_DIBitmap::TransferMask(int dest_left, CFX_GEModule::Get()->GetCodecModule()->GetIccModule(); pIccModule->TranslateScanline(pIccTransform, color_p, color_p, 1); } else { - if (alpha_flag >> 8 && !IsCmykImage()) + if (alpha_flag >> 8 && !IsCmykImage()) { AdobeCMYK_to_sRGB1(FXSYS_GetCValue(color), FXSYS_GetMValue(color), FXSYS_GetYValue(color), FXSYS_GetKValue(color), color_p[2], color_p[1], color_p[0]); - else if (!(alpha_flag >> 8) && IsCmykImage()) { + } else if (!(alpha_flag >> 8) && IsCmykImage()) { return FALSE; } } @@ -703,11 +703,10 @@ FX_BOOL CFX_DIBitmap::LoadChannel(FXDIB_Channel destChannel, } return FALSE; } - } else #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ - if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb32)) { + } else if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb32)) { #else - if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb)) { + } else if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb)) { #endif if (pSrcClone != pSrcBitmap) { delete pSrcClone; @@ -797,16 +796,13 @@ FX_BOOL CFX_DIBitmap::LoadChannel(FXDIB_Channel destChannel, int value) { if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyka : FXDIB_Argb)) { return FALSE; } - } else #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ - if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb)) { - return FALSE; - } + } else if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb)) { #else - if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb32)) { + } else if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb32)) { +#endif return FALSE; } -#endif } destOffset = g_ChannelOffset[destChannel]; } @@ -1264,7 +1260,7 @@ FX_BOOL CFX_DIBitmap::ConvertColorScale(FX_DWORD forecolor, bc + (fc - bc) * gray / 255, bm + (fm - bm) * gray / 255, by + (fy - by) * gray / 255, bk + (fk - bk) * gray / 255); } - } else + } else { for (int i = 0; i < size; i++) { int gray = FXRGB2GRAY(FXARGB_R(m_pPalette[i]), FXARGB_G(m_pPalette[i]), FXARGB_B(m_pPalette[i])); @@ -1272,6 +1268,7 @@ FX_BOOL CFX_DIBitmap::ConvertColorScale(FX_DWORD forecolor, bg + (fg - bg) * gray / 255, bb + (fb - bb) * gray / 255); } + } return TRUE; } if (isCmykImage) { diff --git a/core/src/fxge/freetype/fx_freetype.cpp b/core/src/fxge/freetype/fx_freetype.cpp index 6cf5aa32ff..2fc60e913e 100644 --- a/core/src/fxge/freetype/fx_freetype.cpp +++ b/core/src/fxge/freetype/fx_freetype.cpp @@ -34,8 +34,9 @@ static int xyq_search_node(char* glyph_name, if (thiscode == (unsigned short)unicode) // found it! return 1; table_offset += 3; - } else + } else { table_offset++; + } // now search in sub-nodes if (count == 0) diff --git a/core/src/fxge/ge/fx_ge_device.cpp b/core/src/fxge/ge/fx_ge_device.cpp index c4f7735957..b8ddfec841 100644 --- a/core/src/fxge/ge/fx_ge_device.cpp +++ b/core/src/fxge/ge/fx_ge_device.cpp @@ -328,11 +328,12 @@ FX_BOOL CFX_RenderDevice::DrawCosmeticLine(FX_FLOAT x1, if (((m_RenderCaps & FXRC_ALPHA_PATH) && (FXGETFLAG_COLORTYPE(alpha_flag) && FXGETFLAG_ALPHA_FILL(alpha_flag) == 0xff)) || - color >= 0xff000000) + color >= 0xff000000) { if (m_pDeviceDriver->DrawCosmeticLine(x1, y1, x2, y2, color, alpha_flag, pIccTransform, blend_type)) { return TRUE; } + } CFX_GraphStateData graph_state; CFX_PathData path; path.SetPointCount(2); diff --git a/core/src/fxge/skia/fx_skia_blitter_new.cpp b/core/src/fxge/skia/fx_skia_blitter_new.cpp index 4c9c3d0bb9..7a8cb1bfac 100644 --- a/core/src/fxge/skia/fx_skia_blitter_new.cpp +++ b/core/src/fxge/skia/fx_skia_blitter_new.cpp @@ -287,9 +287,9 @@ void CFX_SkiaRenderer::CompositeSpanGray_6(uint8_t* dest_scan, dest_scan++; continue; } - if (src_alpha1 == 255) + if (src_alpha1 == 255) { *dest_scan++ = m_Gray; - else { + } else { *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, m_Gray, src_alpha1); dest_scan++; } @@ -1500,9 +1500,9 @@ FX_BOOL CFX_SkiaRenderer::Init( m_pOriScan = NULL; m_pClipScan = NULL; composite_span = NULL; - if (m_pClipRgn) + if (m_pClipRgn) { m_ClipBox = m_pClipRgn->GetBox(); - else { + } else { m_ClipBox.left = m_ClipBox.top = 0; m_ClipBox.right = m_pDevice->GetWidth(); m_ClipBox.bottom = m_pDevice->GetHeight(); diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index e71d94d310..629f3235ed 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -1347,7 +1347,9 @@ class GpStream final : public IStream { DWORD) { return E_NOTIMPL; } - virtual HRESULT STDMETHODCALLTYPE Clone(IStream**) { return E_NOTIMPL; } + virtual HRESULT STDMETHODCALLTYPE Clone(IStream** stream) { + return E_NOTIMPL; + } virtual HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER liDistanceToMove, DWORD dwOrigin, ULARGE_INTEGER* lpNewFilePointer) { diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp index 9f500b2768..3d2f6511cd 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -240,9 +240,9 @@ void OutputPath(CFX_ByteTextBuf& buf, CPDF_Path path) { for (int i = 0; i < pPathData->GetPointCount(); i++) { buf << (pPoints[i].m_PointX) << " " << (pPoints[i].m_PointY); int point_type = pPoints[i].m_Flag & FXPT_TYPE; - if (point_type == FXPT_MOVETO) + if (point_type == FXPT_MOVETO) { buf << " m\n"; - else if (point_type == FXPT_BEZIERTO) { + } else if (point_type == FXPT_BEZIERTO) { buf << " " << (pPoints[i + 1].m_PointX) << " " << (pPoints[i + 1].m_PointY) << " " << (pPoints[i + 2].m_PointX) << " " << (pPoints[i + 2].m_PointY); diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index f9bf170554..aaeb4d6c3f 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -1048,11 +1048,10 @@ FX_BOOL CPDFXFA_Document::_MailToInfo(CFX_WideString& csURL, pos = srcURL.Find(L'@', 0); if (pos == -1) return FALSE; - else { - tmp = srcURL.Right(csURL.GetLength() - 7); - tmp.TrimLeft(); - tmp.TrimRight(); - } + + tmp = srcURL.Right(csURL.GetLength() - 7); + tmp.TrimLeft(); + tmp.TrimRight(); } else { tmp = srcURL.Left(pos); tmp = tmp.Right(tmp.GetLength() - 7); diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index 79180324f7..8245980fbb 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -56,8 +56,9 @@ IXFA_Widget* CPDFSDK_Widget::GetMixXFAWidget() const { sName = GetAnnotName(); if (sName.IsEmpty()) sName = GetName(); - } else + } else { sName = GetName(); + } if (!sName.IsEmpty()) m_hMixXFAWidget = pDocView->GetWidgetByName(sName); diff --git a/fpdfsdk/src/javascript/Consts.cpp b/fpdfsdk/src/javascript/Consts.cpp index 261f8257a8..132f214d2d 100644 --- a/fpdfsdk/src/javascript/Consts.cpp +++ b/fpdfsdk/src/javascript/Consts.cpp @@ -249,17 +249,17 @@ void CJS_GlobalArrays::DefineJSObjects(CJS_Runtime* pRuntime) { { const FX_WCHAR* ArrayName = L"RE_PHONE_ENTRY"; const FX_WCHAR* ArrayContent[] = { - L"\\d{0,3}(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* 555-1234 or 408 - 555-1234 */ - L"\\(\\d{0,3}", /* (408 */ - L"\\(\\d{0,3}\\)(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* (408) - 555-1234 */ - /* (allow the addition of parens as an afterthought) */ - L"\\(\\d{0,3}(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* (408 555-1234 - */ - L"\\d{0,3}\\)(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", /* 408) 555-1234 - */ - L"011(\\.|[- \\d])*" /* international */ + L"\\d{0,3}(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", // 555-1234 or 408 + // 555-1234 + L"\\(\\d{0,3}", // (408 + L"\\(\\d{0,3}\\)(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", // (408) + // 555-1234 + // (allow the addition of parens as an afterthought) + L"\\(\\d{0,3}(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", // (408 555-1234 + + L"\\d{0,3}\\)(\\.|[- ])?\\d{0,3}(\\.|[- ])?\\d{0,4}", // 408) 555-1234 + + L"011(\\.|[- \\d])*" // international }; DefineGlobalConstStringArray(pRuntime, ArrayName, ArrayContent, FX_ArraySize(ArrayContent)); @@ -268,10 +268,10 @@ void CJS_GlobalArrays::DefineJSObjects(CJS_Runtime* pRuntime) { { const FX_WCHAR* ArrayName = L"RE_PHONE_COMMIT"; const FX_WCHAR* ArrayContent[] = { - L"\\d{3}(\\.|[- ])?\\d{4}", /* 555-1234 */ - L"\\d{3}(\\.|[- ])?\\d{3}(\\.|[- ])?\\d{4}", /* 408 555-1234 */ - L"\\(\\d{3}\\)(\\.|[- ])?\\d{3}(\\.|[- ])?\\d{4}", /* (408) 555-1234 */ - L"011(\\.|[- \\d])*" /* international */ + L"\\d{3}(\\.|[- ])?\\d{4}", // 555-1234 + L"\\d{3}(\\.|[- ])?\\d{3}(\\.|[- ])?\\d{4}", // 408 555-1234 + L"\\(\\d{3}\\)(\\.|[- ])?\\d{3}(\\.|[- ])?\\d{4}", // (408) 555-1234 + L"011(\\.|[- \\d])*" // international }; DefineGlobalConstStringArray(pRuntime, ArrayName, ArrayContent, FX_ArraySize(ArrayContent)); diff --git a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp index e9d5a221f7..ab20e0e365 100644 --- a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp @@ -138,13 +138,11 @@ class CJS_RuntimeStub final : public IJS_Runtime { CPDFSDK_Document* GetReaderDocument() override { return m_pDoc; } #ifdef PDF_ENABLE_XFA - virtual FX_BOOL GetHValueByName(const CFX_ByteStringC&, - FXJSE_HVALUE) override { + FX_BOOL GetHValueByName(const CFX_ByteStringC&, FXJSE_HVALUE) override { return FALSE; } - virtual FX_BOOL SetHValueByName(const CFX_ByteStringC&, - FXJSE_HVALUE) override { + FX_BOOL SetHValueByName(const CFX_ByteStringC&, FXJSE_HVALUE) override { return FALSE; } #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/src/javascript/JS_Value.cpp index 9f27387d1d..cd5f2518cf 100644 --- a/fpdfsdk/src/javascript/JS_Value.cpp +++ b/fpdfsdk/src/javascript/JS_Value.cpp @@ -678,9 +678,10 @@ int _YearFromTime(double t) { if (_TimeFromYear(y) <= t) { while (_TimeFromYear(y + 1) <= t) y++; - } else + } else { while (_TimeFromYear(y) > t) y--; + } return y; } diff --git a/fpdfsdk/src/javascript/JS_Value.h b/fpdfsdk/src/javascript/JS_Value.h index c33a973a12..6c6a03d265 100644 --- a/fpdfsdk/src/javascript/JS_Value.h +++ b/fpdfsdk/src/javascript/JS_Value.h @@ -69,13 +69,13 @@ class CJS_Value { void operator=(int iValue); void operator=(bool bValue); - void operator=(double); - void operator=(float); - void operator=(CJS_Object*); - void operator=(CJS_Document*); - void operator=(v8::Local); - void operator=(CJS_Array&); - void operator=(CJS_Date&); + void operator=(double val); + void operator=(float val); + void operator=(CJS_Object* val); + void operator=(CJS_Document* val); + void operator=(v8::Local val); + void operator=(CJS_Array& val); + void operator=(CJS_Date& val); void operator=(const FX_WCHAR* pWstr); void operator=(const FX_CHAR* pStr); void operator=(CJS_Value value); @@ -102,11 +102,11 @@ class CJS_PropValue : public CJS_Value { FX_BOOL IsSetting() const { return m_bIsSetting; } FX_BOOL IsGetting() const { return !m_bIsSetting; } - void operator<<(int); + void operator<<(int val); void operator>>(int&) const; - void operator<<(bool); + void operator<<(bool val); void operator>>(bool&) const; - void operator<<(double); + void operator<<(double val); void operator>>(double&) const; void operator<<(CJS_Object* pObj); void operator>>(CJS_Object*& ppObj) const; diff --git a/samples/image_diff_png.cc b/samples/image_diff_png.cc index 09913fbe4a..93823aa431 100644 --- a/samples/image_diff_png.cc +++ b/samples/image_diff_png.cc @@ -641,4 +641,4 @@ bool EncodeBGRAPNG(const unsigned char* input, std::vector(), output); } -} // image_diff_png +} // namespace image_diff_png diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc index fe25c7e6cd..656e041e36 100644 --- a/samples/pdfium_test.cc +++ b/samples/pdfium_test.cc @@ -326,9 +326,8 @@ bool ParseCommandLine(const std::vector& args, return false; } options->font_directory = cur_arg.substr(11); - } #ifdef _WIN32 - else if (cur_arg == "--emf") { + } else if (cur_arg == "--emf") { if (options->output_format != OUTPUT_NONE) { fprintf(stderr, "Duplicate or conflicting --emf argument\n"); return false; @@ -340,20 +339,21 @@ bool ParseCommandLine(const std::vector& args, return false; } options->output_format = OUTPUT_BMP; - } #endif // _WIN32 + #ifdef PDF_ENABLE_V8 #ifdef V8_USE_EXTERNAL_STARTUP_DATA - else if (cur_arg.size() > 10 && cur_arg.compare(0, 10, "--bin-dir=") == 0) { + } else if (cur_arg.size() > 10 && + cur_arg.compare(0, 10, "--bin-dir=") == 0) { if (!options->bin_directory.empty()) { fprintf(stderr, "Duplicate --bin-dir argument\n"); return false; } options->bin_directory = cur_arg.substr(10); - } #endif // V8_USE_EXTERNAL_STARTUP_DATA #endif // PDF_ENABLE_V8 - else if (cur_arg.size() > 8 && cur_arg.compare(0, 8, "--scale=") == 0) { + + } else if (cur_arg.size() > 8 && cur_arg.compare(0, 8, "--scale=") == 0) { if (!options->scale_factor_as_string.empty()) { fprintf(stderr, "Duplicate --scale argument\n"); return false; @@ -362,8 +362,9 @@ bool ParseCommandLine(const std::vector& args, } else if (cur_arg.size() >= 2 && cur_arg[0] == '-' && cur_arg[1] == '-') { fprintf(stderr, "Unrecognized argument %s\n", cur_arg.c_str()); return false; - } else + } else { break; + } } for (size_t i = cur_idx; i < args.size(); i++) { files->push_back(args[i]); diff --git a/xfa/include/fwl/lightwidget/picturebox.h b/xfa/include/fwl/lightwidget/picturebox.h index 5a21176241..793eb16fb8 100644 --- a/xfa/include/fwl/lightwidget/picturebox.h +++ b/xfa/include/fwl/lightwidget/picturebox.h @@ -40,7 +40,7 @@ class CFWL_PictureBox : public CFWL_Widget { m_fOffSetX = 0.0f; m_fOffSetY = 0.0f; m_pBitmap = NULL; - }; + } virtual FWL_ERR GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption); virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget); virtual CFX_DIBitmap* GetErrorPicture(IFWL_Widget* pWidget); diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.h b/xfa/src/fdp/src/css/fde_cssdatatable.h index df396228fc..2502ed7fe5 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.h +++ b/xfa/src/fdp/src/css/fde_cssdatatable.h @@ -21,7 +21,7 @@ class CFDE_CSSFunction : public CFX_Target { IFDE_CSSValue* GetArgs(int32_t index) const { return m_pArgList->GetValue(index); } - const FX_WCHAR* GetFuncName() const { return m_pszFuncName; }; + const FX_WCHAR* GetFuncName() const { return m_pszFuncName; } protected: IFDE_CSSValueList* m_pArgList; diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index 4eea30c150..73d0921b15 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -932,11 +932,12 @@ FX_BOOL CFDE_CSSDeclaration::ParseBackgroundProperty( } const FDE_CSSCOLORTABLE* pColorItem = FDE_GetCSSColorByName(pszValue, iValueLen); - if (pColorItem != NULL) + if (pColorItem != NULL) { if (pColor == NULL) { pColor = FXTARGET_NewWith(pStaticStore) CFDE_CSSPrimitiveValue(pColorItem->dwValue); } + } } break; case FDE_CSSPRIMITIVETYPE_RGB: if (pColor == NULL) { diff --git a/xfa/src/fdp/src/fde/fde_object.h b/xfa/src/fdp/src/fde/fde_object.h index 222968c357..4e90ed2aa6 100644 --- a/xfa/src/fdp/src/fde/fde_object.h +++ b/xfa/src/fdp/src/fde/fde_object.h @@ -143,7 +143,7 @@ class CFDE_HatchBrush : public IFDE_HatchBrush, public CFX_Target { } } - virtual int32_t GetHatchStyle() const { return m_iStyle; }; + virtual int32_t GetHatchStyle() const { return m_iStyle; } virtual FX_BOOL SetHatchStyle(int32_t iHatchStyle) { m_iStyle = iHatchStyle; return m_iStyle >= FDE_HATCHSTYLE_Min && m_iStyle <= FDE_HATCHSTYLE_Max; diff --git a/xfa/src/fgas/src/font/fx_gefont.h b/xfa/src/fgas/src/font/fx_gefont.h index 8fb207d588..ef7803d2a5 100644 --- a/xfa/src/fgas/src/font/fx_gefont.h +++ b/xfa/src/fgas/src/font/fx_gefont.h @@ -52,7 +52,7 @@ class CFX_GEFont : public IFX_Font { virtual void SetLogicalFontStyle(FX_DWORD dwLogFontStyle) { m_bUseLogFontStyle = TRUE; m_dwLogFontStyle = dwLogFontStyle; - }; + } #endif protected: diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp index 6ad4918203..8ec8fc51fe 100644 --- a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp +++ b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp @@ -66,11 +66,12 @@ IFX_Font* CFX_StdFontMgrImp::GetDefFontByCodePage( return pFont ? LoadFont(pFont, dwFontStyles, wCodePage) : NULL; } FX_LPCFONTDESCRIPTOR pFD; - if ((pFD = FindFont(pszFontFamily, dwFontStyles, TRUE, wCodePage)) == NULL) - if ((pFD = FindFont(NULL, dwFontStyles, TRUE, wCodePage)) == NULL) - if ((pFD = FindFont(NULL, dwFontStyles, FALSE, wCodePage)) == NULL) { + if ((pFD = FindFont(pszFontFamily, dwFontStyles, TRUE, wCodePage)) == NULL) { + if ((pFD = FindFont(NULL, dwFontStyles, TRUE, wCodePage)) == NULL) { + if ((pFD = FindFont(NULL, dwFontStyles, FALSE, wCodePage)) == NULL) return NULL; - } + } + } FXSYS_assert(pFD != NULL); pFont = IFX_Font::LoadFont(pFD->wsFontFace, dwFontStyles, wCodePage, this); if (pFont != NULL) { @@ -146,11 +147,12 @@ IFX_Font* CFX_StdFontMgrImp::LoadFont(const FX_WCHAR* pszFontFamily, return pFont ? LoadFont(pFont, dwFontStyles, wCodePage) : NULL; } FX_LPCFONTDESCRIPTOR pFD = NULL; - if ((pFD = FindFont(pszFontFamily, dwFontStyles, TRUE, wCodePage)) == NULL) + if ((pFD = FindFont(pszFontFamily, dwFontStyles, TRUE, wCodePage)) == NULL) { if ((pFD = FindFont(pszFontFamily, dwFontStyles, FALSE, wCodePage)) == NULL) { return NULL; } + } FXSYS_assert(pFD != NULL); if (wCodePage == 0xFFFF) { wCodePage = FX_GetCodePageFromCharset(pFD->uCharSet); diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h index 1314d2f465..d1cc095805 100644 --- a/xfa/src/fgas/src/font/fx_stdfontmgr.h +++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h @@ -106,15 +106,16 @@ struct FX_FontDescriptorInfo { public: CFX_FontDescriptor* pFont; int32_t nPenalty; - bool operator>(const FX_FontDescriptorInfo& x) { - return nPenalty > x.nPenalty; - }; - bool operator<(const FX_FontDescriptorInfo& x) { - return nPenalty < x.nPenalty; - }; - bool operator==(const FX_FontDescriptorInfo& x) { - return nPenalty == x.nPenalty; - }; + + bool operator>(const FX_FontDescriptorInfo& other) const { + return nPenalty > other.nPenalty; + } + bool operator<(const FX_FontDescriptorInfo& other) const { + return nPenalty < other.nPenalty; + } + bool operator==(const FX_FontDescriptorInfo& other) const { + return nPenalty == other.nPenalty; + } }; typedef CFX_ArrayTemplate CFX_FontDescriptorInfos; @@ -131,7 +132,7 @@ struct FX_HandleParentPath { class CFX_FontSourceEnum_File : public IFX_FontSourceEnum { public: CFX_FontSourceEnum_File(); - virtual void Release() { delete this; }; + virtual void Release() { delete this; } virtual FX_POSITION GetStartPosition(void* pUserData = NULL); virtual IFX_FileAccess* GetNext(FX_POSITION& pos, void* pUserData = NULL); diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp index 4b17615e07..b1f9d5e9ae 100644 --- a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp +++ b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp @@ -531,11 +531,12 @@ FX_DWORD CFX_RTFBreak::AppendChar_Arabic(CFX_RTFChar* pCurChar, if (m_bVertical != FX_IsOdd(iLastRotation)) { iCharWidth = 1000; } else { - if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode)) + if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode)) { if (!m_pFont->GetCharWidth(pLastChar->m_wCharCode, iCharWidth, m_bCharCode)) { iCharWidth = m_iDefChar; } + } } iCharWidth *= m_iFontSize; iCharWidth = iCharWidth * m_iHorizontalScale / 100; @@ -548,13 +549,12 @@ FX_DWORD CFX_RTFBreak::AppendChar_Arabic(CFX_RTFChar* pCurChar, m_pArabicChar->GetFormChar(pCurChar, (bAlef ? NULL : pLastChar), NULL); if (m_bVertical != FX_IsOdd(iRotation)) { iCharWidth = 1000; - } else { - if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode)) - if (!m_pFont->GetCharWidth(pCurChar->m_wCharCode, iCharWidth, - m_bCharCode)) { - iCharWidth = m_iDefChar; - } + } else if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode) && + !m_pFont->GetCharWidth(pCurChar->m_wCharCode, iCharWidth, + m_bCharCode)) { + iCharWidth = m_iDefChar; } + iCharWidth *= m_iFontSize; iCharWidth = iCharWidth * m_iHorizontalScale / 100; pCurChar->m_iCharWidth = iCharWidth; diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h index a54b83bf3d..7aecef7f10 100644 --- a/xfa/src/fgas/src/layout/fx_rtfbreak.h +++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h @@ -69,8 +69,8 @@ class CFX_RTFBreak : public IFX_RTFBreak { CFX_RTFBreak(FX_DWORD dwPolicies); ~CFX_RTFBreak(); void Release() override { delete this; } - void SetLineBoundary(FX_FLOAT fLineStart, FX_FLOAT fLineEnd) override final; - void SetLineStartPos(FX_FLOAT fLinePos) override final; + void SetLineBoundary(FX_FLOAT fLineStart, FX_FLOAT fLineEnd) override; + void SetLineStartPos(FX_FLOAT fLinePos) override; FX_DWORD GetLayoutStyles() const override { return m_dwLayoutStyles; } void SetLayoutStyles(FX_DWORD dwLayoutStyles) override; void SetFont(IFX_Font* pFont) override; diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index 5fafb98d68..2a33c6e720 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -189,7 +189,7 @@ void CFWL_ComboEditImp::FlagFocus(FX_BOOL bSet) { m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused; ShowCaret(FALSE); } -}; +} void CFWL_ComboEditImp::SetComboBoxFocus(FX_BOOL bSet) { m_pOuter->SetFocus(bSet); } diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index 74c7ef21fe..66852d0815 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -1996,11 +1996,10 @@ void CFWL_EditImpDelegate::OnKeyDown(CFWL_MsgKey* pMsg) { } default: { #if (_FX_OS_ == _FX_MACOSX_) - if (pMsg->m_dwFlags & FWL_KEYFLAG_Command) + if (pMsg->m_dwFlags & FWL_KEYFLAG_Command) { #else - if (pMsg->m_dwFlags & FWL_KEYFLAG_Ctrl) + if (pMsg->m_dwFlags & FWL_KEYFLAG_Ctrl) { #endif - { if (dwKeyCode == 0x43 || dwKeyCode == 0x63) { m_pOwner->DoClipboard(1); return; diff --git a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h index 21a11e373d..e80f33ec9a 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h @@ -45,8 +45,8 @@ class CFWL_ToolTipImp : public CFWL_FormImp { void RefreshToolTipPos(); class CFWL_ToolTipTimer : public IFWL_Timer { public: - CFWL_ToolTipTimer(){}; - ~CFWL_ToolTipTimer(){}; + CFWL_ToolTipTimer() {} + ~CFWL_ToolTipTimer() {} CFWL_ToolTipTimer(CFWL_ToolTipImp* pToolTip); virtual int32_t Run(FWL_HTIMER hTimer); CFWL_ToolTipImp* m_pToolTip; diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index 329d4c7936..0ddfaf8f25 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -30,9 +30,8 @@ FX_BOOL CFWL_NoteLoop::PreProcessMessage(CFWL_Message* pMessage) { } FWL_ERR CFWL_NoteLoop::Idle(int32_t count) { #if (_FX_OS_ == _FX_WIN32_DESKTOP_) - if (count <= 0) + if (count <= 0) { #endif - { CFWL_EvtIdle ev; IFWL_App* pApp = FWL_GetApp(); if (!pApp) @@ -41,7 +40,9 @@ FWL_ERR CFWL_NoteLoop::Idle(int32_t count) { if (!pDriver) return FWL_ERR_Indefinite; pDriver->SendNote(&ev); +#if (_FX_OS_ == _FX_WIN32_DESKTOP_) } +#endif return FWL_ERR_Indefinite; } CFWL_WidgetImp* CFWL_NoteLoop::GetForm() { diff --git a/xfa/src/fxbarcode/BC_BarCode.cpp b/xfa/src/fxbarcode/BC_BarCode.cpp index d76ec810d6..644ead3294 100644 --- a/xfa/src/fxbarcode/BC_BarCode.cpp +++ b/xfa/src/fxbarcode/BC_BarCode.cpp @@ -122,7 +122,7 @@ void CBC_CodeBase::SetBarcodeColor(FX_ARGB foregroundColor) { m_pBCWriter->SetBarcodeColor(foregroundColor); } } -CBC_OneCode::CBC_OneCode(){}; +CBC_OneCode::CBC_OneCode() {} CBC_OneCode::~CBC_OneCode() {} FX_BOOL CBC_OneCode::CheckContentValidity(const CFX_WideStringC& contents) { if (m_pBCWriter) { diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.h b/xfa/src/fxbarcode/BC_TwoDimWriter.h index 4e04c016fe..c46691c619 100644 --- a/xfa/src/fxbarcode/BC_TwoDimWriter.h +++ b/xfa/src/fxbarcode/BC_TwoDimWriter.h @@ -24,7 +24,7 @@ class CBC_TwoDimWriter : public CBC_Writer { virtual void RenderDeviceResult(CFX_RenderDevice* device, const CFX_Matrix* matrix); virtual FX_BOOL SetErrorCorrectionLevel(int32_t level) = 0; - virtual int32_t GetErrorCorrectionLevel() { return m_iCorrectLevel; }; + virtual int32_t GetErrorCorrectionLevel() { return m_iCorrectLevel; } protected: int32_t m_iCorrectLevel; diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.h b/xfa/src/fxbarcode/oned/BC_OneDimWriter.h index 4cda681cb4..f8001dc5c7 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.h +++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.h @@ -34,7 +34,7 @@ class CBC_OneDimWriter : public CBC_Writer { int32_t& outLength, int32_t& e) { return NULL; - }; + } virtual void RenderResult(const CFX_WideStringC& contents, uint8_t* code, int32_t codeLength, @@ -49,7 +49,7 @@ class CBC_OneDimWriter : public CBC_Writer { int32_t& e); virtual FX_BOOL CheckContentValidity(const CFX_WideStringC& contents) { return TRUE; - }; + } virtual CFX_WideString FilterContents(const CFX_WideStringC& contents) { return CFX_WideString(); } diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h index 9b4bb7c979..03067ced5a 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.h +++ b/xfa/src/fxfa/src/app/xfa_textlayout.h @@ -190,7 +190,7 @@ class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target { virtual FX_DWORD AddRef() { return ++m_dwRefCount; } public: - const FX_WCHAR* GetLinkURL() { return m_pszURLContent; }; + const FX_WCHAR* GetLinkURL() { return m_pszURLContent; } protected: IFX_MEMAllocator* m_pAllocator; diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h index ebd3a0f00e..47be3165fe 100644 --- a/xfa/src/fxfa/src/common/xfa_script.h +++ b/xfa/src/fxfa/src/common/xfa_script.h @@ -38,7 +38,7 @@ enum XFA_RESOVENODE_RSTYPE { class CXFA_HVALUEArray : public CFX_ArrayTemplate { public: - CXFA_HVALUEArray(FXJSE_HRUNTIME hRunTime) : m_hRunTime(hRunTime){}; + CXFA_HVALUEArray(FXJSE_HRUNTIME hRunTime) : m_hRunTime(hRunTime) {} ~CXFA_HVALUEArray() { for (int32_t i = 0; i < GetSize(); i++) { FXJSE_Value_Release(GetAt(i)); diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.h b/xfa/src/fxfa/src/fm2js/xfa_error.h index 41b1942215..474b28b7c9 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_error.h +++ b/xfa/src/fxfa/src/fm2js/xfa_error.h @@ -24,8 +24,8 @@ enum XFA_FM_ERRMSG { class CXFA_FMErrorInfo { public: - CXFA_FMErrorInfo() : linenum(0){}; - ~CXFA_FMErrorInfo(){}; + CXFA_FMErrorInfo() : linenum(0) {} + ~CXFA_FMErrorInfo() {} FX_DWORD linenum; CFX_WideString message; }; diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/src/fm2js/xfa_expression.h index f70ee60e5f..2d2da0cb89 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_expression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_expression.h @@ -23,7 +23,7 @@ class CXFA_FMExpression { public: CXFA_FMExpression(FX_DWORD line); CXFA_FMExpression(FX_DWORD line, XFA_FM_EXPTYPE type); - virtual ~CXFA_FMExpression(){}; + virtual ~CXFA_FMExpression() {} virtual void ToJavaScript(CFX_WideTextBuf& javascript); virtual void ToImpliedReturnJS(CFX_WideTextBuf&); FX_DWORD GetLine() { return m_line; } diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index 381dc92ff8..3d46f85c8c 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -1676,7 +1676,7 @@ static void XFA_ItemLayoutProcessor_AddTrailerBeforeSplit( } pProcessor->m_pLayoutItem->m_sSize.y += fHeight; pProcessor->m_pLayoutItem->AddChild(pTrailerLayoutItem); -}; +} static void XFA_ItemLayoutProcessor_AddLeaderAfterSplit( CXFA_ItemLayoutProcessor* pProcessor, CXFA_ContentLayoutItem* pLeaderLayoutItem) { @@ -1717,7 +1717,7 @@ static void XFA_ItemLayoutProcessor_AddLeaderAfterSplit( } pProcessor->m_pLayoutItem->m_sSize.y += fHeight; pProcessor->m_pLayoutItem->AddChild(pLeaderLayoutItem); -}; +} static void XFA_ItemLayoutProcessor_AddPendingNode( CXFA_ItemLayoutProcessor* pProcessor, CXFA_Node* pPendingNode, diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 1c5bd758a8..c7a288bb27 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -178,24 +178,27 @@ CXFA_Node* CXFA_Node::GetNodeItem(XFA_NODEITEM eItem, switch (eItem) { case XFA_NODEITEM_NextSibling: pNode = m_pNext; - if (eType != XFA_OBJECTTYPEMASK) + if (eType != XFA_OBJECTTYPEMASK) { while (pNode && pNode->GetObjectType() != eType) { pNode = pNode->m_pNext; } + } break; case XFA_NODEITEM_FirstChild: pNode = m_pChild; - if (eType != XFA_OBJECTTYPEMASK) + if (eType != XFA_OBJECTTYPEMASK) { while (pNode && pNode->GetObjectType() != eType) { pNode = pNode->m_pNext; } + } break; case XFA_NODEITEM_Parent: pNode = m_pParent; - if (eType != XFA_OBJECTTYPEMASK) + if (eType != XFA_OBJECTTYPEMASK) { while (pNode && pNode->GetObjectType() != eType) { pNode = pNode->m_pParent; } + } break; case XFA_NODEITEM_PrevSibling: if (m_pParent) { diff --git a/xfa/src/fxjse/src/runtime.h b/xfa/src/fxjse/src/runtime.h index 77a447f442..65b7db06c8 100644 --- a/xfa/src/fxjse/src/runtime.h +++ b/xfa/src/fxjse/src/runtime.h @@ -14,7 +14,7 @@ class CFXJSE_RuntimeList; class CFXJSE_RuntimeData { protected: - CFXJSE_RuntimeData(v8::Isolate* pIsolate) : m_pIsolate(pIsolate){}; + CFXJSE_RuntimeData(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {} public: static CFXJSE_RuntimeData* Create(v8::Isolate* pIsolate); -- cgit v1.2.3