--- cairo-1.3.14.orig/src/cairo-ft-font.c	2007-02-14 07:45:38.000000000 +0000
+++ cairo-1.3.14/src/cairo-ft-font.c	2007-02-22 17:37:54.000000000 +0000
@@ -1897,7 +1897,10 @@
 		fs_metrics.x_bearing = DOUBLE_FROM_26_6 (metrics->horiBearingX) * x_factor;
 		fs_metrics.y_bearing = DOUBLE_FROM_26_6 (-metrics->horiBearingY) * y_factor;
 		
-		fs_metrics.x_advance = DOUBLE_FROM_26_6 (metrics->horiAdvance) * x_factor;
+		if (load_flags & FT_LOAD_NO_HINTING)
+		  fs_metrics.x_advance = DOUBLE_FROM_16_16 (glyph->linearHoriAdvance) * x_factor;
+		else
+		  fs_metrics.x_advance = DOUBLE_FROM_26_6 (metrics->horiAdvance) * x_factor;
 		fs_metrics.y_advance = 0 * y_factor;
 	    } else {
 		fs_metrics.x_bearing = DOUBLE_FROM_26_6 (metrics->vertBearingX) * x_factor;
