summaryrefslogtreecommitdiff
path: root/core/fxcodec
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2017-09-27 11:07:51 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-27 16:18:11 +0000
commit8b1408e7053247def45659515cda19a64a7fccd5 (patch)
treef3dfb5ebd24fb4993c6b915917b97250b3739555 /core/fxcodec
parentbacf75eeeb5d89fe60b2c77584350ca1b1432bd5 (diff)
downloadpdfium-8b1408e7053247def45659515cda19a64a7fccd5.tar.xz
Remove FXSYS_strlen and FXSYS_wcslenchromium/3226
With the conversion of internal string sizes to size_t, these wrappers are no longer needed. Replacing them with strlen and wcslen respectively. BUG=pdfium:828 Change-Id: Ia087ca2ddaf688a57ec9bd9ddfb8533cbe41510d Reviewed-on: https://pdfium-review.googlesource.com/14890 Commit-Queue: Ryan Harrison <rharrison@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcodec')
-rw-r--r--core/fxcodec/codec/ccodec_pngmodule.cpp6
-rw-r--r--core/fxcodec/codec/ccodec_tiffmodule.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp
index d500745ca7..0531ff10b1 100644
--- a/core/fxcodec/codec/ccodec_pngmodule.cpp
+++ b/core/fxcodec/codec/ccodec_pngmodule.cpp
@@ -80,11 +80,11 @@ static void _png_load_bmp_attribute(png_structp png_ptr,
png_textp text = nullptr;
png_get_text(png_ptr, info_ptr, &text, &num_text);
for (i = 0; i < num_text; i++) {
- len = FXSYS_strlen(text[i].key);
+ len = strlen(text[i].key);
buf = "Time";
- if (memcmp(buf, text[i].key, std::min(len, FXSYS_strlen(buf)))) {
+ if (memcmp(buf, text[i].key, std::min(len, strlen(buf)))) {
buf = "Author";
- if (!memcmp(buf, text[i].key, std::min(len, FXSYS_strlen(buf)))) {
+ if (!memcmp(buf, text[i].key, std::min(len, strlen(buf)))) {
pAttribute->m_strAuthor =
text[i].text_length > 0
? ByteString(reinterpret_cast<uint8_t*>(text[i].text),
diff --git a/core/fxcodec/codec/ccodec_tiffmodule.cpp b/core/fxcodec/codec/ccodec_tiffmodule.cpp
index f11c480bd7..0fcd9f3a99 100644
--- a/core/fxcodec/codec/ccodec_tiffmodule.cpp
+++ b/core/fxcodec/codec/ccodec_tiffmodule.cpp
@@ -201,7 +201,7 @@ void Tiff_Exif_GetStringInfo(TIFF* tif_ctx,
TIFFGetField(tif_ctx, tag, &buf);
if (!buf)
return;
- size_t size = FXSYS_strlen(buf);
+ size_t size = strlen(buf);
uint8_t* ptr = FX_Alloc(uint8_t, size + 1);
memcpy(ptr, buf, size);
ptr[size] = 0;