font pixel size is always non-negative

3 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b3ce132e..258e4d96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2003-08-28  Keith Packard <keithp@keithp.com
+	* src/cairo_font.c: font pixel size is always non-negative
+
 2003-08-26  Carl Worth  <cworth@isi.edu>
 
 	* src/cairoint.h: Added missing underscores to several internal
diff --git a/src/cairo-font.c b/src/cairo-font.c
index 3b03c95c..e0c89722 100644
--- a/src/cairo-font.c
+++ b/src/cairo-font.c
@@ -143,7 +143,7 @@ _cairo_font_resolve_xft_font (cairo_font_t *font, cairo_gstate_t *gstate, XftFon
        X/Y scaling. Is there anything different we would want to do
        for non-uniform X/Y scaling? */
     _cairo_matrix_compute_determinant (&matrix, &expansion);
-    font_size = sqrt (expansion);
+    font_size = sqrt (abs(expansion));
     FcPatternAddDouble (pattern, "pixelsize", font_size);
     cairo_matrix_scale (&matrix, 1.0 / font_size, 1.0 / font_size);
 
diff --git a/src/cairo_font.c b/src/cairo_font.c
index 3b03c95c..e0c89722 100644
--- a/src/cairo_font.c
+++ b/src/cairo_font.c
@@ -143,7 +143,7 @@ _cairo_font_resolve_xft_font (cairo_font_t *font, cairo_gstate_t *gstate, XftFon
        X/Y scaling. Is there anything different we would want to do
        for non-uniform X/Y scaling? */
     _cairo_matrix_compute_determinant (&matrix, &expansion);
-    font_size = sqrt (expansion);
+    font_size = sqrt (abs(expansion));
     FcPatternAddDouble (pattern, "pixelsize", font_size);
     cairo_matrix_scale (&matrix, 1.0 / font_size, 1.0 / font_size);