diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-29 18:25:44 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-29 18:25:44 +0000 |
| commit | 803cf76a5801536afe3ac2baad0f9a66ec27eeb6 (patch) | |
| tree | 5a37abc17e7e5f8189e5681f500d73320ccbfe9c /core/fpdfapi/parser | |
| parent | d2e4698c5daeba74a231574d63a11a858920ea59 (diff) | |
| download | pdfium-803cf76a5801536afe3ac2baad0f9a66ec27eeb6.tar.xz | |
Remove FPDFAPI_ prefix from internal cid/encoder functions
These look too much like public/ FPDF functions otherwise and yet
they are not exposed anywhere beyond core/fpdfapi. Disambiguate
one method vs. top-level function usage as a result.
Bug: pdfium:1141
Change-Id: I9cfdfced90386bb9ef6b2b86f568f2e6f8ee6a5a
Reviewed-on: https://pdfium-review.googlesource.com/41530
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser')
| -rw-r--r-- | core/fpdfapi/parser/fpdf_parser_decode.cpp | 26 | ||||
| -rw-r--r-- | core/fpdfapi/parser/fpdf_parser_decode.h | 18 |
2 files changed, 22 insertions, 22 deletions
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp index ff4f63f0cb..8143517029 100644 --- a/core/fpdfapi/parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp @@ -257,7 +257,7 @@ uint32_t RunLengthDecode(const uint8_t* src_buf, return std::min(i + 1, src_size); } -std::unique_ptr<CCodec_ScanlineDecoder> FPDFAPI_CreateFaxDecoder( +std::unique_ptr<CCodec_ScanlineDecoder> CreateFaxDecoder( pdfium::span<const uint8_t> src_span, int width, int height, @@ -283,7 +283,7 @@ std::unique_ptr<CCodec_ScanlineDecoder> FPDFAPI_CreateFaxDecoder( Rows); } -std::unique_ptr<CCodec_ScanlineDecoder> FPDFAPI_CreateFlateDecoder( +std::unique_ptr<CCodec_ScanlineDecoder> CreateFlateDecoder( pdfium::span<const uint8_t> src_span, int width, int height, @@ -307,13 +307,13 @@ std::unique_ptr<CCodec_ScanlineDecoder> FPDFAPI_CreateFlateDecoder( Columns); } -uint32_t FPDFAPI_FlateOrLZWDecode(bool bLZW, - const uint8_t* src_buf, - uint32_t src_size, - const CPDF_Dictionary* pParams, - uint32_t estimated_size, - uint8_t** dest_buf, - uint32_t* dest_size) { +uint32_t FlateOrLZWDecode(bool bLZW, + const uint8_t* src_buf, + uint32_t src_size, + const CPDF_Dictionary* pParams, + uint32_t estimated_size, + uint8_t** dest_buf, + uint32_t* dest_size) { int predictor = 0; int Colors = 0; int BitsPerComponent = 0; @@ -382,11 +382,11 @@ bool PDF_DataDecode(const uint8_t* src_buf, *pImageParams = pParam; return true; } - offset = FPDFAPI_FlateOrLZWDecode(false, last_buf, last_size, pParam, - estimated_size, &new_buf, &new_size); + offset = FlateOrLZWDecode(false, last_buf, last_size, pParam, + estimated_size, &new_buf, &new_size); } else if (decoder == "LZWDecode" || decoder == "LZW") { - offset = FPDFAPI_FlateOrLZWDecode(true, last_buf, last_size, pParam, - estimated_size, &new_buf, &new_size); + offset = FlateOrLZWDecode(true, last_buf, last_size, pParam, + estimated_size, &new_buf, &new_size); } else if (decoder == "ASCII85Decode" || decoder == "A85") { offset = A85Decode(last_buf, last_size, &new_buf, &new_size); } else if (decoder == "ASCIIHexDecode" || decoder == "AHx") { diff --git a/core/fpdfapi/parser/fpdf_parser_decode.h b/core/fpdfapi/parser/fpdf_parser_decode.h index bf70997397..da228d223d 100644 --- a/core/fpdfapi/parser/fpdf_parser_decode.h +++ b/core/fpdfapi/parser/fpdf_parser_decode.h @@ -38,13 +38,13 @@ uint32_t RunLengthDecode(const uint8_t* src_buf, uint8_t** dest_buf, uint32_t* dest_size); -std::unique_ptr<CCodec_ScanlineDecoder> FPDFAPI_CreateFaxDecoder( +std::unique_ptr<CCodec_ScanlineDecoder> CreateFaxDecoder( pdfium::span<const uint8_t> src_span, int width, int height, const CPDF_Dictionary* pParams); -std::unique_ptr<CCodec_ScanlineDecoder> FPDFAPI_CreateFlateDecoder( +std::unique_ptr<CCodec_ScanlineDecoder> CreateFlateDecoder( pdfium::span<const uint8_t> src_span, int width, int height, @@ -62,13 +62,13 @@ uint32_t HexDecode(const uint8_t* src_buf, uint8_t** dest_buf, uint32_t* dest_size); -uint32_t FPDFAPI_FlateOrLZWDecode(bool bLZW, - const uint8_t* src_buf, - uint32_t src_size, - const CPDF_Dictionary* pParams, - uint32_t estimated_size, - uint8_t** dest_buf, - uint32_t* dest_size); +uint32_t FlateOrLZWDecode(bool bLZW, + const uint8_t* src_buf, + uint32_t src_size, + const CPDF_Dictionary* pParams, + uint32_t estimated_size, + uint8_t** dest_buf, + uint32_t* dest_size); bool PDF_DataDecode(const uint8_t* src_buf, uint32_t src_size, |