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/fxcodec/codec/fx_codec_tiff.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/fxcodec/codec/fx_codec_tiff.cpp')
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_tiff.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/src/fxcodec/codec/fx_codec_tiff.cpp index d057ff8020..13909476d1 100644 --- a/core/src/fxcodec/codec/fx_codec_tiff.cpp +++ b/core/src/fxcodec/codec/fx_codec_tiff.cpp @@ -160,15 +160,15 @@ void* _TIFFrealloc(void* ptr, tmsize_t size) }
void _TIFFmemset(void* ptr, int val, tmsize_t size)
{
- FXSYS_memset8(ptr, val, (size_t)size);
+ FXSYS_memset(ptr, val, (size_t)size);
}
void _TIFFmemcpy(void* des, const void* src, tmsize_t size)
{
- FXSYS_memcpy32(des, src, (size_t)size);
+ FXSYS_memcpy(des, src, (size_t)size);
}
int _TIFFmemcmp(const void* ptr1, const void* ptr2, tmsize_t size)
{
- return FXSYS_memcmp32(ptr1, ptr2, (size_t)size);
+ return FXSYS_memcmp(ptr1, ptr2, (size_t)size);
}
static void _tiff_warning_ext(thandle_t context, const char* module, const char* fmt, va_list ap)
{
@@ -228,7 +228,7 @@ void CCodec_TiffContext::GetFrames(int32_t& frames) if (size && buf) {\
(key) = FX_Alloc(uint8_t,size);\
if ((key)) {\
- FXSYS_memcpy32((key),buf,size);\
+ FXSYS_memcpy((key),buf,size);\
pExif->m_TagVal.SetAt(tag,(key));}}}\
(key) = NULL;
template <class T>
@@ -260,7 +260,7 @@ static void Tiff_Exif_GetStringInfo(TIFF* tif_ctx, ttag_t tag, CFX_DIBAttributeE if ((key) == NULL) {
return;
}
- FXSYS_memcpy32((key), buf, size);
+ FXSYS_memcpy((key), buf, size);
key[size] = 0;
pExif->m_TagVal.SetAt(tag, (key));
}
|