Commit 834b53ed0e331a14c1db674e9628c2a980c5d237

Tom Kacvinsky 2000-11-27T03:23:50

Simplied glyph width processing code and the comments pertaining to it.

diff --git a/src/cff/t2gload.c b/src/cff/t2gload.c
index 38d550a..e28331f 100644
--- a/src/cff/t2gload.c
+++ b/src/cff/t2gload.c
@@ -855,15 +855,13 @@
 
           if ( num_args > 0 && decoder->read_width )
           {
-            /* If `nominal_width' is non-zero, the number is really a      */
-            /* difference against `nominal_width'.                         */
-            if ( decoder->nominal_width )
-              decoder->glyph_width = decoder->nominal_width +
-                                       ( stack[0] >> 16 );
-            /* Else, the number here is truly a width, not a difference.   */
-            else
-              decoder->glyph_width = stack[0] >> 16;
+            /* If `nominal_width' is non-zero, the number is really a difference */
+            /* against `nominal_width'.  Else, the number here is truly a width, */
+            /* not a difference.  If the font does not set `nominal_width', then */
+            /* `nominal_width' defaults to zero, and so we can set 'glyph_width' */
+            /* to `nominal_width' plus number on the stack -- for either case.   */
 
+            decoder->glyph_width = decoder->nominal_width + ( stack[0] >> 16 );
             num_args--;
             args++;
           }