Commit f26d57753fe1a6ab61796fbd816fefd6c103720b
2018-09-21T20:34:58
* src/base/ftobjs.c (ft_glyphslot_reset_bimap): Further tweak.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
diff --git a/ChangeLog b/ChangeLog
index 584f860..c39f08f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-20 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ * src/base/ftobjs.c (ft_glyphslot_reset_bimap): Further tweak.
+
2018-09-21 Ben Wagner <bungeman@google.com>
Improve auto-hinter handling of bitmap fonts (#54681).
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 34aedbf..874a3a1 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -395,15 +395,18 @@
/* undocumented but confirmed: bbox values get rounded; */
/* for narrow glyphs bbox is extended to one pixel first */
- if ( pbox.xMax - pbox.xMin <= 1 )
+ switch ( pbox.xMax - pbox.xMin )
{
- if ( pbox.xMax - pbox.xMin == 0 )
+ case 1:
+ pbox.xMax -= 1;
+ cbox.xMax += 64;
+ /* fall through */
+ case 0:
+ if ( cbox.xMax - cbox.xMin < 63 )
{
- cbox.xMin = ( cbox.xMin + cbox.xMax ) / 2 - 32;
- cbox.xMax = cbox.xMin + 64;
+ cbox.xMin = ( cbox.xMin + cbox.xMax ) / 2 - 31;
+ cbox.xMax = cbox.xMin + 63;
}
- else if ( cbox.xMax - cbox.xMin < 0 )
- cbox.xMin = cbox.xMax = ( cbox.xMin + cbox.xMax ) / 2;
}
/* we do asymmetric rounding so that the center */
@@ -414,15 +417,18 @@
/* y */
- if ( pbox.yMax - pbox.yMin <= 1 )
+ switch ( pbox.yMax - pbox.yMin )
{
- if ( pbox.yMax - pbox.yMin == 0 )
+ case 1:
+ pbox.yMax -= 1;
+ cbox.yMax += 64;
+ /* fall through */
+ case 0:
+ if ( cbox.yMax - cbox.yMin < 63 )
{
- cbox.yMin = ( cbox.yMin + cbox.yMax ) / 2 - 32;
- cbox.yMax = cbox.yMin + 64;
+ cbox.yMin = ( cbox.yMin + cbox.yMax ) / 2 - 31;
+ cbox.yMax = cbox.yMin + 63;
}
- else if ( cbox.yMax - cbox.yMin < 0 )
- cbox.yMin = cbox.yMax = ( cbox.yMin + cbox.yMax ) / 2;
}
pbox.yMin += ( cbox.yMin + 31 ) >> 6;