mirrors/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[pshinter] More convenient direction definition.

Browse Source 
It is easier to check directions using flags than integer values.

* src/pshinter/pshalgo.h (PSH_Dir): Redefine directions.
(PSH_PointRec): Use them as an enum type.

* src/pshinter/pshalgo.c (psh_compute_dir): Modify return type.
(psh_glyph_init, psh_hint_table_find_strong_points,
psh_glyph_find_blue_points): Update users.
This commit is contained in:
Alexei Podtelezhnikov 2021-10-03 22:48:23 -04:00
parent d102a51438
commit 227445f613
2 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/pshinter/pshalgo.c
View File

@ -1050,7 +1050,7 @@
}
static int
static PSH_Dir
psh_compute_dir( FT_Pos dx,
FT_Pos dy )
{
@ -1234,12 +1234,12 @@
dxi = vec[n].x - vec[n_prev].x;
dyi = vec[n].y - vec[n_prev].y;
point->dir_in = (FT_Char)psh_compute_dir( dxi, dyi );
point->dir_in = psh_compute_dir( dxi, dyi );
dxo = vec[n_next].x - vec[n].x;
dyo = vec[n_next].y - vec[n].y;
point->dir_out = (FT_Char)psh_compute_dir( dxo, dyo );
point->dir_out = psh_compute_dir( dxo, dyo );
/* detect smooth points */
if ( point->flags & PSH_POINT_OFF )
@ -1404,16 +1404,13 @@
}
/* major_dir is the direction for points on the bottom/left of the stem; */
/* Points on the top/right of the stem will have a direction of */
/* -major_dir. */
/* the min and max are based on contour orientation and fill rule */
static void
psh_hint_table_find_strong_points( PSH_Hint_Table table,
PSH_Point point,
FT_UInt count,
FT_Int threshold,
FT_Int major_dir )
PSH_Dir major_dir )
{
PSH_Hint* sort = table->sort;
FT_UInt num_hints = table->num_hints;
@ -1421,20 +1418,20 @@
for ( ; count > 0; count--, point++ )
{
FT_Int point_dir = 0;
FT_Pos org_u = point->org_u;
PSH_Dir point_dir = PSH_DIR_NONE;
FT_Pos org_u = point->org_u;
if ( psh_point_is_strong( point ) )
continue;
if ( PSH_DIR_COMPARE( point->dir_in, major_dir ) )
if ( point->dir_in & major_dir )
point_dir = point->dir_in;
else if ( PSH_DIR_COMPARE( point->dir_out, major_dir ) )
else if ( point->dir_out & major_dir )
point_dir = point->dir_out;
if ( point_dir == major_dir )
if ( point_dir & ( PSH_DIR_DOWN | PSH_DIR_RIGHT ) )
{
FT_UInt nn;
@ -1454,7 +1451,7 @@
}
}
}
else if ( point_dir == -major_dir )
else if ( point_dir & ( PSH_DIR_UP | PSH_DIR_LEFT ) )
{
FT_UInt nn;
@ -1569,7 +1566,7 @@
PS_Mask mask = table->hint_masks->masks;
FT_UInt num_masks = table->hint_masks->num_masks;
FT_UInt first = 0;
FT_Int major_dir = ( dimension == 0 ) ? PSH_DIR_VERTICAL
PSH_Dir major_dir = ( dimension == 0 ) ? PSH_DIR_VERTICAL
: PSH_DIR_HORIZONTAL;
PSH_Dimension dim = &glyph->globals->dimension[dimension];
FT_Fixed scale = dim->scale_mult;
@ -1654,8 +1651,8 @@
/* check tangents */
if ( !PSH_DIR_COMPARE( point->dir_in, PSH_DIR_HORIZONTAL ) &&
!PSH_DIR_COMPARE( point->dir_out, PSH_DIR_HORIZONTAL ) )
if ( !( point->dir_in & PSH_DIR_HORIZONTAL ) &&
!( point->dir_out & PSH_DIR_HORIZONTAL ) )
continue;
/* skip strong points */

26
src/pshinter/pshalgo.h
View File

@ -93,21 +93,17 @@ FT_BEGIN_HEADER
typedef struct PSH_PointRec_* PSH_Point;
typedef struct PSH_ContourRec_* PSH_Contour;
enum
typedef enum PSH_Dir_
{
PSH_DIR_NONE = 4,
PSH_DIR_UP = -1,
PSH_DIR_DOWN = 1,
PSH_DIR_LEFT = -2,
PSH_DIR_RIGHT = 2
};
PSH_DIR_NONE = 0,
PSH_DIR_UP = 1,
PSH_DIR_DOWN = 2,
PSH_DIR_VERTICAL = 1 | 2,
PSH_DIR_LEFT = 4,
PSH_DIR_RIGHT = 8,
PSH_DIR_HORIZONTAL = 4 | 8
#define PSH_DIR_HORIZONTAL 2
#define PSH_DIR_VERTICAL 1
#define PSH_DIR_COMPARE( d1, d2 ) ( (d1) == (d2) || (d1) == -(d2) )
#define PSH_DIR_IS_HORIZONTAL( d ) PSH_DIR_COMPARE( d, PSH_DIR_HORIZONTAL )
#define PSH_DIR_IS_VERTICAL( d ) PSH_DIR_COMPARE( d, PSH_DIR_VERTICAL )
} PSH_Dir;
/* the following bit-flags are computed once by the glyph */
@ -160,8 +156,8 @@ FT_BEGIN_HEADER
PSH_Contour contour;
FT_UInt flags;
FT_UInt flags2;
FT_Char dir_in;
FT_Char dir_out;
PSH_Dir dir_in;
PSH_Dir dir_out;
PSH_Hint hint;
FT_Pos org_u;
FT_Pos org_v;