summaryrefslogtreecommitdiff
path: root/core/fpdfapi/render
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-11-15 07:44:27 -0800
committerCommit bot <commit-bot@chromium.org>2016-11-15 07:44:27 -0800
commitf16f6b8b52277348f5d571b7641bb0bbd5239589 (patch)
treeb321dc4ed2a4d032d36a8b5f532a904c77021817 /core/fpdfapi/render
parent5d223298b26c9b2b6284cba9a51521d3873b6e58 (diff)
downloadpdfium-f16f6b8b52277348f5d571b7641bb0bbd5239589.tar.xz
Revert of Create a subset of skia support for paths only (patchset #10 id:180001 of https://codereview.chromium.org/2491693002/ )
Reason for revert: Breaking the chrome roll. https://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_compile_dbg_ng/builds/306015/steps/generate_build_files%20%28with%20patch%29/logs/stdio Original issue's description: > Create a subset of skia support for paths only > > This is a continuation of https://codereview.chromium.org/2346483006/ > > This removes the need for agg, without providing > full Skia support. > > It doesn't work yet, but it does compile and run > for simple PDFs. > > R=dsinclair@google.com > > Committed: https://pdfium.googlesource.com/pdfium/+/5d223298b26c9b2b6284cba9a51521d3873b6e58 TBR=dsinclair@google.com,caryclark@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/2503883003
Diffstat (limited to 'core/fpdfapi/render')
-rw-r--r--core/fpdfapi/render/fpdf_render_image.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/fpdfapi/render/fpdf_render_image.cpp b/core/fpdfapi/render/fpdf_render_image.cpp
index 560af06842..1133f67a9a 100644
--- a/core/fpdfapi/render/fpdf_render_image.cpp
+++ b/core/fpdfapi/render/fpdf_render_image.cpp
@@ -982,8 +982,7 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict,
int width = pClipRect->right - pClipRect->left;
int height = pClipRect->bottom - pClipRect->top;
FXDIB_Format format;
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || defined _SKIA_SUPPORT_ || \
- defined _SKIA_SUPPORT_PATHS_
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || defined _SKIA_SUPPORT_
format = bLuminosity ? FXDIB_Rgb32 : FXDIB_8bppMask;
#else
format = bLuminosity ? FXDIB_Rgb : FXDIB_8bppMask;