From f8ffc048195bd96ee58a1aeefcae2ac3f8950ed8 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 25 Apr 2018 17:45:01 +0000 Subject: 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 Commit-Queue: Tom Sepez --- fpdfsdk/fpdf_edittext.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'fpdfsdk') 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 pFont, - const uint8_t* data, - uint32_t size, - int font_type) { +CPDF_Font* LoadSimpleFont(CPDF_Document* pDoc, + std::unique_ptr pFont, + const uint8_t* data, + uint32_t size, + int font_type) { CPDF_Dictionary* fontDict = pDoc->NewIndirect(); fontDict->SetNewFor("Type", "Font"); fontDict->SetNewFor( @@ -281,11 +281,11 @@ void* LoadSimpleFont(CPDF_Document* pDoc, const uint32_t kMaxUnicode = 0x10FFFF; -void* LoadCompositeFont(CPDF_Document* pDoc, - std::unique_ptr pFont, - const uint8_t* data, - uint32_t size, - int font_type) { +CPDF_Font* LoadCompositeFont(CPDF_Document* pDoc, + std::unique_ptr pFont, + const uint8_t* data, + uint32_t size, + int font_type) { CPDF_Dictionary* fontDict = pDoc->NewIndirect(); fontDict->SetNewFor("Type", "Font"); fontDict->SetNewFor("Subtype", "Type0"); -- cgit v1.2.3