diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-04-25 17:45:01 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-25 17:45:01 +0000 |
| commit | f8ffc048195bd96ee58a1aeefcae2ac3f8950ed8 (patch) | |
| tree | ebebd69b4d9f73d7b9b077fbfa7a881fbae06440 /fpdfsdk/fpdf_edittext.cpp | |
| parent | 7b01255ef62f8df5cdd3053fd42c5c501274186d (diff) | |
| download | pdfium-f8ffc048195bd96ee58a1aeefcae2ac3f8950ed8.tar.xz | |
Fix slight type inconsistencies discovered with strict FPDF API types.
Moved to an independent CL from
https://pdfium-review.googlesource.com/c/pdfium/+/31296
Change-Id: Ia76e5609dc09bb7b483e092b10d9f8522e2dc175
Reviewed-on: https://pdfium-review.googlesource.com/31297
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/fpdf_edittext.cpp')
| -rw-r--r-- | fpdfsdk/fpdf_edittext.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp index eba5b554c3..648d1dd5d5 100644 --- a/fpdfsdk/fpdf_edittext.cpp +++ b/fpdfsdk/fpdf_edittext.cpp @@ -235,11 +235,11 @@ CPDF_Stream* LoadUnicode(CPDF_Document* pDoc, const uint32_t kMaxSimpleFontChar = 0xFF; -void* LoadSimpleFont(CPDF_Document* pDoc, - std::unique_ptr<CFX_Font> pFont, - const uint8_t* data, - uint32_t size, - int font_type) { +CPDF_Font* LoadSimpleFont(CPDF_Document* pDoc, + std::unique_ptr<CFX_Font> pFont, + const uint8_t* data, + uint32_t size, + int font_type) { CPDF_Dictionary* fontDict = pDoc->NewIndirect<CPDF_Dictionary>(); fontDict->SetNewFor<CPDF_Name>("Type", "Font"); fontDict->SetNewFor<CPDF_Name>( @@ -281,11 +281,11 @@ void* LoadSimpleFont(CPDF_Document* pDoc, const uint32_t kMaxUnicode = 0x10FFFF; -void* LoadCompositeFont(CPDF_Document* pDoc, - std::unique_ptr<CFX_Font> pFont, - const uint8_t* data, - uint32_t size, - int font_type) { +CPDF_Font* LoadCompositeFont(CPDF_Document* pDoc, + std::unique_ptr<CFX_Font> pFont, + const uint8_t* data, + uint32_t size, + int font_type) { CPDF_Dictionary* fontDict = pDoc->NewIndirect<CPDF_Dictionary>(); fontDict->SetNewFor<CPDF_Name>("Type", "Font"); fontDict->SetNewFor<CPDF_Name>("Subtype", "Type0"); |