summaryrefslogtreecommitdiff
path: root/src/mesa/main/image.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2008-12-19 16:56:56 -0700
committerBrian Paul <brianp@vmware.com>2008-12-19 16:56:56 -0700
commit58a82ee57f1e1e67387dd860ac253223db250789 (patch)
tree031ee528fc49bec03d767c8c697f40d15a9ed616 /src/mesa/main/image.c
parent9c8db8685432fedd068157795422764ce96b89a0 (diff)
parentf83f5ec8f5f1159cfd0ec2596ceab725c073266e (diff)
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/mesa/main/image.c')
-rw-r--r--src/mesa/main/image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index d3282d42e9..c205b4b766 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -5152,7 +5152,7 @@ _mesa_clip_to_region(GLint xmin, GLint ymin,
/* right clipping */
if (*x + *width > xmax)
- *width -= (*x + *width - xmax - 1);
+ *width -= (*x + *width - xmax);
if (*width <= 0)
return GL_FALSE;
@@ -5165,7 +5165,7 @@ _mesa_clip_to_region(GLint xmin, GLint ymin,
/* top (or bottom) clipping */
if (*y + *height > ymax)
- *height -= (*y + *height - ymax - 1);
+ *height -= (*y + *height - ymax);
if (*height <= 0)
return GL_FALSE;