diff options
Diffstat (limited to 'xfa/fgas')
| -rw-r--r-- | xfa/fgas/crt/ifgas_stream.cpp | 10 | ||||
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.cpp | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/xfa/fgas/crt/ifgas_stream.cpp b/xfa/fgas/crt/ifgas_stream.cpp index 8627c9f17c..0edf2ccbbd 100644 --- a/xfa/fgas/crt/ifgas_stream.cpp +++ b/xfa/fgas/crt/ifgas_stream.cpp @@ -651,7 +651,7 @@ int32_t CFGAS_BufferReadStreamImp::ReadData(uint8_t* pBuffer, uint32_t dwOffsetTmp = m_iPosition - dwBlockOffset; uint32_t dwCopySize = std::min(iBufferSize, (int32_t)(dwBlockSize - dwOffsetTmp)); - FXSYS_memcpy(pBuffer, pBufferTmp + dwOffsetTmp, dwCopySize); + memcpy(pBuffer, pBufferTmp + dwOffsetTmp, dwCopySize); dwOffsetTmp = dwCopySize; iBufferSize -= dwCopySize; while (iBufferSize > 0) { @@ -662,7 +662,7 @@ int32_t CFGAS_BufferReadStreamImp::ReadData(uint8_t* pBuffer, dwBlockSize = m_pBufferRead->GetBlockSize(); pBufferTmp = m_pBufferRead->GetBlockBuffer(); dwCopySize = std::min((uint32_t)iBufferSize, dwBlockSize); - FXSYS_memcpy(pBuffer + dwOffsetTmp, pBufferTmp, dwCopySize); + memcpy(pBuffer + dwOffsetTmp, pBufferTmp, dwCopySize); dwOffsetTmp += dwCopySize; iBufferSize -= dwCopySize; } @@ -800,7 +800,7 @@ int32_t CFGAS_BufferStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) { if (iLen <= 0) { return 0; } - FXSYS_memcpy(pBuffer, m_pData + m_iPosition, iLen); + memcpy(pBuffer, m_pData + m_iPosition, iLen); m_iPosition += iLen; return iLen; } @@ -831,7 +831,7 @@ int32_t CFGAS_BufferStreamImp::WriteData(const uint8_t* pBuffer, if (iLen <= 0) { return 0; } - FXSYS_memcpy(m_pData + m_iPosition, pBuffer, iLen); + memcpy(m_pData + m_iPosition, pBuffer, iLen); m_iPosition += iLen; if (m_iPosition > m_iLength) { m_iLength = m_iPosition; @@ -846,7 +846,7 @@ int32_t CFGAS_BufferStreamImp::WriteString(const wchar_t* pStr, if (iLen <= 0) { return 0; } - FXSYS_memcpy(m_pData + m_iPosition, pStr, iLen * 2); + memcpy(m_pData + m_iPosition, pStr, iLen * 2); m_iPosition += iLen * 2; if (m_iPosition > m_iLength) { m_iLength = m_iPosition; diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp index 7b8e19a5bc..766422e381 100644 --- a/xfa/fgas/font/cfgas_fontmgr.cpp +++ b/xfa/fgas/font/cfgas_fontmgr.cpp @@ -297,7 +297,7 @@ const FX_FONTDESCRIPTOR* CFGAS_FontMgr::FindFont(const wchar_t* pszFontFamily, uint32_t dwUSB, wchar_t wUnicode) { FX_FONTMATCHPARAMS params; - FXSYS_memset(¶ms, 0, sizeof(params)); + memset(¶ms, 0, sizeof(params)); params.dwUSB = dwUSB; params.wUnicode = wUnicode; params.wCodePage = wCodePage; @@ -350,13 +350,13 @@ static int32_t CALLBACK FX_GdiFontEnumProc(ENUMLOGFONTEX* lpelfe, if (lf.lfFaceName[0] == L'@') return 1; FX_FONTDESCRIPTOR* pFont = FX_Alloc(FX_FONTDESCRIPTOR, 1); - FXSYS_memset(pFont, 0, sizeof(FX_FONTDESCRIPTOR)); + memset(pFont, 0, sizeof(FX_FONTDESCRIPTOR)); pFont->uCharSet = lf.lfCharSet; pFont->dwFontStyles = FX_GetGdiFontStyles(lf); FXSYS_wcsncpy(pFont->wsFontFace, (const wchar_t*)lf.lfFaceName, 31); pFont->wsFontFace[31] = 0; - FXSYS_memcpy(&pFont->FontSignature, &lpntme->ntmFontSig, - sizeof(lpntme->ntmFontSig)); + memcpy(&pFont->FontSignature, &lpntme->ntmFontSig, + sizeof(lpntme->ntmFontSig)); reinterpret_cast<std::deque<FX_FONTDESCRIPTOR>*>(lParam)->push_back(*pFont); FX_Free(pFont); return 1; @@ -367,7 +367,7 @@ static void FX_EnumGdiFonts(std::deque<FX_FONTDESCRIPTOR>* fonts, wchar_t wUnicode) { HDC hDC = ::GetDC(nullptr); LOGFONTW lfFind; - FXSYS_memset(&lfFind, 0, sizeof(lfFind)); + memset(&lfFind, 0, sizeof(lfFind)); lfFind.lfCharSet = DEFAULT_CHARSET; if (pwsFaceName) { FXSYS_wcsncpy(lfFind.lfFaceName, pwsFaceName, 31); @@ -884,7 +884,7 @@ FXFT_Face CFGAS_FontMgr::LoadFace( return nullptr; FXFT_Stream ftStream = FX_Alloc(FXFT_StreamRec, 1); - FXSYS_memset(ftStream, 0, sizeof(FXFT_StreamRec)); + memset(ftStream, 0, sizeof(FXFT_StreamRec)); ftStream->base = nullptr; ftStream->descriptor.pointer = static_cast<void*>(pFontStream.Get()); ftStream->pos = 0; @@ -893,7 +893,7 @@ FXFT_Face CFGAS_FontMgr::LoadFace( ftStream->close = _ftStreamClose; FXFT_Open_Args ftArgs; - FXSYS_memset(&ftArgs, 0, sizeof(FXFT_Open_Args)); + memset(&ftArgs, 0, sizeof(FXFT_Open_Args)); ftArgs.flags |= FT_OPEN_STREAM; ftArgs.stream = ftStream; |