2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5c2501800fe..99e0cde333c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-24  Jason Rumney  <jasonr@gnu.org>
+
+        * font.c (Ffont_face_attributes): Multiply pixel size before point
+        conversion to avoid multiplying rounding error.
+
 2008-06-23  Jason Rumney  <jasonr@gnu.org>
 
         * w32term.c (x_draw_glyph_string_background)
diff --git a/src/font.c b/src/font.c
index 4d8c9725844..e526394122b 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3800,7 +3800,7 @@ are to be displayed on.  If omitted, the selected frame is used.  */)
       Lisp_Object font_dpi = AREF (font, FONT_DPI_INDEX);
       int dpi = INTEGERP (font_dpi) ? XINT (font_dpi) : f->resy;
       plist[n++] = QCheight;
-      plist[n++] = make_number (10 * PIXEL_TO_POINT (XINT (val), dpi));
+      plist[n++] = make_number (PIXEL_TO_POINT (XINT (val) * 10, dpi));
     }
   else if (FLOATP (val))
     {