[freetype2-demos] master 797bc42 2/2: * src/ftstring.c (main): Use size metrics instead of resolution.

[Alexei Podtelezhnikov]

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

    * src/ftstring.c (main): Use size metrics instead of resolution.
    * src/ftview.c (Render_Fancy, Render_Stroke): Ditto.
---
 ChangeLog      | 5 +++++
 src/ftstring.c | 4 +++-
 src/ftview.c   | 8 +++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 908133c..a7dc9b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2018-04-25  Alexei Podtelezhnikov  <address@hidden>
 
+       * src/ftstring.c (main): Use size metrics instead of resolution.
+       * src/ftview.c (Render_Fancy, Render_Stroke): Ditto.
+
+2018-04-25  Alexei Podtelezhnikov  <address@hidden>
+
        * src/ftgrid.c (gitd_status_init): Set default resolution here...
        (parse_cmdline): ... instead of here.
 
diff --git a/src/ftstring.c b/src/ftstring.c
index 4a3a409..0d3814d 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -729,6 +729,7 @@
 
       case RENDER_MODE_KERNCMP:
         {
+          FT_Size                size;
           FTDemo_String_Context  sc = status.sc;
           FT_Int                 x, y;
           FT_Int                 height;
@@ -736,7 +737,8 @@
 
           x = 55;
 
-          height = ( status.ptsize * status.res / 72 + 32 ) >> 6;
+          FTDemo_Get_Size( handle, &size );
+          height = size->metrics.y_ppem;
           if ( height < CELLSTRING_HEIGHT )
             height = CELLSTRING_HEIGHT;
 
diff --git a/src/ftview.c b/src/ftview.c
index 1bcf6e0..c8c816b 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -196,8 +196,7 @@
     face = size->face;
     slot = face->glyph;
 
-    radius = (FT_Fixed)(
-               status.radius * ( status.ptsize * status.res / 72 ) );
+    radius = (FT_Fixed)( size->metrics.y_ppem * 64 * status.radius );
 
     FT_Stroker_Set( handle->stroker, radius,
                     FT_STROKER_LINECAP_ROUND,
@@ -314,9 +313,8 @@
     shear.yx = 0;
     shear.yy = 1 << 16;
 
-    ystr = status.ptsize * status.res / 72;
-    xstr = (FT_Pos)( status.xbold_factor * ystr );
-    ystr = (FT_Pos)( status.ybold_factor * ystr );
+    xstr = (FT_Pos)( size->metrics.y_ppem * 64 * status.xbold_factor );
+    ystr = (FT_Pos)( size->metrics.y_ppem * 64 * status.ybold_factor );
 
     have_topleft = 0;