freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2-demos] master 3720272: * src/ftview.c (write_header): Revert


From: Alexei Podtelezhnikov
Subject: [freetype2-demos] master 3720272: * src/ftview.c (write_header): Revert due to segmentation fault.
Date: Mon, 8 May 2017 06:52:43 -0400 (EDT)

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

    * src/ftview.c (write_header): Revert due to segmentation fault.
---
 ChangeLog    | 4 ++++
 src/ftview.c | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cfc9bb0..19b8fe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-08  Alexei Podtelezhnikov  <address@hidden>
+
+       * src/ftview.c (write_header): Revert due to segmentation fault.
+
 2017-05-02  Werner Lemberg  <address@hidden>
 
        Remove `slight' auto-hinting mode.  Add sub-pixel `light' mode.
diff --git a/src/ftview.c b/src/ftview.c
index 730855c..42cd5fc 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1562,10 +1562,9 @@
                        buf, display->fore_color );
 
     /* pt and ppem */
-    sprintf( buf, "%gpt (%.4gppem)",
+    sprintf( buf, "%gpt (%dppem)",
                   status.ptsize / 64.0,
-                  FT_MulFix( face->units_per_EM, face->size->metrics.y_scale )
-                  / 64.0 );
+                  ( status.ptsize * status.res / 72 + 32 ) >> 6 );
     grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
                        buf, display->fore_color );
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]