Allow NULL run_logical. (#63014, Tony Graham)

Thu Oct 25 11:05:01 2001  Owen Taylor  <otaylor@redhat.com>

	* pango/pango-layout.c (pango_layout_run_get_extents): Allow
	NULL run_logical. (#63014, Tony Graham)

8 files changed, 44 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index b7882fc8..c972ae23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 25 11:05:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): Allow
+	NULL run_logical. (#63014, Tony Graham)
+
 Thu Oct 18 15:48:14 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.h: Remove the rest of the 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index b7882fc8..c972ae23 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+Thu Oct 25 11:05:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): Allow
+	NULL run_logical. (#63014, Tony Graham)
+
 Thu Oct 18 15:48:14 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.h: Remove the rest of the 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index b7882fc8..c972ae23 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Thu Oct 25 11:05:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): Allow
+	NULL run_logical. (#63014, Tony Graham)
+
 Thu Oct 18 15:48:14 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.h: Remove the rest of the 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index b7882fc8..c972ae23 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+Thu Oct 25 11:05:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): Allow
+	NULL run_logical. (#63014, Tony Graham)
+
 Thu Oct 18 15:48:14 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.h: Remove the rest of the 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index b7882fc8..c972ae23 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Thu Oct 25 11:05:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): Allow
+	NULL run_logical. (#63014, Tony Graham)
+
 Thu Oct 18 15:48:14 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.h: Remove the rest of the 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index b7882fc8..c972ae23 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Thu Oct 25 11:05:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): Allow
+	NULL run_logical. (#63014, Tony Graham)
+
 Thu Oct 18 15:48:14 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.h: Remove the rest of the 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index b7882fc8..c972ae23 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Thu Oct 25 11:05:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_run_get_extents): Allow
+	NULL run_logical. (#63014, Tony Graham)
+
 Thu Oct 18 15:48:14 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-utils.h: Remove the rest of the 
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index b82fe902..b4ffa982 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3417,20 +3417,23 @@ pango_layout_run_get_extents (PangoLayoutRun *run,
     case PANGO_UNDERLINE_SINGLE:
       if (run_ink)
         run_ink->height = MAX (run_ink->height, 2 * PANGO_SCALE - run_ink->y);
-      run_logical->height = MAX (run_logical->height, 2 * PANGO_SCALE - run_logical->y);
+      if (run_logical)
+	run_logical->height = MAX (run_logical->height, 2 * PANGO_SCALE - run_logical->y);
       break;
     case PANGO_UNDERLINE_DOUBLE:
       if (run_ink)
         run_ink->height = MAX (run_ink->height, 4 * PANGO_SCALE - run_ink->y);
-      run_logical->height = MAX (run_logical->height, 4 * PANGO_SCALE - run_logical->y);
+      if (run_logical)
+	run_logical->height = MAX (run_logical->height, 4 * PANGO_SCALE - run_logical->y);
       break;
     case PANGO_UNDERLINE_LOW:
       /* FIXME: Should this simply be run_logical->height += 2 * PANGO_SCALE instead?
        */
       if (run_ink)
 	run_ink->height += 2 * PANGO_SCALE;
-      run_logical->height = MAX (run_logical->height,
-				 tmp_ink.y + tmp_ink.height + 2 * PANGO_SCALE - run_logical->y);
+      if (run_logical)
+	run_logical->height = MAX (run_logical->height,
+				   tmp_ink.y + tmp_ink.height + 2 * PANGO_SCALE - run_logical->y);
       break;
     }
 
@@ -3439,7 +3442,8 @@ pango_layout_run_get_extents (PangoLayoutRun *run,
       if (run_ink)
         run_ink->y -= rise;
 
-      run_logical->y -= rise;
+      if (run_logical)
+	run_logical->y -= rise;
     }
 }