From 615bb96eb26570fd87004e2fa6f42eca0dbf79cd Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Mon, 8 May 2017 15:08:12 -0400 Subject: Remove default params in CFX_DIBSource Change-Id: I9306afed2747e3b0054adeea1d39916cac47f5c5 Reviewed-on: https://pdfium-review.googlesource.com/5091 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fxcodec/codec/ccodec_tiffmodule.cpp | 2 +- core/fxcodec/codec/fx_codec_progress.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'core/fxcodec/codec') diff --git a/core/fxcodec/codec/ccodec_tiffmodule.cpp b/core/fxcodec/codec/ccodec_tiffmodule.cpp index 3c24c33286..09eddf6076 100644 --- a/core/fxcodec/codec/ccodec_tiffmodule.cpp +++ b/core/fxcodec/codec/ccodec_tiffmodule.cpp @@ -344,7 +344,7 @@ void CCodec_TiffContext::SetPalette( uint32_t b = blue_orig[index] & 0xFF; uint32_t color = (uint32_t)b | ((uint32_t)g << 8) | ((uint32_t)r << 16) | (((uint32)0xffL) << 24); - pDIBitmap->SetPaletteEntry(index, color); + pDIBitmap->SetPaletteArgb(index, color); } } diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp index e26431ffab..56c9ed9534 100644 --- a/core/fxcodec/codec/fx_codec_progress.cpp +++ b/core/fxcodec/codec/fx_codec_progress.cpp @@ -2299,7 +2299,8 @@ FXCODEC_STATUS CCodec_ProgressiveDecoder::ContinueDecode() { return m_status; } CFX_RetainPtr pStrechBitmap = pFormatBitmap->StretchTo( - m_sizeX, m_sizeY, m_bInterpol ? FXDIB_INTERPOL : FXDIB_DOWNSAMPLE); + m_sizeX, m_sizeY, m_bInterpol ? FXDIB_INTERPOL : FXDIB_DOWNSAMPLE, + nullptr); pFormatBitmap = nullptr; if (!pStrechBitmap) { m_pDeviceBitmap = nullptr; -- cgit v1.2.3