From 6581175666ba4e1eb2826142376cbfe4495c6e76 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 11 Jun 2015 12:17:45 -0700 Subject: Merge to XFA: Kill FXSYS_mem{cpy,cmp,set.move}{32,8}. Only manual merge was core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp follwed by scripts. Original Review URL: https://codereview.chromium.org/1179693003. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1179953002. --- core/src/fxge/ge/fx_ge_font.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/src/fxge/ge/fx_ge_font.cpp') diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/src/fxge/ge/fx_ge_font.cpp index c61119d5fe..4bac672cc5 100644 --- a/core/src/fxge/ge/fx_ge_font.cpp +++ b/core/src/fxge/ge/fx_ge_font.cpp @@ -210,7 +210,7 @@ static FXFT_Face FT_LoadFont(uint8_t* pData, int size) FX_BOOL CFX_Font::LoadEmbedded(const uint8_t* data, FX_DWORD size) { m_pFontDataAllocation = FX_Alloc(uint8_t, size); - FXSYS_memcpy32(m_pFontDataAllocation, data, size); + FXSYS_memcpy(m_pFontDataAllocation, data, size); m_Face = FT_LoadFont((uint8_t*)m_pFontDataAllocation, size); m_pFontData = (uint8_t*)m_pFontDataAllocation; m_bEmbedded = TRUE; -- cgit v1.2.3