aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2008-07-21 02:23:57 +0000
committerKenichi Handa2008-07-21 02:23:57 +0000
commitd90bfd1cec5961bb0a94108b4f97a17c3d0682b1 (patch)
treea77dfe2a2177d610e3b316a4a8f4bc9386e047cd /src
parentdb8ef69909f99b430a098b217e50d179d8bd17c1 (diff)
downloademacs-d90bfd1cec5961bb0a94108b4f97a17c3d0682b1.tar.gz
emacs-d90bfd1cec5961bb0a94108b4f97a17c3d0682b1.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/ftfont.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a890f278c5d..93b10920f48 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-07-21 Kenichi Handa <handa@m17n.org>
2
3 * ftfont.c (adjust_anchor): Check if DetalValue is not NULL.
4
12008-07-20 Andreas Schwab <schwab@suse.de> 52008-07-20 Andreas Schwab <schwab@suse.de>
2 6
3 * syntax.c (find_start_pos, find_start_value) 7 * syntax.c (find_start_pos, find_start_value)
diff --git a/src/ftfont.c b/src/ftfont.c
index 131e4b8aed1..73d7ae48f5e 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1480,9 +1480,11 @@ adjust_anchor (FT_Face ft_face, OTF_Anchor *anchor,
1480 } 1480 }
1481 else if (anchor->AnchorFormat == 3) 1481 else if (anchor->AnchorFormat == 3)
1482 { 1482 {
1483 if (anchor->f.f2.XDeviceTable.offset) 1483 if (anchor->f.f2.XDeviceTable.offset
1484 && anchor->f.f2.XDeviceTable.DeltaValue)
1484 *x += DEVICE_DELTA (anchor->f.f2.XDeviceTable, x_ppem); 1485 *x += DEVICE_DELTA (anchor->f.f2.XDeviceTable, x_ppem);
1485 if (anchor->f.f2.YDeviceTable.offset) 1486 if (anchor->f.f2.YDeviceTable.offset
1487 && anchor->f.f2.YDeviceTable.DeltaValue)
1486 *y += DEVICE_DELTA (anchor->f.f2.YDeviceTable, y_ppem); 1488 *y += DEVICE_DELTA (anchor->f.f2.YDeviceTable, y_ppem);
1487 } 1489 }
1488} 1490}