commit 3fe31fee2a92c717c37f0a95625719f2559e5278
author Tom Sepez <tsepez@chromium.org> Thu Jul 29 20:52:46 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jul 29 20:52:46 2021 +0000
tree dc8bc0c248403995970ea60557a62bf21186ba4c
parent a2eeec0b43620d3f7e543909b4c15b8e81473b9e

Fix some nits in fx_freetype.cpp.

-- Prefer anon namespace to static functions.
-- Replace macro with constexpr constant.
-- Fix else-after-return.

Change-Id: If4a9aaedb55c2f97618f03e1452ef37db59dcced
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83558
Auto-Submit: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

core/fxge/freetype/fx_freetype.cpp

diff --git a/core/fxge/freetype/fx_freetype.cpp b/core/fxge/freetype/fx_freetype.cpp
index b3de154..3a3a6c8 100644
--- a/core/fxge/freetype/fx_freetype.cpp
+++ b/core/fxge/freetype/fx_freetype.cpp
@@ -9,10 +9,14 @@
 #define DEFINE_PS_TABLES
 #include "third_party/freetype/include/pstables.h"
 
-static int xyq_search_node(char* glyph_name,
-                           int name_offset,
-                           int table_offset,
-                           wchar_t unicode) {
+namespace {
+
+constexpr uint32_t kVariantBit = 0x80000000;
+
+int xyq_search_node(char* glyph_name,
+                    int name_offset,
+                    int table_offset,
+                    wchar_t unicode) {
   // copy letters
   while (1) {
     glyph_name[name_offset] = ft_adobe_glyph_list[table_offset] & 0x7f;
@@ -51,7 +55,7 @@
   return 0;
 }
 
-#define VARIANT_BIT 0x80000000UL
+}  // namespace
 
 int FXFT_unicode_from_adobe_name(const char* glyph_name) {
   /* If the name begins with `uni', then the glyph name may be a */
@@ -69,9 +73,7 @@
 
     for (count = 4; count > 0; count--, p++) {
       char c = *p;
-      unsigned int d;
-
-      d = (unsigned char)c - '0';
+      unsigned int d = (unsigned char)c - '0';
       if (d >= 10) {
         d = (unsigned char)c - 'A';
         if (d >= 6)
@@ -94,7 +96,7 @@
       if (*p == '\0')
         return value;
       if (*p == '.')
-        return (FT_UInt32)(value | VARIANT_BIT);
+        return (FT_UInt32)(value | kVariantBit);
     }
   }
 
@@ -107,9 +109,7 @@
 
     for (count = 6; count > 0; count--, p++) {
       char c = *p;
-      unsigned int d;
-
-      d = (unsigned char)c - '0';
+      unsigned int d = (unsigned char)c - '0';
       if (d >= 10) {
         d = (unsigned char)c - 'A';
         if (d >= 6)
@@ -128,7 +128,7 @@
       if (*p == '\0')
         return value;
       if (*p == '.')
-        return (FT_UInt32)(value | VARIANT_BIT);
+        return (FT_UInt32)(value | kVariantBit);
     }
   }
 
@@ -148,9 +148,8 @@
     /* now look up the glyph in the Adobe Glyph List */
     if (!dot)
       return (FT_UInt32)ft_get_adobe_glyph_index(glyph_name, p);
-    else
-      return (FT_UInt32)(ft_get_adobe_glyph_index(glyph_name, dot) |
-                         VARIANT_BIT);
+
+    return (FT_UInt32)(ft_get_adobe_glyph_index(glyph_name, dot) | kVariantBit);
   }
 }