summaryrefslogtreecommitdiff
path: root/pixman
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2005-08-22 12:15:28 +0000
committerOwen Taylor <otaylor@redhat.com>2005-08-22 12:15:28 +0000
commit2ea856a21d2d392c0959e726c430e7fed87be97c (patch)
tree806b0dbf037dae100ffd18354d3c3d75c69df611 /pixman
parent31e4ade4abf716718c2f38e594f02b5b488e0d86 (diff)
When width/height are 0, copy the src to the dest, don't just return. (#3017)
Diffstat (limited to 'pixman')
-rw-r--r--pixman/ChangeLog5
-rw-r--r--pixman/src/pixregion.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/pixman/ChangeLog b/pixman/ChangeLog
index b942ce83..0e9f9684 100644
--- a/pixman/ChangeLog
+++ b/pixman/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-22 Owen Taylor <otaylor@redhat.com>
+
+ * src/pixregion.c (pixman_region_union_rect): When width/height
+ are 0, copy the src to the dest, don't just return. (#3017)
+
2005-08-21 Billy Biggs <vektor@dumbterm.net>
* src/pixman-remap.h: Fix a typo in the last change.
diff --git a/pixman/src/pixregion.c b/pixman/src/pixregion.c
index 37505d99..9c122f53 100644
--- a/pixman/src/pixregion.c
+++ b/pixman/src/pixregion.c
@@ -1156,7 +1156,7 @@ pixman_region_union_rect(pixman_region16_t *dest, pixman_region16_t *source,
pixman_region16_t region;
if (!width || !height)
- return PIXMAN_REGION_STATUS_SUCCESS;
+ return pixman_region_copy (dest, source);
region.data = NULL;
region.extents.x1 = x;
region.extents.y1 = y;