From 58577fd17020f52314bba8989be964a8c2fd010d Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 10 May 2017 01:15:46 -0700 Subject: Use FXSYS_IntToTwoHexChars() in more places. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I84cd8e91a296119ecf80b7a092b886f291bebb45 Reviewed-on: https://pdfium-review.googlesource.com/4953 Reviewed-by: Tom Sepez Reviewed-by: Nicolás Peña Commit-Queue: Lei Zhang --- core/fpdfapi/parser/fpdf_parser_decode.cpp | 6 ++++-- core/fpdfapi/parser/fpdf_parser_utility.cpp | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'core/fpdfapi') diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp index c521c20665..64831e91e5 100644 --- a/core/fpdfapi/parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp @@ -517,8 +517,10 @@ CFX_ByteString PDF_EncodeString(const CFX_ByteString& src, bool bHex) { if (bHex) { result.AppendChar('<'); for (int i = 0; i < srclen; i++) { - result.AppendChar("0123456789ABCDEF"[src[i] / 16]); - result.AppendChar("0123456789ABCDEF"[src[i] % 16]); + char buf[2]; + FXSYS_IntToTwoHexChars(src[i], buf); + result.AppendChar(buf[0]); + result.AppendChar(buf[1]); } result.AppendChar('>'); return result.MakeString(); diff --git a/core/fpdfapi/parser/fpdf_parser_utility.cpp b/core/fpdfapi/parser/fpdf_parser_utility.cpp index 1edf577c5b..af109e35aa 100644 --- a/core/fpdfapi/parser/fpdf_parser_utility.cpp +++ b/core/fpdfapi/parser/fpdf_parser_utility.cpp @@ -139,8 +139,8 @@ CFX_ByteString PDF_NameEncode(const CFX_ByteString& orig) { if (ch >= 0x80 || PDFCharIsWhitespace(ch) || ch == '#' || PDFCharIsDelimiter(ch)) { dest_buf[dest_len++] = '#'; - dest_buf[dest_len++] = "0123456789ABCDEF"[ch / 16]; - dest_buf[dest_len++] = "0123456789ABCDEF"[ch % 16]; + FXSYS_IntToTwoHexChars(ch, dest_buf + dest_len); + dest_len += 2; } else { dest_buf[dest_len++] = ch; } -- cgit v1.2.3