diff options
| author | Uli Schlachter <psychon@znc.in> | 2021-05-05 14:48:20 +0000 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2021-05-05 14:48:20 +0000 |
| commit | 929262dd54ffae81721ffe9b2c59faa7b045c663 (patch) | |
| tree | fb15830f7a4dd2947c4f064b3cb113c5add20eb4 | |
| parent | 4f61b765c9f657fd755194afe576e56f945af4b6 (diff) | |
| parent | ac23567a0cf5562bd7547030cd849d8d302da919 (diff) | |
Merge branch 'jfkthame-master-patch-60882' into 'master'
Bail early from _cairo_image_compute_color if image is zero-sized.
See merge request cairo/cairo!177
| -rw-r--r-- | src/cairo-image-surface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c index 0e17f3a16..3b11eb981 100644 --- a/src/cairo-image-surface.c +++ b/src/cairo-image-surface.c @@ -1243,6 +1243,9 @@ _cairo_image_compute_color (cairo_image_surface_t *image) int x, y; cairo_image_color_t color; + if (image->width == 0 || image->height == 0) + return CAIRO_IMAGE_IS_MONOCHROME; + if (image->format == CAIRO_FORMAT_A1) return CAIRO_IMAGE_IS_MONOCHROME; |