diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-17 11:56:17 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-18 05:05:59 +0000 |
| commit | 0826bf264c7308be1da045b79bdcc2cff8b7cb42 (patch) | |
| tree | 43e10a11f78119cbe407b8a94328534c9008eec9 /canvas | |
| parent | 15494c3dc504c693bd84a6217498f6bf17411855 (diff) | |
Resolves: rhbz#1086714 overlarge pixmap
(cherry picked from commit f31ac2405bbd0755fb14daa6cb84d7bb7d84c492)
Conflicts:
canvas/source/cairo/cairo_xlib_cairo.cxx
vcl/unx/x11/xlimits.cxx
Change-Id: I015308406a43e6b039059a5e35316d59745d0a48
Reviewed-on: https://gerrit.libreoffice.org/9083
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvasbitmap.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_xlib_cairo.cxx | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 277c1333f4c9..d243596be1a9 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -158,7 +158,7 @@ namespace cairocanvas pPixels = cairo_image_surface_create( CAIRO_FORMAT_ARGB32, aSize.Width(), aSize.Height() ); cairo_t *pCairo = cairo_create( pPixels ); - if( !pPixels || !pCairo ) + if( !pPixels || !pCairo || cairo_status(pCairo) != CAIRO_STATUS_SUCCESS ) break; // suck ourselves from the X server to this buffer so then we can fiddle with diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx index bae6943a47bc..e5bb189e54f5 100644 --- a/canvas/source/cairo/cairo_xlib_cairo.cxx +++ b/canvas/source/cairo/cairo_xlib_cairo.cxx @@ -36,11 +36,12 @@ namespace Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int width, unsigned int height, unsigned int depth) { // The X protocol request CreatePixmap puts an upper bound - // of 16 bit to the size. - // - // see, e.g. moz#424333, fdo#48961 + // of 16 bit to the size. And in practice some drivers + // fall over with values close to the max. + + // see, e.g. moz#424333, fdo#48961, rhbz#1086714 // we've a duplicate of this in vcl :-( - if (width > SAL_MAX_INT16 || height > SAL_MAX_INT16) + if (width > SAL_MAX_INT16-10 || height > SAL_MAX_INT16-10) { SAL_WARN("canvas", "overlarge pixmap: " << width << " x " << height); return None; |