diff options
author | Nicolas Pena <npm@chromium.org> | 2017-04-07 14:12:31 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-07 18:29:13 +0000 |
commit | 6a5c20cd08748da5969cbab756c3e8a6dd27bfbc (patch) | |
tree | 09a5d7e2666b166dc55e94a48270f17741d22b22 /core/fxcodec/codec | |
parent | 1e8c39f18df6e597e079cce13d18d72631ef0fb9 (diff) | |
download | pdfium-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/fxcodec/codec')
-rw-r--r-- | core/fxcodec/codec/fx_codec_icc.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/fxcodec/codec/fx_codec_icc.cpp b/core/fxcodec/codec/fx_codec_icc.cpp index 315f48417c..7592c053c5 100644 --- a/core/fxcodec/codec/fx_codec_icc.cpp +++ b/core/fxcodec/codec/fx_codec_icc.cpp @@ -204,6 +204,8 @@ void IccLib_TranslateImage(void* pTransform, unsigned char* pDest, const unsigned char* pSrc, int32_t pixels) { + if (!pTransform) + return; cmsDoTransform(((CLcmsCmm*)pTransform)->m_hTransform, pSrc, pDest, pixels); } |