Some further optimizations

bluewaysw · Jul 6, 2024 · e7e7bf2 · e7e7bf2
1 parent a7f4f43
commit e7e7bf2
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 12 deletions.
diff --git a/Driver/Font/TrueType/FreeType/freetype.h b/Driver/Font/TrueType/FreeType/freetype.h
@@ -481,6 +481,8 @@
     TT_UShort  usWeightClass;
     TT_UShort  usWidthClass;
     TT_Short   fsType;
+
+#ifdef TT_CONFIG_OPTION_SUPPORT_OPTIONAL_FIELDS
     TT_FWord   ySubscriptXSize;
     TT_FWord   ySubscriptYSize;
     TT_FWord   ySubscriptXOffset;
@@ -491,14 +493,17 @@
     TT_FWord   ySuperscriptYOffset;
     TT_FWord   yStrikeoutSize;
     TT_FWord   yStrikeoutPosition;
-    TT_Short   sFamilyClass;
+#endif
 
+    TT_Short   sFamilyClass;
     TT_Byte    panose[10];
 
+#ifdef TT_CONFIG_OPTION_SUPPORT_UNICODE_RANGES
     TT_ULong   ulUnicodeRange1;        /* Bits 0-31   */
     TT_ULong   ulUnicodeRange2;        /* Bits 32-63  */
     TT_ULong   ulUnicodeRange3;        /* Bits 64-95  */
     TT_ULong   ulUnicodeRange4;        /* Bits 96-127 */
+#endif
 
 #ifdef TT_CONFIG_OPTION_SUPPORT_OPTIONAL_FIELDS
     TT_Char    achVendID[4];

diff --git a/Driver/Font/TrueType/FreeType/ft_conf.h b/Driver/Font/TrueType/FreeType/ft_conf.h
@@ -210,6 +210,13 @@
 #undef  TT_CONFIG_OPTION_SUPPORT_OPTIONAL_FIELDS
 
 
+/*************************************************************************/
+/* Define TT_CONFIG_OPTION_SUPPORT_UNICODE_RANGES if you want to hold    */
+/* unicode ranges in OS/2 table.                                         */
+
+#undef TT_CONFIG_OPTION_SUPPORT_UNICODE_RANGES
+
+
 /**********************************************************************/
 /*                                                                    */
 /*  The following macros are used to define the debug level, as well  */

diff --git a/Driver/Font/TrueType/FreeType/ttextend.c b/Driver/Font/TrueType/FreeType/ttextend.c
@@ -101,7 +101,7 @@
 
     clazz->offset  = exts->cur_offset;
 
-    exts->num_extensions++;
+    ++exts->num_extensions;
     exts->cur_offset += ( size + ALIGNMENT-1 ) & -ALIGNMENT;
 
     return TT_Err_Ok;
@@ -125,7 +125,7 @@
 
     registry = (PExtension_Registry)face->engine->extension_component;
 
-    for ( n = 0; n < face->n_extensions; n++ )
+    for ( n = 0; n < face->n_extensions; ++n )
     {
       clazz = registry->classes + n;
       if ( clazz->id == extension_id )
@@ -154,7 +154,7 @@
 
     registry = (PExtension_Registry)engine->extension_component;
 
-    for ( n = 0; n < face->n_extensions; n++ )
+    for ( n = 0; n < face->n_extensions; ++n )
     {
       clazz = registry->classes + n;
       ext   = (PByte)face->extension + clazz->offset;
@@ -196,7 +196,7 @@
     if ( ALLOC( face->extension, registry->cur_offset ) )
       return error;
 
-    for ( n = 0; n < face->n_extensions; n++ )
+    for ( n = 0; n < face->n_extensions; ++n )
     {
       clazz = registry->classes + n;
       ext   = (PByte)face->extension + clazz->offset;

diff --git a/Driver/Font/TrueType/FreeType/ttload.c b/Driver/Font/TrueType/FreeType/ttload.c
@@ -897,7 +897,7 @@
 
       cmap->offset = FILE_Pos();
 
-      cmap++;
+      ++cmap;
     }
 
     return TT_Err_Ok;
@@ -1006,6 +1006,8 @@
     os2->usWeightClass       = GET_UShort();
     os2->usWidthClass        = GET_UShort();
     os2->fsType              = GET_Short();
+
+#ifdef TT_CONFIG_OPTION_SUPPORT_OPTIONAL_FIELDS
     os2->ySubscriptXSize     = GET_Short();
     os2->ySubscriptYSize     = GET_Short();
     os2->ySubscriptXOffset   = GET_Short();
@@ -1016,15 +1018,23 @@
     os2->ySuperscriptYOffset = GET_Short();
     os2->yStrikeoutSize      = GET_Short();
     os2->yStrikeoutPosition  = GET_Short();
+#else
+    SKIP( 20 );
+#endif
+
     os2->sFamilyClass        = GET_Short();
 
     for ( i = 0; i < 10; ++i )
       os2->panose[i] = GET_Byte();
 
+#ifdef TT_CONFIG_OPTION_SUPPORT_UNICODE_RANGES
     os2->ulUnicodeRange1     = GET_ULong();
     os2->ulUnicodeRange2     = GET_ULong();
     os2->ulUnicodeRange3     = GET_ULong();
     os2->ulUnicodeRange4     = GET_ULong();
+#else
+    SKIP( 16 );
+#endif
 
 #ifdef TT_CONFIG_OPTION_SUPPORT_OPTIONAL_FIELDS
     for ( i = 0; i < 4; ++i )

diff --git a/Driver/Font/TrueType/FreeType/ttraster.c b/Driver/Font/TrueType/FreeType/ttraster.c
@@ -436,7 +436,7 @@
       ras.cProfile->height = 0;
       ras.cProfile->offset = ras.top;
       oldProfile->next     = ras.cProfile;
-      ras.num_Profs++;
+      ++ras.num_Profs;
     }
 
     if ( ras.top >= ras.maxBuff )
@@ -2202,7 +2202,7 @@
 
     if ( ras.numTurns > 0 &&
          ras.sizeBuff[-ras.numTurns] == min_Y )
-      ras.numTurns--;
+      --ras.numTurns;
 
     while ( ras.numTurns > 0 )
     {
@@ -2273,7 +2273,7 @@
 
               /* mark profile for drop-out processing */
               P_Left->countL = 1;
-              dropouts++;
+              ++dropouts;
 
               goto Skip_To_Next;
             }
@@ -2297,7 +2297,7 @@
 
         ras.Proc_Sweep_Step( RAS_VARS y );
 
-        y++;
+        ++y;
 
         if ( y < y_change )
         {
@@ -2421,13 +2421,13 @@ Scan_DropOuts :
         ras.band_stack[ras.band_top+1].y_max = j;
         ras.band_stack[ras.band_top].y_max = k - 1;
 
-        ras.band_top++;
+        ++ras.band_top;
       }
       else
       {
         if ( ras.fProfile )
           if ( Draw_Sweep( RAS_VAR ) ) return ras.error;
-        ras.band_top--;
+        --ras.band_top;
       }
     }