From 3edb80670ddd20857cfba97110f64d610a5b29eb Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 28 Jun 2018 18:26:15 +0000 Subject: Remove redundant FPDF_PAGEOBJECT null-ness checks. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CPDFTextObjectFromFPDFPageObject() will take the FPDF_PAGEOBJECT and performs the same check anyway. Change-Id: I6535ab749d5a3222c6f2e6fba648f7ee515d3ddc Reviewed-on: https://pdfium-review.googlesource.com/36372 Reviewed-by: Nicolás Peña Moreno Commit-Queue: Lei Zhang --- fpdfsdk/fpdf_edittext.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp index e339c24129..3115e2a16e 100644 --- a/fpdfsdk/fpdf_edittext.cpp +++ b/fpdfsdk/fpdf_edittext.cpp @@ -493,7 +493,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFText_GetMatrix(FPDF_PAGEOBJECT text, double* d, double* e, double* f) { - if (!text || !a || !b || !c || !d || !e || !f) + if (!a || !b || !c || !d || !e || !f) return false; CPDF_TextObject* pTextObj = CPDFTextObjectFromFPDFPageObject(text); @@ -512,14 +512,8 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFText_GetMatrix(FPDF_PAGEOBJECT text, } FPDF_EXPORT double FPDF_CALLCONV FPDFTextObj_GetFontSize(FPDF_PAGEOBJECT text) { - if (!text) - return 0; - CPDF_TextObject* pTextObj = CPDFTextObjectFromFPDFPageObject(text); - if (!pTextObj) - return 0; - - return pTextObj->GetFontSize(); + return pTextObj ? pTextObj->GetFontSize() : 0; } FPDF_EXPORT void FPDF_CALLCONV FPDFFont_Close(FPDF_FONT font) { -- cgit v1.2.3