diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-11-02 19:50:58 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-02 19:50:58 +0000 |
| commit | f1be1e87045da36b52326fb269f7006670c0c9ab (patch) | |
| tree | 629877b8d7bf46132e2f04ca655fe1cfcc1fc42a /core/fxge/dib | |
| parent | eda1761e6a90058a97cee1bcd763a2447eb6a67b (diff) | |
| download | pdfium-f1be1e87045da36b52326fb269f7006670c0c9ab.tar.xz | |
Rename Transparency to iTransparency.
Fix a mismatched parameter name in cpdf_renderstatus.h too.
Change-Id: I9765838e6ab93db37791fc282e553b6cb9c51ec5
Reviewed-on: https://pdfium-review.googlesource.com/17050
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/dib')
| -rw-r--r-- | core/fxge/dib/cfx_scanlinecompositor.cpp | 12 | ||||
| -rw-r--r-- | core/fxge/dib/cfx_scanlinecompositor.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/fxge/dib/cfx_scanlinecompositor.cpp b/core/fxge/dib/cfx_scanlinecompositor.cpp index b9c51f6122..a1254e2116 100644 --- a/core/fxge/dib/cfx_scanlinecompositor.cpp +++ b/core/fxge/dib/cfx_scanlinecompositor.cpp @@ -2846,12 +2846,12 @@ bool CFX_ScanlineCompositor::Init(FXDIB_Format dest_format, return true; InitSourcePalette(src_format, dest_format, pSrcPalette); - m_Transparency = + m_iTransparency = (dest_format == FXDIB_Argb ? 1 : 0) + (dest_format & 0x0200 ? 2 : 0) + (dest_format & 0x0400 ? 4 : 0) + ((src_format & 0xff) == 1 ? 8 : 0); return true; } - m_Transparency = + m_iTransparency = (src_format & 0x0200 ? 0 : 1) + (dest_format & 0x0200 ? 0 : 2) + (blend_type == FXDIB_BLEND_NORMAL ? 4 : 0) + (bClip ? 8 : 0) + (src_format & 0x0400 ? 16 : 0) + (dest_format & 0x0400 ? 32 : 0); @@ -3001,7 +3001,7 @@ void CFX_ScanlineCompositor::CompositeRgbBitmapLine( int src_Bpp = (m_SrcFormat & 0xff) >> 3; int dest_Bpp = (m_DestFormat & 0xff) >> 3; if (m_bRgbByteOrder) { - switch (m_Transparency) { + switch (m_iTransparency) { case 0: case 4: case 8: @@ -3097,7 +3097,7 @@ void CFX_ScanlineCompositor::CompositeRgbBitmapLine( } } } else { - switch (m_Transparency) { + switch (m_iTransparency) { case 0: case 4: case 8: @@ -3194,7 +3194,7 @@ void CFX_ScanlineCompositor::CompositePalBitmapLine( return; } if ((m_DestFormat & 0xff) == 8) { - if (m_Transparency & 8) { + if (m_iTransparency & 8) { if (m_DestFormat & 0x0200) { CompositeRow_1bppPal2Graya( dest_scan, src_scan, src_left, @@ -3219,7 +3219,7 @@ void CFX_ScanlineCompositor::CompositePalBitmapLine( m_BlendType, clip_scan, src_extra_alpha); } } else { - switch (m_Transparency) { + switch (m_iTransparency) { case 1 + 2: CompositeRow_8bppRgb2Argb_NoBlend(dest_scan, src_scan, width, m_pSrcPalette.get(), clip_scan, diff --git a/core/fxge/dib/cfx_scanlinecompositor.h b/core/fxge/dib/cfx_scanlinecompositor.h index bc20cc97ab..75ab578128 100644 --- a/core/fxge/dib/cfx_scanlinecompositor.h +++ b/core/fxge/dib/cfx_scanlinecompositor.h @@ -62,7 +62,7 @@ class CFX_ScanlineCompositor { void InitSourceMask(int alpha_flag, uint32_t mask_color); - int m_Transparency; + int m_iTransparency; FXDIB_Format m_SrcFormat; FXDIB_Format m_DestFormat; std::unique_ptr<uint32_t, FxFreeDeleter> m_pSrcPalette; |