Fix sign of metrics->descent.

Sun Aug  3 18:37:46 2003  Owen Taylor  <otaylor@redhat.com>

        * pango/pangofc-font.c (get_face_metrics): Fix sign
        of metrics->descent.

        * pango/pango-engine-private.h: fix include (Noah Levitt)

7 files changed, 38 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3460b941..16fc01c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Aug  3 18:37:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangofc-font.c (get_face_metrics): Fix sign 
+	of metrics->descent.
+
+	* pango/pango-engine-private.h: fix include (Noah Levitt)
+
 Sat Aug  2 23:19:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-engine.[ch] modules/*/*-{fc,win32,x}.c
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3460b941..16fc01c0 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Sun Aug  3 18:37:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangofc-font.c (get_face_metrics): Fix sign 
+	of metrics->descent.
+
+	* pango/pango-engine-private.h: fix include (Noah Levitt)
+
 Sat Aug  2 23:19:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-engine.[ch] modules/*/*-{fc,win32,x}.c
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 3460b941..16fc01c0 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Sun Aug  3 18:37:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangofc-font.c (get_face_metrics): Fix sign 
+	of metrics->descent.
+
+	* pango/pango-engine-private.h: fix include (Noah Levitt)
+
 Sat Aug  2 23:19:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-engine.[ch] modules/*/*-{fc,win32,x}.c
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 3460b941..16fc01c0 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Sun Aug  3 18:37:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangofc-font.c (get_face_metrics): Fix sign 
+	of metrics->descent.
+
+	* pango/pango-engine-private.h: fix include (Noah Levitt)
+
 Sat Aug  2 23:19:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-engine.[ch] modules/*/*-{fc,win32,x}.c
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 3460b941..16fc01c0 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Sun Aug  3 18:37:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangofc-font.c (get_face_metrics): Fix sign 
+	of metrics->descent.
+
+	* pango/pango-engine-private.h: fix include (Noah Levitt)
+
 Sat Aug  2 23:19:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-engine.[ch] modules/*/*-{fc,win32,x}.c
diff --git a/pango/pango-engine-private.h b/pango/pango-engine-private.h
index 28c0a7de..2e4a3573 100644
--- a/pango/pango-engine-private.h
+++ b/pango/pango-engine-private.h
@@ -23,7 +23,7 @@
 #ifndef __PANGO_ENGINE_PRIVATE_H__
 #define __PANGO_ENGINE_PRIVATE_H__
 
-#include <pango-engine-private.h>
+#include <pango-engine.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index bf218f73..02910615 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -244,7 +244,7 @@ get_face_metrics (PangoFcFont      *fcfont,
       vector.x = 0;
       vector.y = face->size->metrics.descender;
       FT_Vector_Transform (&vector, &ft_matrix);
-      metrics->descent = PANGO_UNITS_26_6 (vector.y);
+      metrics->descent = - PANGO_UNITS_26_6 (vector.y);
       
       vector.x = 0;
       vector.y = face->size->metrics.ascender;
@@ -253,7 +253,7 @@ get_face_metrics (PangoFcFont      *fcfont,
     }
   else
     {
-      metrics->descent = PANGO_UNITS_26_6 (face->size->metrics.descender);
+      metrics->descent = - PANGO_UNITS_26_6 (face->size->metrics.descender);
       metrics->ascent = PANGO_UNITS_26_6 (face->size->metrics.ascender);
     }