rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[sdf] Fix sdf computation while `USE_SQUARED_DISTANCES`. 

Function `map_fixed_to_sdf` expect spread to be absolute
and not squared.

* src/sdf/ftbsdf.c (finalize_sdf): Pass absolute spread
while `map_fixed_to_sdf`.

* src/sdf/ftsdf.c (sdf_generate_bounding_box): Ditto.
This commit is contained in:
Anuj Verma 2022-01-27 15:23:47 +05:30
parent 3d77756e73
commit a75690c855
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sdf/ftbsdf.c
View File

@ -1096,7 +1096,7 @@
FT_Int i, j;
FT_SDFFormat* t_buffer;
FT_16D16 spread;
FT_16D16 sp_sq, spread;
if ( !worker || !target )
@ -1116,11 +1116,13 @@
goto Exit;
}
#if USE_SQUARED_DISTANCES
spread = FT_INT_16D16( worker->params.spread *
worker->params.spread );
#else
spread = FT_INT_16D16( worker->params.spread );
#if USE_SQUARED_DISTANCES
sp_sq = FT_INT_16D16( worker->params.spread *
worker->params.spread );
#else
sp_sq = FT_INT_16D16( worker->params.spread );
#endif
for ( j = 0; j < r; j++ )
@ -1136,8 +1138,8 @@
index = j * w + i;
dist = worker->distance_map[index].dist;
if ( dist < 0 || dist > spread )
dist = spread;
if ( dist < 0 || dist > sp_sq )
dist = sp_sq;
#if USE_SQUARED_DISTANCES
dist = square_root( dist );

2
src/sdf/ftsdf.c
View File

@ -3242,7 +3242,7 @@
buffer = (FT_SDFFormat*)bitmap->buffer;
if ( USE_SQUARED_DISTANCES )
sp_sq = fixed_spread * fixed_spread;
sp_sq = FT_INT_16D16( spread * spread );
else
sp_sq = fixed_spread;