[freetype2-demos] master bbb9b14: * src/ftmulti.c (Process_Event, main): Use `FT_RoundFix'.

[Alexei Podtelezhnikov]

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

    * src/ftmulti.c (Process_Event, main): Use `FT_RoundFix'.
---
 ChangeLog     |  6 +++++-
 src/ftbench.c |  4 ++--
 src/ftmulti.c | 10 ++--------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3689c5e..cd0e37d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-23  Alexei Podtelezhnikov  <address@hidden>
+
+       * src/ftmulti.c (Process_Event, main): Use `FT_RoundFix'.
+
 2017-03-23  Werner Lemberg  <address@hidden>
 
        * src/ftmulti.c (Process_Event, main): Fix rounding.
@@ -333,7 +337,7 @@
 
        * src/ftbench.c (get_time): Use `clock_gettime' instead of obsolete
        and less accurate `gettimeofday'.
-       (benchmark): Updated. 
+       (benchmark): Updated.
 
 2016-07-14  Werner Lemberg  <address@hidden>
 
diff --git a/src/ftbench.c b/src/ftbench.c
index 4faca39..c8cc8f3 100644
--- a/src/ftbench.c
+++ b/src/ftbench.c
@@ -988,7 +988,7 @@
           int  filter = atoi( optarg );
 
 
-         switch ( filter )
+          switch ( filter )
           {
           case FT_LCD_FILTER_NONE:
           case FT_LCD_FILTER_DEFAULT:
@@ -996,7 +996,7 @@
           case FT_LCD_FILTER_LEGACY1:
           case FT_LCD_FILTER_LEGACY:
             FT_Library_SetLcdFilter( lib, filter );
-         }
+          }
         }
         break;
 
diff --git a/src/ftmulti.c b/src/ftmulti.c
index 05a3f97..70fdab5 100644
--- a/src/ftmulti.c
+++ b/src/ftmulti.c
@@ -697,10 +697,7 @@
       /* for MM fonts, round the design coordinates to integers,         */
       /* otherwise round to two decimal digits to make the PS name short */
       if ( !FT_IS_SFNT( face ) )
-      {
-        design_pos[axis] += design_pos[axis] < 0 ? -0x8000 : 0x8000;
-        design_pos[axis] &= 0xFFFF0000L;
-      }
+        design_pos[axis] = FT_RoundFix( design_pos[axis] );
       else
       {
         double  x;
@@ -953,10 +950,7 @@
 
       /* for MM fonts, round the design coordinates to integers */
       if ( !FT_IS_SFNT( face ) )
-      {
-        design_pos[n] += design_pos[n] < 0 ? -0x8000 : 0x8000;
-        design_pos[n] &= 0xFFFF0000L;
-      }
+        design_pos[n] = FT_RoundFix( design_pos[n] );
     }
 
     error = FT_Set_Var_Design_Coordinates( face, used_num_axis, design_pos );