From 030bfc05d3460eabaa059f9561897cc1279bd60f Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 24 Oct 2018 23:52:24 +0000 Subject: Remove FXDIB_BLEND_UNSUPPORTED. The blend mode is never set to this value. Change-Id: I96cbadb055137a9de45f0082c81a7b8aedb9a427 Reviewed-on: https://pdfium-review.googlesource.com/c/44544 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp | 6 ++---- core/fpdfapi/render/cpdf_renderstatus.cpp | 3 --- core/fxge/fx_dib.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) (limited to 'core') diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp index 4ae5631534..b29d5b30b6 100644 --- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp +++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp @@ -439,8 +439,7 @@ void CPDF_PageContentGenerator::ProcessGraphics(std::ostringstream* buf, graphD.strokeAlpha = pPageObj->m_GeneralState.GetStrokeAlpha(); graphD.blendType = pPageObj->m_GeneralState.GetBlendType(); if (graphD.fillAlpha == 1.0f && graphD.strokeAlpha == 1.0f && - (graphD.blendType == FXDIB_BLEND_UNSUPPORTED || - graphD.blendType == FXDIB_BLEND_NORMAL)) { + graphD.blendType == FXDIB_BLEND_NORMAL) { return; } @@ -456,8 +455,7 @@ void CPDF_PageContentGenerator::ProcessGraphics(std::ostringstream* buf, if (graphD.strokeAlpha != 1.0f) gsDict->SetNewFor("CA", graphD.strokeAlpha); - if (graphD.blendType != FXDIB_BLEND_UNSUPPORTED && - graphD.blendType != FXDIB_BLEND_NORMAL) { + if (graphD.blendType != FXDIB_BLEND_NORMAL) { gsDict->SetNewFor("BM", pPageObj->m_GeneralState.GetBlendMode()); } diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 26ce0a6d3c..4e9c69b870 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -1438,9 +1438,6 @@ bool CPDF_RenderStatus::ProcessTransparency(CPDF_PageObject* pPageObj, DebugVerifyDeviceIsPreMultiplied(); #endif int blend_type = pPageObj->m_GeneralState.GetBlendType(); - if (blend_type == FXDIB_BLEND_UNSUPPORTED) - return true; - CPDF_Dictionary* pSMaskDict = ToDictionary(pPageObj->m_GeneralState.GetSoftMask()); if (pSMaskDict) { diff --git a/core/fxge/fx_dib.h b/core/fxge/fx_dib.h index 7d8ca5fd72..0779de3232 100644 --- a/core/fxge/fx_dib.h +++ b/core/fxge/fx_dib.h @@ -72,7 +72,6 @@ extern const int16_t SDP_Table[513]; #define FXDIB_BLEND_SATURATION 22 #define FXDIB_BLEND_COLOR 23 #define FXDIB_BLEND_LUMINOSITY 24 -#define FXDIB_BLEND_UNSUPPORTED -1 constexpr uint32_t FXSYS_BGR(uint8_t b, uint8_t g, uint8_t r) { return (b << 16) | (g << 8) | r; -- cgit v1.2.3