diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-28 15:32:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-28 22:16:29 +0200 |
| commit | 290a954a355852a967a0e7e8a28447b0b9d2a46b (patch) | |
| tree | f5cec9ab8cab6da0532ae8365392046ee8ba7f74 /canvas/source | |
| parent | 0cb17267174ae02c9fb19bf6d9f2637844a267ee (diff) | |
tdf#116646 Slideshows with transitions page swap rendering issues
regression from
commit 5b75a1697250d8b2b6003c37067f39270a5ad828
move cairo extract bitmap code from canvas to vcl
Change-Id: Ic8d7cd9d54010ae272073877da18a985e931e22a
Reviewed-on: https://gerrit.libreoffice.org/52005
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 2ed3d0472c04..ec76b51bacb5 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -363,10 +363,10 @@ namespace cairocanvas if( !pSurface ) { - vcl::bitmap::CanvasCairoExtractBitmapData(aBmpEx, aBitmap, data, bHasAlpha); + long nWidth; + long nHeight; + vcl::bitmap::CanvasCairoExtractBitmapData(aBmpEx, aBitmap, data, bHasAlpha, nWidth, nHeight); - const long nWidth = aBmpEx.GetPrefSize().Width(); - const long nHeight = aBmpEx.GetPrefSize().Height(); SurfaceSharedPtr pImageSurface = rSurfaceProvider->getOutputDevice()->CreateSurface( CairoSurfaceSharedPtr( cairo_image_surface_create_for_data( |