diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-08-29 19:32:47 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-29 19:32:47 +0000 |
commit | 1934a24ffdd8cd27b67fda6dc81cd4420d024db0 (patch) | |
tree | 514e968715388b7a86ee66bc575d2e21f11fceb7 /core/fxcodec/codec/ccodec_flatemodule.cpp | |
parent | b2b1f55214688d5e3bfd5015e0a4829d2f314c27 (diff) | |
download | pdfium-1934a24ffdd8cd27b67fda6dc81cd4420d024db0.tar.xz |
Use pdfium::span<> in fpdf_parser_decode.h helper functions.
Change-Id: Ib0a2bd21fe4304163cf9c080e07475e7c033c299
Reviewed-on: https://pdfium-review.googlesource.com/41570
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/ccodec_flatemodule.cpp')
-rw-r--r-- | core/fxcodec/codec/ccodec_flatemodule.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/core/fxcodec/codec/ccodec_flatemodule.cpp b/core/fxcodec/codec/ccodec_flatemodule.cpp index 0a4baea38f..81be9b02d7 100644 --- a/core/fxcodec/codec/ccodec_flatemodule.cpp +++ b/core/fxcodec/codec/ccodec_flatemodule.cpp @@ -781,17 +781,17 @@ std::unique_ptr<CCodec_ScanlineDecoder> CCodec_FlateModule::CreateDecoder( BitsPerComponent, Columns); } -uint32_t CCodec_FlateModule::FlateOrLZWDecode(bool bLZW, - const uint8_t* src_buf, - uint32_t src_size, - bool bEarlyChange, - int predictor, - int Colors, - int BitsPerComponent, - int Columns, - uint32_t estimated_size, - uint8_t** dest_buf, - uint32_t* dest_size) { +uint32_t CCodec_FlateModule::FlateOrLZWDecode( + bool bLZW, + pdfium::span<const uint8_t> src_span, + bool bEarlyChange, + int predictor, + int Colors, + int BitsPerComponent, + int Columns, + uint32_t estimated_size, + uint8_t** dest_buf, + uint32_t* dest_size) { *dest_buf = nullptr; uint32_t offset = 0; PredictorType predictor_type = GetPredictor(predictor); @@ -799,19 +799,19 @@ uint32_t CCodec_FlateModule::FlateOrLZWDecode(bool bLZW, if (bLZW) { auto decoder = pdfium::MakeUnique<CLZWDecoder>(); *dest_size = 0xFFFFFFFF; - offset = src_size; - int err = - decoder->Decode(nullptr, *dest_size, src_buf, offset, bEarlyChange); + offset = src_span.size(); + int err = decoder->Decode(nullptr, *dest_size, src_span.data(), offset, + bEarlyChange); if (err || *dest_size == 0 || *dest_size + 1 < *dest_size) return FX_INVALID_OFFSET; decoder = pdfium::MakeUnique<CLZWDecoder>(); *dest_buf = FX_Alloc(uint8_t, *dest_size + 1); (*dest_buf)[*dest_size] = '\0'; - decoder->Decode(*dest_buf, *dest_size, src_buf, offset, bEarlyChange); + decoder->Decode(*dest_buf, *dest_size, src_span.data(), offset, + bEarlyChange); } else { - FlateUncompress(pdfium::make_span(src_buf, src_size), estimated_size, - *dest_buf, *dest_size, offset); + FlateUncompress(src_span, estimated_size, *dest_buf, *dest_size, offset); } bool ret = false; |