* src/base/ftobjs.c (FT_Get_Next_Char): updated to new FT_CMap

definitions
23 years ago · 1eae664342
parent 143e31bf6b
commit 1eae664342
1 changed files with 2 additions and 3 deletions
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@ -1507,9 +1507,8 @@
 #ifdef FT_CONFIG_OPTION_USE_CMAPS
      FT_CMap  cmap = FT_CMAP( face->charmap );

-      result = cmap->clazz->char_next( cmap, charcode, &gindex );
-      if ( gindex == 0 )
-        result = 0;
+      gindex = cmap->clazz->char_next( cmap, &charcode );
+      result = ( gindex == 0 ) ? 0 : charcode;
 #else /* !FT_CONFIG_OPTION_USE_CMAPS */
      driver = face->driver;
      result = driver->clazz->get_next_char( face->charmap, charcode );