Remove bogus MIN when rendering freetype text. Also draw full underlines.

2001-02-05  Alexander Larsson  <alexl@redhat.com>

	* pango/pangoft2.c (pango_ft2_render,
	pango_ft2_render_layout_line): Remove bogus MIN when rendering
	freetype text. Also draw full underlines.

8 files changed, 46 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index b3b14aa8..188ea887 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-05  Alexander Larsson  <alexl@redhat.com>
+
+	* pango/pangoft2.c (pango_ft2_render,
+	pango_ft2_render_layout_line): Remove bogus MIN when rendering
+	freetype text. Also draw full underlines.
+
 Sun Feb  4 07:48:47 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-attributes.c (pango_color_get_type): pass 0 as
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index b3b14aa8..188ea887 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,9 @@
+2001-02-05  Alexander Larsson  <alexl@redhat.com>
+
+	* pango/pangoft2.c (pango_ft2_render,
+	pango_ft2_render_layout_line): Remove bogus MIN when rendering
+	freetype text. Also draw full underlines.
+
 Sun Feb  4 07:48:47 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-attributes.c (pango_color_get_type): pass 0 as
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index b3b14aa8..188ea887 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+2001-02-05  Alexander Larsson  <alexl@redhat.com>
+
+	* pango/pangoft2.c (pango_ft2_render,
+	pango_ft2_render_layout_line): Remove bogus MIN when rendering
+	freetype text. Also draw full underlines.
+
 Sun Feb  4 07:48:47 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-attributes.c (pango_color_get_type): pass 0 as
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index b3b14aa8..188ea887 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+2001-02-05  Alexander Larsson  <alexl@redhat.com>
+
+	* pango/pangoft2.c (pango_ft2_render,
+	pango_ft2_render_layout_line): Remove bogus MIN when rendering
+	freetype text. Also draw full underlines.
+
 Sun Feb  4 07:48:47 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-attributes.c (pango_color_get_type): pass 0 as
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index b3b14aa8..188ea887 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+2001-02-05  Alexander Larsson  <alexl@redhat.com>
+
+	* pango/pangoft2.c (pango_ft2_render,
+	pango_ft2_render_layout_line): Remove bogus MIN when rendering
+	freetype text. Also draw full underlines.
+
 Sun Feb  4 07:48:47 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-attributes.c (pango_color_get_type): pass 0 as
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index b3b14aa8..188ea887 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+2001-02-05  Alexander Larsson  <alexl@redhat.com>
+
+	* pango/pangoft2.c (pango_ft2_render,
+	pango_ft2_render_layout_line): Remove bogus MIN when rendering
+	freetype text. Also draw full underlines.
+
 Sun Feb  4 07:48:47 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-attributes.c (pango_color_get_type): pass 0 as
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index b3b14aa8..188ea887 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+2001-02-05  Alexander Larsson  <alexl@redhat.com>
+
+	* pango/pangoft2.c (pango_ft2_render,
+	pango_ft2_render_layout_line): Remove bogus MIN when rendering
+	freetype text. Also draw full underlines.
+
 Sun Feb  4 07:48:47 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-attributes.c (pango_color_get_type): pass 0 as
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index f74a55fb..4268c24c 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -357,7 +357,7 @@ pango_ft2_render (FT_Bitmap        *bitmap,
 		    q = face->glyph->bitmap.buffer + iy*face->glyph->bitmap.pitch;
 		    for (ix = x_start; ix < x_limit; ix++)
 		      {
-			*p = MIN (*p, 0xFF - *q);
+			*p = *q;
 			q++;
 			p++;
 		      }
@@ -973,27 +973,22 @@ pango_ft2_render_layout_line (FT_Bitmap       *bitmap,
 	    (y + 4) * bitmap->pitch +
 	    x + PANGO_PIXELS (x_off + ink_rect.x) - 1;
 
-	  /* Don't drawn the underline through descenders */
 	  for (ix = 0; ix < x_limit; ix++)
-	    if (*p == 0xFF &&
-		(ix == x_limit - 1 || p[1] == 0xFF))
-	      *p++ = 0;
+	      *p++ = 0xff;
 	  /* Fall through */
 	case PANGO_UNDERLINE_SINGLE:
 	  p = bitmap->buffer +
 	    (y + 2) * bitmap->pitch +
 	    x + PANGO_PIXELS (x_off + ink_rect.x) - 1;
 	  for (ix = 0; ix < x_limit; ix++)
-	    if (*p == 0xFF &&
-		(ix == x_limit - 1 || p[1] == 0xFF))
-	      *p++ = 0;
+	      *p++ = 0xff;
 	  break;
 	case PANGO_UNDERLINE_LOW:
 	  p = bitmap->buffer +
 	    (y + PANGO_PIXELS (ink_rect.y + ink_rect.height)) * bitmap->pitch +
 	    x + PANGO_PIXELS (x_off + ink_rect.x) - 1;
 	  for (ix = 0; ix < PANGO_PIXELS (ink_rect.width); ix++)
-	    *p++ = 0;
+	    *p++ = 0xff;
 	  break;
 	}