From d74da7bb34abdae254df64ba2c0da7a581f6dae0 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 4 May 2017 13:30:29 -0700 Subject: Make CPDF_Font member variables protected. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5d452ea907f4d243645ddae3512776096a827522 Reviewed-on: https://pdfium-review.googlesource.com/4872 Commit-Queue: Lei Zhang Reviewed-by: Nicolás Peña --- fpdfsdk/fpdfedit_embeddertest.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'fpdfsdk/fpdfedit_embeddertest.cpp') diff --git a/fpdfsdk/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdfedit_embeddertest.cpp index 383e207f54..05b665b33f 100644 --- a/fpdfsdk/fpdfedit_embeddertest.cpp +++ b/fpdfsdk/fpdfedit_embeddertest.cpp @@ -554,8 +554,8 @@ TEST_F(FPDFEditEmbeddertest, LoadSimpleType1Font) { // TODO(npm): use other fonts after disallowing loading any font as any type const CPDF_Font* stock_font = CPDF_Font::GetStockFont(cpdf_doc(), "Times-Bold"); - const uint8_t* data = stock_font->m_Font.GetFontData(); - const uint32_t size = stock_font->m_Font.GetSize(); + const uint8_t* data = stock_font->GetFont()->GetFontData(); + const uint32_t size = stock_font->GetFont()->GetSize(); std::unique_ptr font( FPDFText_LoadFont(document(), data, size, FPDF_FONT_TYPE1, false)); ASSERT_TRUE(font.get()); @@ -583,8 +583,8 @@ TEST_F(FPDFEditEmbeddertest, LoadSimpleType1Font) { TEST_F(FPDFEditEmbeddertest, LoadSimpleTrueTypeFont) { CreateNewDocument(); const CPDF_Font* stock_font = CPDF_Font::GetStockFont(cpdf_doc(), "Courier"); - const uint8_t* data = stock_font->m_Font.GetFontData(); - const uint32_t size = stock_font->m_Font.GetSize(); + const uint8_t* data = stock_font->GetFont()->GetFontData(); + const uint32_t size = stock_font->GetFont()->GetSize(); std::unique_ptr font( FPDFText_LoadFont(document(), data, size, FPDF_FONT_TRUETYPE, false)); ASSERT_TRUE(font.get()); @@ -613,8 +613,8 @@ TEST_F(FPDFEditEmbeddertest, LoadCIDType0Font) { CreateNewDocument(); const CPDF_Font* stock_font = CPDF_Font::GetStockFont(cpdf_doc(), "Times-Roman"); - const uint8_t* data = stock_font->m_Font.GetFontData(); - const uint32_t size = stock_font->m_Font.GetSize(); + const uint8_t* data = stock_font->GetFont()->GetFontData(); + const uint32_t size = stock_font->GetFont()->GetSize(); std::unique_ptr font( FPDFText_LoadFont(document(), data, size, FPDF_FONT_TYPE1, 1)); ASSERT_TRUE(font.get()); @@ -654,8 +654,8 @@ TEST_F(FPDFEditEmbeddertest, LoadCIDType2Font) { CreateNewDocument(); const CPDF_Font* stock_font = CPDF_Font::GetStockFont(cpdf_doc(), "Helvetica-Oblique"); - const uint8_t* data = stock_font->m_Font.GetFontData(); - const uint32_t size = stock_font->m_Font.GetSize(); + const uint8_t* data = stock_font->GetFont()->GetFontData(); + const uint32_t size = stock_font->GetFont()->GetSize(); std::unique_ptr font( FPDFText_LoadFont(document(), data, size, FPDF_FONT_TRUETYPE, 1)); @@ -707,8 +707,8 @@ TEST_F(FPDFEditEmbeddertest, AddTrueTypeFontText) { FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792); { const CPDF_Font* stock_font = CPDF_Font::GetStockFont(cpdf_doc(), "Arial"); - const uint8_t* data = stock_font->m_Font.GetFontData(); - const uint32_t size = stock_font->m_Font.GetSize(); + const uint8_t* data = stock_font->GetFont()->GetFontData(); + const uint32_t size = stock_font->GetFont()->GetSize(); std::unique_ptr font( FPDFText_LoadFont(document(), data, size, FPDF_FONT_TRUETYPE, 0)); ASSERT_TRUE(font.get()); -- cgit v1.2.3