summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-02-29 20:57:29 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-02-29 20:57:29 +0000
commit3d34f7083cf5c4a83c946a55424cf7eae79b2e85 (patch)
treeb3350d8a36e08a5af690ffb9621f342915594c26
parent25c8ec71bed7f5daa42b17220e0bf00a1ef1e3bc (diff)
downloadpango-3d34f7083cf5c4a83c946a55424cf7eae79b2e85.tar.gz
Fix up off-by-one for right bound when drawing PANGO_UNDERLINE_ERROR.
Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com> * pango/pangowin32.c pango/pangox.c pango/pangoft2.c: Fix up off-by-one for right bound when drawing PANGO_UNDERLINE_ERROR.
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-46
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/pangoft2.c2
-rw-r--r--pango/pangowin32.c2
-rw-r--r--pango/pangox.c2
8 files changed, 33 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 49af948f..f3273749 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangowin32.c pango/pangox.c pango/pangoft2.c:
+ Fix up off-by-one for right bound when drawing
+ PANGO_UNDERLINE_ERROR.
+
Sun Feb 29 15:31:09 2004 Owen Taylor <otaylor@redhat.com>
Patch from Nicolas Setton, #114237
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 49af948f..f3273749 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangowin32.c pango/pangox.c pango/pangoft2.c:
+ Fix up off-by-one for right bound when drawing
+ PANGO_UNDERLINE_ERROR.
+
Sun Feb 29 15:31:09 2004 Owen Taylor <otaylor@redhat.com>
Patch from Nicolas Setton, #114237
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 49af948f..f3273749 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangowin32.c pango/pangox.c pango/pangoft2.c:
+ Fix up off-by-one for right bound when drawing
+ PANGO_UNDERLINE_ERROR.
+
Sun Feb 29 15:31:09 2004 Owen Taylor <otaylor@redhat.com>
Patch from Nicolas Setton, #114237
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 49af948f..f3273749 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangowin32.c pango/pangox.c pango/pangoft2.c:
+ Fix up off-by-one for right bound when drawing
+ PANGO_UNDERLINE_ERROR.
+
Sun Feb 29 15:31:09 2004 Owen Taylor <otaylor@redhat.com>
Patch from Nicolas Setton, #114237
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 49af948f..f3273749 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Sun Feb 29 15:54:51 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangowin32.c pango/pangox.c pango/pangoft2.c:
+ Fix up off-by-one for right bound when drawing
+ PANGO_UNDERLINE_ERROR.
+
Sun Feb 29 15:31:09 2004 Owen Taylor <otaylor@redhat.com>
Patch from Nicolas Setton, #114237
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index a6706c76..4693a9f3 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -814,7 +814,7 @@ pango_ft2_render_layout_line (FT_Bitmap *bitmap,
int end_x = x + PANGO_PIXELS (x_off + ink_rect.x + ink_rect.width);
for (point_x = x + PANGO_PIXELS (x_off + ink_rect.x) - 1;
- point_x < end_x;
+ point_x <= end_x;
point_x += 2)
{
if (counter)
diff --git a/pango/pangowin32.c b/pango/pangowin32.c
index d143aef9..1a7f3f5c 100644
--- a/pango/pangowin32.c
+++ b/pango/pangowin32.c
@@ -808,7 +808,7 @@ pango_win32_render_layout_line (HDC hdc,
int end_x = x + PANGO_PIXELS (x_off + ink_rect.x + ink_rect.width);
for (point_x = x + PANGO_PIXELS (x_off + ink_rect.x) - 1;
- point_x < end_x;
+ point_x <= end_x;
point_x += 2)
{
points[0].x = point_x;
diff --git a/pango/pangox.c b/pango/pangox.c
index f0708ffa..7f0dcd98 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -1507,7 +1507,7 @@ pango_x_render_layout_line (Display *display,
int end_x = x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE;
for (point_x = x + PANGO_PIXELS (x_off + ink_rect.x) - 1;
- point_x < end_x;
+ point_x <= end_x;
point_x += 2)
{
if (counter)