[freetype2-demos] master bbb5ee7 1/2: [ftview] Handle extra space differently.

[Alexei Podtelezhnikov]

branch: master
commit bbb5ee7a4d037101c013501e94d2962c82f81b13
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    [ftview] Handle extra space differently.
    
    * src/ftcommon.c (FTDemo_Draw_{Index,Glyph_Color}): Move extra pixel
    from here...
    * src/ftview.c (Render_{Stroke,Fancy,All}): ... to here.
    (Render_{Waterfall,Text}): Do not compensate.
---
 ChangeLog      |  9 +++++++++
 src/ftcommon.c |  4 ++--
 src/ftview.c   | 14 ++++++++------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fcb7ab..eabc9ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-09-07  Alexei Podtelezhnikov  <address@hidden>
+
+       [ftview] Handle extra space differently.
+
+       * src/ftcommon.c (FTDemo_Draw_{Index,Glyph_Color}): Move extra pixel
+       from here...
+       * src/ftview.c (Render_{Stroke,Fancy,All}): ... to here.
+       (Render_{Waterfall,Text}): Do not compensate.
+
 2018-08-23  Werner Lemberg  <address@hidden>
 
        [ftdiff] New keys `A' to `E' to select hinting mode directly.
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 1ef3495..5beb011 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -1213,7 +1213,7 @@
     if ( glyf )
       FT_Done_Glyph( glyf );
 
-    *pen_x += x_advance + 1;
+    *pen_x += x_advance;
 
     return FT_Err_Ok;
   }
@@ -1248,7 +1248,7 @@
     if ( glyf )
       FT_Done_Glyph( glyf );
 
-    *pen_x += x_advance + 1;
+    *pen_x += x_advance;
 
     return FT_Err_Ok;
   }
diff --git a/src/ftview.c b/src/ftview.c
index 80dc039..c97374a 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -233,6 +233,9 @@
           goto Next;
         }
 
+        /* extra space between glyphs */
+        x++;
+
         if ( X_TOO_LONG( x, slot, display ) )
         {
           x  = start_x;
@@ -370,6 +373,9 @@
       if ( slot->format == FT_GLYPH_FORMAT_BITMAP )
         slot->bitmap_top += ystr >> 6;
 
+      /* extra space between glyphs */
+      x++;
+
       if ( X_TOO_LONG( x, slot, display ) )
       {
         x  = start_x;
@@ -511,6 +517,8 @@
           goto Next;
       }
 
+      /* extra space between glyphs */
+      x++;
 
       if ( X_TOO_LONG( x, slot, display ) )
       {
@@ -613,9 +621,6 @@
         status.topleft = ch;
       }
 
-      /* Draw_Index adds one pixel space */
-      x--;
-
       if ( X_TOO_LONG( x, size, display ) )
       {
         x  = start_x;
@@ -732,9 +737,6 @@
           status.topleft = ch;
         }
 
-        /* Draw_Index adds one pixel space */
-        x--;
-
         if ( X_TOO_LONG( x, size, display ) )
           break;