freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master cce7822 3/4: [pshinter] Fix C++ compilation.


From: Werner Lemberg
Subject: [freetype2] master cce7822 3/4: [pshinter] Fix C++ compilation.
Date: Mon, 8 Nov 2021 05:48:08 -0500 (EST)

branch: master
commit cce782281b2281f04c91b6b543296dd8bb72980b
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    [pshinter] Fix C++ compilation.
    
    * src/pshinter/pshalgo.c (psh_compute_dir): Fix type of `result`.
    (psh_hint_table_find_strong_points): Add cast.
---
 src/pshinter/pshalgo.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c
index 8632df6..227caea 100644
--- a/src/pshinter/pshalgo.c
+++ b/src/pshinter/pshalgo.c
@@ -1054,8 +1054,8 @@
   psh_compute_dir( FT_Pos  dx,
                    FT_Pos  dy )
   {
-    FT_Pos  ax, ay;
-    int     result = PSH_DIR_NONE;
+    FT_Pos   ax, ay;
+    PSH_Dir  result = PSH_DIR_NONE;
 
 
     ax = FT_ABS( dx );
@@ -1425,7 +1425,8 @@
       if ( psh_point_is_strong( point ) )
         continue;
 
-      point_dir = ( point->dir_in | point->dir_out ) & major_dir;
+      point_dir =
+        (PSH_Dir)( ( point->dir_in | point->dir_out ) & major_dir );
 
       if ( point_dir & ( PSH_DIR_DOWN | PSH_DIR_RIGHT ) )
       {



reply via email to

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