commit 314d7647769b4c6ef21e87502ae7342b11023f7f
author Nico Weber <thakis@chromium.org> Fri Feb 23 00:09:32 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Feb 23 00:09:32 2024 +0000
tree 72b4800a30226b3982bc66d9bf52b65077d1c9e0
parent af1239af6439c2518a35aeff58d9c04b2d1d17e1

Simplify PDF_EncodeText() using FX_UTF16Encode()

No behavior change.

Change-Id: I31f8883f91aa854ab3f04a634c70ab7ac1763a72
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/114750
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Thomas Sepez <tsepez@google.com>
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Thomas Sepez <tsepez@google.com>

core/fpdfapi/parser/fpdf_parser_decode.cpp

diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp
index 4883a44..f876ea9 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp
@@ -538,31 +538,16 @@
 
   size_t dest_index = 0;
   {
-#if defined(WCHAR_T_IS_32_BIT)
-    // 2 or 4 bytes required per UTF-32 code unit.
-    pdfium::span<uint8_t> dest_buf =
-        pdfium::as_writable_bytes(result.GetBuffer(len * 4 + 2));
-#else
+    std::u16string utf16 = FX_UTF16Encode(str);
     // 2 bytes required per UTF-16 code unit.
     pdfium::span<uint8_t> dest_buf =
-        pdfium::as_writable_bytes(result.GetBuffer(len * 2 + 2));
-#endif  // defined(WCHAR_T_IS_32_BIT)
+        pdfium::as_writable_bytes(result.GetBuffer(utf16.size() * 2 + 2));
 
     dest_buf[dest_index++] = 0xfe;
     dest_buf[dest_index++] = 0xff;
-    for (size_t j = 0; j < len; ++j) {
-#if defined(WCHAR_T_IS_32_BIT)
-      if (pdfium::IsSupplementary(str[j])) {
-        pdfium::SurrogatePair pair(str[j]);
-        dest_buf[dest_index++] = pair.high() >> 8;
-        dest_buf[dest_index++] = static_cast<uint8_t>(pair.high());
-        dest_buf[dest_index++] = pair.low() >> 8;
-        dest_buf[dest_index++] = static_cast<uint8_t>(pair.low());
-        continue;
-      }
-#endif  // defined(WCHAR_T_IS_32_BIT)
-      dest_buf[dest_index++] = str[j] >> 8;
-      dest_buf[dest_index++] = static_cast<uint8_t>(str[j]);
+    for (char16_t code_unit : utf16) {
+      dest_buf[dest_index++] = code_unit >> 8;
+      dest_buf[dest_index++] = static_cast<uint8_t>(code_unit);
     }
   }
   result.ReleaseBuffer(dest_index);