diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-06-29 20:45:59 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-29 20:45:59 +0000 |
| commit | 81fcde731fe44ef5a11748536a2d6404906c80ff (patch) | |
| tree | 641251da3da640cecb9210017293f5050fa563dd /core/fxcodec | |
| parent | 238947ce91a07fc4fbb17de0a140349446ff4898 (diff) | |
| download | pdfium-81fcde731fe44ef5a11748536a2d6404906c80ff.tar.xz | |
Use pdfium::span with CPDF_IccProfile and friends.
Change-Id: I88d3e86a1dad75ef9c6bfb3401af6606479031a7
Reviewed-on: https://pdfium-review.googlesource.com/36634
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'core/fxcodec')
| -rw-r--r-- | core/fxcodec/codec/ccodec_iccmodule.h | 5 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_icc.cpp | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/fxcodec/codec/ccodec_iccmodule.h b/core/fxcodec/codec/ccodec_iccmodule.h index 419bf17777..64cfb26f9d 100644 --- a/core/fxcodec/codec/ccodec_iccmodule.h +++ b/core/fxcodec/codec/ccodec_iccmodule.h @@ -13,6 +13,7 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" #include "third_party/base/ptr_util.h" +#include "third_party/base/span.h" #if defined(USE_SYSTEM_LCMS2) #include <lcms2.h> @@ -45,8 +46,8 @@ class CCodec_IccModule { CCodec_IccModule(); ~CCodec_IccModule(); - std::unique_ptr<CLcmsCmm> CreateTransform_sRGB(const uint8_t* pProfileData, - uint32_t dwProfileSize); + std::unique_ptr<CLcmsCmm> CreateTransform_sRGB( + pdfium::span<const uint8_t> span); void Translate(CLcmsCmm* pTransform, const float* pSrcValues, float* pDestValues); diff --git a/core/fxcodec/codec/fx_codec_icc.cpp b/core/fxcodec/codec/fx_codec_icc.cpp index fc82e043b4..7ae93e59b4 100644 --- a/core/fxcodec/codec/fx_codec_icc.cpp +++ b/core/fxcodec/codec/fx_codec_icc.cpp @@ -50,10 +50,8 @@ CCodec_IccModule::CCodec_IccModule() {} CCodec_IccModule::~CCodec_IccModule() {} std::unique_ptr<CLcmsCmm> CCodec_IccModule::CreateTransform_sRGB( - const unsigned char* pSrcProfileData, - uint32_t dwSrcProfileSize) { - ScopedCmsProfile srcProfile( - cmsOpenProfileFromMem(pSrcProfileData, dwSrcProfileSize)); + pdfium::span<const uint8_t> span) { + ScopedCmsProfile srcProfile(cmsOpenProfileFromMem(span.data(), span.size())); if (!srcProfile) return nullptr; |