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

[truetype] Fix Savannah bug #38211. 

* src/truetype/ttinterp.c (Ins_IP): Make FreeType behave identical
to other interpreters if rp1 == rp2 (which is invalid).
This commit is contained in:
Werner Lemberg 2013-02-01 12:55:44 +01:00
parent fba917d0e7
commit 4063320528
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2013-02-01 Werner Lemberg <wl@gnu.org>
[truetype] Fix Savannah bug #38211.
* src/truetype/ttinterp.c (Ins_IP): Make FreeType behave identical
to other interpreters if rp1 == rp2 (which is invalid).
2013-01-28 Alexei Podtelezhnikov <apodtele@gmail.com>
[base] Small optimization of BBox calculation.

15
src/truetype/ttinterp.c
View File

@ -6974,9 +6974,18 @@
cur_dist = CUR_Func_project ( &CUR.zp2.cur[point], cur_base );
if ( org_dist )
new_dist = ( old_range != 0 )
? FT_MulDiv( org_dist, cur_range, old_range )
: cur_dist;
{
if ( old_range )
new_dist = FT_MulDiv( org_dist, cur_range, old_range );
else
{
/* use the middle position */
new_dist = cur_dist -
CUR_fast_dualproj( &CUR.zp2.cur[point] ) +
( CUR_fast_dualproj( &CUR.zp1.cur[CUR.GS.rp1] ) +
CUR_fast_dualproj( &CUR.zp1.cur[CUR.GS.rp2] ) ) / 2;
}
}
else
new_dist = 0;