From: Po Lu <luangruo@yahoo.com>
Date: Tue, 28 Mar 2023 04:03:47 +0000 (+0800)
Subject: Update Android port
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b3d100734b666bfe0541acfef7b8023a4edae455;p=emacs.git

Update Android port

* src/sfntfont.c (sfnt_open_tables): Fix typos in non-HarfBuzz
code.
---

diff --git a/src/sfntfont.c b/src/sfntfont.c
index ee049b5c159..9c0910d18ed 100644
--- a/src/sfntfont.c
+++ b/src/sfntfont.c
@@ -2756,17 +2756,6 @@ sfnt_open_tables (struct sfnt_font_desc *desc)
   if (!tables->hmtx)
     goto bail5;
 
-#ifdef HAVE_HARFBUZZ
-  /* Now copy over the subtable if necessary, as it is needed to read
-     extra font tables required by HarfBuzz.  */
-  tables->directory = subtable;
-  tables->fd = fd;
-#else /* !HAVE_HARFBUZZ */
-  /* Otherwise, close the fd and free the table directory.  */
-  xfree (subtable);
-  emacs_close (fd);
-#endif /* HAVE_HARFBUZZ */
-
   /* Read instruction related font tables.  These might not be
      present, which is OK, since instructing fonts is optional.  */
   tables->prep = sfnt_read_prep_table (fd, subtable);
@@ -2782,6 +2771,17 @@ sfnt_open_tables (struct sfnt_font_desc *desc)
     tables->cvar = sfnt_read_cvar_table (fd, subtable, tables->fvar,
 					 tables->cvt);
 
+#ifdef HAVE_HARFBUZZ
+  /* Now copy over the subtable if necessary, as it is needed to read
+     extra font tables required by HarfBuzz.  */
+  tables->directory = subtable;
+  tables->fd = fd;
+#else /* !HAVE_HARFBUZZ */
+  /* Otherwise, close the fd and free the table directory.  */
+  xfree (subtable);
+  emacs_close (fd);
+#endif /* HAVE_HARFBUZZ */
+
   return tables;
 
  bail5: