From: Kenichi Handa <handa@m17n.org>
Date: Mon, 21 Jul 2008 02:23:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-23.0.90~4046
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d90bfd1cec5961bb0a94108b4f97a17c3d0682b1;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a890f278c5d..93b10920f48 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-21  Kenichi Handa  <handa@m17n.org>
+
+	* ftfont.c (adjust_anchor): Check if DetalValue is not NULL.
+
 2008-07-20  Andreas Schwab  <schwab@suse.de>
 
 	* 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,
     }
   else if (anchor->AnchorFormat == 3)
     {
-      if (anchor->f.f2.XDeviceTable.offset)
+      if (anchor->f.f2.XDeviceTable.offset
+	  && anchor->f.f2.XDeviceTable.DeltaValue)
 	*x += DEVICE_DELTA (anchor->f.f2.XDeviceTable, x_ppem);
-      if (anchor->f.f2.YDeviceTable.offset)
+      if (anchor->f.f2.YDeviceTable.offset
+	  && anchor->f.f2.YDeviceTable.DeltaValue)
 	*y += DEVICE_DELTA (anchor->f.f2.YDeviceTable, y_ppem);
     }
 }