summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2021-11-08 09:41:54 +0100
committerWerner Lemberg <wl@gnu.org>2021-11-08 09:41:54 +0100
commitcce782281b2281f04c91b6b543296dd8bb72980b (patch)
treefaac65c33d2937255416fab36361c458eff31903
parent7ef266045f412cf49f620f1142fc8778ce8c2f9f (diff)
downloadfreetype2-cce782281b2281f04c91b6b543296dd8bb72980b.tar.gz
[pshinter] Fix C++ compilation.
* src/pshinter/pshalgo.c (psh_compute_dir): Fix type of `result`. (psh_hint_table_find_strong_points): Add cast.
-rw-r--r--src/pshinter/pshalgo.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c
index 8632df67a..227caeae3 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 ) )
{