commit a03eebd662845a578f1cfd8688620481cade23a1
author Lei Zhang <thestig@chromium.org> Wed Jan 03 18:36:36 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 03 18:36:36 2024 +0000
tree bce30f9fd235b73c5bb531329c8f0fedabca97e4
parent 8810061a89eaf38ec9fd7051c7dc6588f065d99e

Add missing FontEncoding::kNone value

Add an enum value that matches FT_ENCODING_NONE. Then update the
FT_Encoding from/to fxge::FontEncoding conversion functions to handle
this case.

Bug: chromium:1514128
Change-Id: I8bf41399242fff59072b12211107310a0a7f4294
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/115173
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Dominik Röttsches <drott@chromium.org>

core/fxge/cfx_face.cpp

diff --git a/core/fxge/cfx_face.cpp b/core/fxge/cfx_face.cpp
index 8e6f423..99574af 100644
--- a/core/fxge/cfx_face.cpp
+++ b/core/fxge/cfx_face.cpp
@@ -220,6 +220,8 @@
       return FT_ENCODING_JOHAB;
     case fxge::FontEncoding::kLatin1:
       return FT_ENCODING_ADOBE_LATIN_1;
+    case fxge::FontEncoding::kNone:
+      return FT_ENCODING_NONE;
     case fxge::FontEncoding::kOldLatin2:
       return FT_ENCODING_OLD_LATIN_2;
     case fxge::FontEncoding::kSjis:
@@ -251,6 +253,8 @@
       return fxge::FontEncoding::kJohab;
     case FT_ENCODING_ADOBE_LATIN_1:
       return fxge::FontEncoding::kLatin1;
+    case FT_ENCODING_NONE:
+      return fxge::FontEncoding::kNone;
     case FT_ENCODING_OLD_LATIN_2:
       return fxge::FontEncoding::kOldLatin2;
     case FT_ENCODING_SJIS:

core/fxge/fx_fontencoding.h

diff --git a/core/fxge/fx_fontencoding.h b/core/fxge/fx_fontencoding.h
index a1de368..beacac6 100644
--- a/core/fxge/fx_fontencoding.h
+++ b/core/fxge/fx_fontencoding.h
@@ -18,6 +18,7 @@
   kGB2312,
   kJohab,
   kLatin1,
+  kNone,
   kOldLatin2,
   kSjis,
   kSymbol,