diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-09-15 16:24:58 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-09-15 16:24:58 -0700 |
| commit | 2ccfcae630227d50edb844aefac53ebe450ea15a (patch) | |
| tree | 04308f348b11aef52f58d19076bd20eb04c579c1 /core/src/fpdfapi | |
| parent | 7d0fcbf8198f04a5a5bd15482fdbdae919fb1891 (diff) | |
| download | pdfium-2ccfcae630227d50edb844aefac53ebe450ea15a.tar.xz | |
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 .
Diffstat (limited to 'core/src/fpdfapi')
| -rw-r--r-- | core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp | 3 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 2 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/ttgsubtable.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
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) { diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index c934124a8a..0744c896ce 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -1251,7 +1251,7 @@ int CPDF_CIDFont::GetGlyphIndex(FX_DWORD unicode, FX_BOOL* pVertGlyph) { int error = FXFT_Load_Sfnt_Table( m_Font.m_Face, FT_MAKE_TAG('G', 'S', 'U', 'B'), 0, NULL, &length); if (!error) { - m_Font.m_pGsubData = (unsigned char*)FX_Alloc(uint8_t, length); + m_Font.m_pGsubData = FX_Alloc(uint8_t, length); } } int error = diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp index 81383fa869..2ed586e0a3 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp @@ -393,7 +393,7 @@ IFX_GSUBTable* IFX_GSUBTable::Create(CFX_Font* pFont) { int error = FXFT_Load_Sfnt_Table( pFont->m_Face, FT_MAKE_TAG('G', 'S', 'U', 'B'), 0, NULL, &length); if (!error) { - pFont->m_pGsubData = (unsigned char*)FX_Alloc(uint8_t, length); + pFont->m_pGsubData = FX_Alloc(uint8_t, length); } if (!pFont->m_pGsubData) { return NULL; |