summaryrefslogtreecommitdiff
path: root/core/fxge/win32
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-04-07 14:12:31 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-04-07 18:29:13 +0000
commit6a5c20cd08748da5969cbab756c3e8a6dd27bfbc (patch)
tree09a5d7e2666b166dc55e94a48270f17741d22b22 /core/fxge/win32
parent1e8c39f18df6e597e079cce13d18d72631ef0fb9 (diff)
downloadpdfium-6a5c20cd08748da5969cbab756c3e8a6dd27bfbc.tar.xz
Remove the ICC transform where it is never initialized.
- All callers of CFX_DIBitmap methods use nullptr as the ICC Transform. - The CFX_ScanlineCompositor is always initialized with a null ICC transform. Many of its methods call TranslateScanline from the ICC module. This method casts just uses ((CLcmsCmm*)pTransform)->m_hTransform, and this should not be done when pTransform is nullptr. Change-Id: I1b846d1f20699fa017cb9a276be3214eb8fabd4b Reviewed-on: https://pdfium-review.googlesource.com/3931 Commit-Queue: Nicolás Peña <npm@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxge/win32')
-rw-r--r--core/fxge/win32/fx_win32_device.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index d4abcbe251..39533e1ef6 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -1224,8 +1224,7 @@ bool CGdiDisplayDriver::SetDIBits(const CFX_RetainPtr<CFX_DIBSource>& pSource,
if (!background->Create(width, height, FXDIB_Rgb32) ||
!GetDIBits(background, left, top) ||
!background->CompositeMask(0, 0, width, height, pSource, color, 0, 0,
- FXDIB_BLEND_NORMAL, nullptr, false, 0,
- nullptr)) {
+ FXDIB_BLEND_NORMAL, nullptr, false, 0)) {
return false;
}
FX_RECT src_rect(0, 0, width, height);
@@ -1244,7 +1243,7 @@ bool CGdiDisplayDriver::SetDIBits(const CFX_RetainPtr<CFX_DIBSource>& pSource,
!GetDIBits(bitmap, left, top) ||
!bitmap->CompositeBitmap(0, 0, width, height, pSource, pSrcRect->left,
pSrcRect->top, FXDIB_BLEND_NORMAL, nullptr,
- false, nullptr)) {
+ false)) {
return false;
}
FX_RECT src_rect(0, 0, width, height);
@@ -1321,7 +1320,7 @@ bool CGdiDisplayDriver::StretchDIBits(
image_rect.top + clip_rect.top) ||
!background->CompositeMask(0, 0, clip_width, clip_height, pStretched,
color, 0, 0, FXDIB_BLEND_NORMAL, nullptr,
- false, 0, nullptr)) {
+ false, 0)) {
return false;
}