diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-11 12:17:45 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-11 12:17:45 -0700 |
| commit | 6581175666ba4e1eb2826142376cbfe4495c6e76 (patch) | |
| tree | 38770d7cf709979b0d493a6ca0367a0cbc080736 /core/src/fxge/ge/fx_ge_text.cpp | |
| parent | 05f11bcf48a630b53cac603538bb75f21ad4231d (diff) | |
| download | pdfium-6581175666ba4e1eb2826142376cbfe4495c6e76.tar.xz | |
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.
Diffstat (limited to 'core/src/fxge/ge/fx_ge_text.cpp')
| -rw-r--r-- | core/src/fxge/ge/fx_ge_text.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp index 151b7099a5..7133d65417 100644 --- a/core/src/fxge/ge/fx_ge_text.cpp +++ b/core/src/fxge/ge/fx_ge_text.cpp @@ -1273,7 +1273,7 @@ static void _ContrastAdjust(uint8_t* pDataIn, uint8_t* pDataOut, int nWid, int n if (0 == temp || 255 == temp) { int rowbytes = FXSYS_abs(nSrcRowBytes) > nDstRowBytes ? nDstRowBytes : FXSYS_abs(nSrcRowBytes); for (row = 0; row < nHei; row ++) { - FXSYS_memcpy32(pDataOut + row * nDstRowBytes, pDataIn + row * nSrcRowBytes, rowbytes); + FXSYS_memcpy(pDataOut + row * nDstRowBytes, pDataIn + row * nSrcRowBytes, rowbytes); } return; } @@ -1393,11 +1393,11 @@ CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont, FX_DWORD glyph_inde } } } else { - FXSYS_memset32(pDestBuf, 0, dest_pitch * bmheight); + FXSYS_memset(pDestBuf, 0, dest_pitch * bmheight); if (anti_alias == FXFT_RENDER_MODE_MONO && FXFT_Get_Bitmap_PixelMode(FXFT_Get_Glyph_Bitmap(m_Face)) == FXFT_PIXEL_MODE_MONO) { int rowbytes = FXSYS_abs(src_pitch) > dest_pitch ? dest_pitch : FXSYS_abs(src_pitch); for (int row = 0; row < bmheight; row ++) { - FXSYS_memcpy32(pDestBuf + row * dest_pitch, pSrcBuf + row * src_pitch, rowbytes); + FXSYS_memcpy(pDestBuf + row * dest_pitch, pSrcBuf + row * src_pitch, rowbytes); } } else { _ContrastAdjust(pSrcBuf, pDestBuf, bmwidth, bmheight, src_pitch, dest_pitch); @@ -1432,7 +1432,7 @@ FX_BOOL _OutputGlyph(void* dib, int x, int y, CFX_Font* pFont, for (int row = 0; row < bmheight; row ++) { const uint8_t* src_scan = src_buf + row * src_pitch; uint8_t* dest_scan = dest_buf + row * dest_pitch; - FXSYS_memcpy32(dest_scan, src_scan, dest_pitch); + FXSYS_memcpy(dest_scan, src_scan, dest_pitch); } pDib->CompositeMask(x + left, y - top, bmwidth, bmheight, &mask, argb, 0, 0); return TRUE; |