minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* src/cff/cf2font.c (cf2_computeDarkening): Avoid division by zero.

This commit is contained in:
Dave Arnold 2013-10-03 23:04:29 +02:00 committed by Werner Lemberg
parent 1a39944fa0
commit e845a85ea5
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-10-03 Dave Arnold <darnold@adobe.com>
* src/cff/cf2font.c (cf2_computeDarkening): Avoid division by zero.
2013-10-02 Darrell Bellert <darrell.bellert@hl.konicaminolta.us>
* src/sfnt/ttload.c (tt_face_load_pclt): Fix `pclt_fields'.

14
src/cff/cf2font.c
View File

@ -98,9 +98,15 @@
*/
/* Internal calculations are done in units per thousand for */
/* convenience. */
/* convenience. The x axis is scaled stem width in */
/* thousandths of a pixel. That is, 1000 is 1 pixel. */
/* The y axis is darkening amount in thousandths of a pixel.*/
/* In the code, below, dividing by ppem and */
/* adjusting for emRatio converts darkenAmount to character */
/* space (font units). */
CF2_Fixed stemWidthPer1000, scaledStem;
*darkenAmount = 0;
if ( boldenAmount == 0 && !stemDarkened )
@ -158,7 +164,7 @@
FT_DivFix( cf2_intToFixed( x1 ), ppem );
if ( !ydelta )
if ( !xdelta )
goto Try_x3;
*darkenAmount = FT_MulFix( x, FT_DivFix( ydelta, xdelta ) ) +
@ -175,7 +181,7 @@
FT_DivFix( cf2_intToFixed( x2 ), ppem );
if ( !ydelta )
if ( !xdelta )
goto Try_x4;
*darkenAmount = FT_MulFix( x, FT_DivFix( ydelta, xdelta ) ) +
@ -193,7 +199,7 @@
FT_DivFix( cf2_intToFixed( x3 ), ppem );
if ( !ydelta )
if ( !xdelta )
goto Use_y4;
*darkenAmount = FT_MulFix( x, FT_DivFix( ydelta, xdelta ) ) +