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 . --- 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 +- 7 files changed, 112 insertions(+), 93 deletions(-) (limited to 'core/src/fxge') 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) { -- cgit v1.2.3