diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-06 21:06:15 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-07 14:49:48 +0100 |
commit | 7efd71616ec5efedbe626a986a707c35d3cac323 (patch) | |
tree | 0223e8271d9d18763efd743f43f98b8b8b9e5c2e /gfx/cairo/zero-sized.patch | |
parent | bbc2206a0fda053a6f5071b457bd209dab9ed268 (diff) | |
download | UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.gz UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.lz UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.xz UXP-7efd71616ec5efedbe626a986a707c35d3cac323.zip |
Issue #1274 - Part 1: Adopt the cairo version as our own.
- Move header licensing from tri-license to MPL 2.0. MPL-compatible
other licensing has been retained where originally present.
- Remove individual superseded licensing terms.
- Remove patches, outdated readmes & incomplete patch summaries.
- Remove incomplete cairo release notes (only went up to 1.6.4 anyway).
- Rewrite COPYING to indicate the current state of the library in tree.
Diffstat (limited to 'gfx/cairo/zero-sized.patch')
-rw-r--r-- | gfx/cairo/zero-sized.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/gfx/cairo/zero-sized.patch b/gfx/cairo/zero-sized.patch deleted file mode 100644 index bdd6ca798..000000000 --- a/gfx/cairo/zero-sized.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c -index e9e544d..cde68a1 100644 ---- a/src/cairo-image-surface.c -+++ b/src/cairo-image-surface.c -@@ -324,8 +324,8 @@ _cairo_image_surface_create_with_pixman_format (unsigned char *data, - cairo_surface_t *surface; - pixman_image_t *pixman_image; - -- pixman_image = pixman_image_create_bits (pixman_format, width, height, -- (uint32_t *) data, stride); -+ pixman_image = pixman_image_create_bits (pixman_format, width ? width : 1, height ? height : 1, -+ (uint32_t *) data, stride ? stride : 4); - - if (unlikely (pixman_image == NULL)) - return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY)); -diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c -index f86a133..ddcb600 100644 ---- a/src/cairo-xlib-surface.c -+++ b/src/cairo-xlib-surface.c -@@ -675,7 +675,8 @@ _get_image_surface (cairo_xlib_surface_t *surface, - - pixmap = XCreatePixmap (surface->dpy, - surface->drawable, -- extents.width, extents.height, -+ extents.width <= 0 ? 1 : extents.width, -+ extents.height <= 0 ? 1 : extents.height, - surface->depth); - if (pixmap) { - XCopyArea (surface->dpy, surface->drawable, pixmap, surface->gc, -@@ -686,7 +687,8 @@ _get_image_surface (cairo_xlib_surface_t *surface, - ximage = XGetImage (surface->dpy, - pixmap, - 0, 0, -- extents.width, extents.height, -+ extents.width <= 0 ? 1 : extents.width, -+ extents.height <= 0 ? 1 : extents.height, - AllPlanes, ZPixmap); - - XFreePixmap (surface->dpy, pixmap); |