From 2ccfcae630227d50edb844aefac53ebe450ea15a Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 15 Sep 2015 16:24:58 -0700 Subject: Merge to XFA: Cleanup casting of FX_Alloc() return values. Also convert some FX_AllocOrDie() calls to FX_Alloc(). TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1332173002 . (cherry picked from commit 6aca3e209ff6148f1d77b86b8b97d3bdf18e3eba) Review URL: https://codereview.chromium.org/1344233002 . --- core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp') diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp index 4ce50a8ac4..79bfbdb13a 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp @@ -128,8 +128,7 @@ void CPDF_PageContentGenerate::TransformContent(CFX_Matrix& matrix) { if (type == PDFOBJ_ARRAY) { CPDF_Array* pArray = (CPDF_Array*)pContent; int iCount = pArray->GetCount(); - CPDF_StreamAcc** pContentArray = - (CPDF_StreamAcc**)FX_Alloc(CPDF_StreamAcc*, iCount); + CPDF_StreamAcc** pContentArray = FX_Alloc(CPDF_StreamAcc*, iCount); int size = 0; int i = 0; for (i = 0; i < iCount; ++i) { -- cgit v1.2.3