diff options
| author | Uli Schlachter <psychon@znc.in> | 2011-11-15 19:46:46 +0100 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2011-11-15 19:46:46 +0100 |
| commit | 3a94f4c7091ea6262007e7960e4cd915e17b33c0 (patch) | |
| tree | e25a2108ba3b665650eff072b50d6363705be3de /src/cairo-xcb-shm.c | |
| parent | edc238b40fba2e0e10b09521d87775edbf6f7814 (diff) | |
| download | cairo-3a94f4c7091ea6262007e7960e4cd915e17b33c0.tar.gz | |
xcb: Fix xcb-huge-image-shm
The test failed with the following message:
cairo-surface.c:2265: _cairo_surface_create_in_error: Assertion `status <
CAIRO_STATUS_LAST_STATUS' failed.
_cairo_xcb_surface_create_shm_image() passed the error from
_cairo_xcb_connection_allocate_shm_info() to _create_in_error().
Fix this by never returning CAIRO_INT_STATUS_UNSUPPORTED from
_allocate_shm_info(). All other error cases in that function return
CAIRO_STATUS_NO_MEMORY, too.
Signed-off-by: Uli Schlachter <psychon@znc.in>
Diffstat (limited to 'src/cairo-xcb-shm.c')
| -rw-r--r-- | src/cairo-xcb-shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cairo-xcb-shm.c b/src/cairo-xcb-shm.c index 6972720b0..7eee83d91 100644 --- a/src/cairo-xcb-shm.c +++ b/src/cairo-xcb-shm.c @@ -577,7 +577,7 @@ _cairo_xcb_connection_allocate_shm_info (cairo_xcb_connection_t *connection, connection->flags &= ~CAIRO_XCB_HAS_SHM; free (pool); CAIRO_MUTEX_UNLOCK (connection->shm_mutex); - return CAIRO_INT_STATUS_UNSUPPORTED; + return _cairo_error (CAIRO_STATUS_NO_MEMORY); } pool->base = shmat (pool->shmid, NULL, 0); |