summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2018-03-24 14:41:15 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-03-25 12:48:02 +0200
commitdb22599c8c5a4a8b553194c05fff65bd6d71ab40 (patch)
treeba118334f6ab2e11a53b4364a3408336d8f4f168
parent9c7f19a6a38eb6796df6216ff3f014db30dd635a (diff)
tdf#116509 OpenGL: Slideshows with Transitions crashing Impress
regression from commit e5012e53b919ae4921d6d35660bde323a6f28417 use scanline when reading pixel data Change-Id: I1980a1acfedadbea706b93aed7452790e03257f2 Reviewed-on: https://gerrit.libreoffice.org/51803 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--vcl/source/bitmap/BitmapTools.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 7a722a699043..cfc4734c8aa0 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -963,9 +963,9 @@ void CanvasCairoExtractBitmapData( BitmapEx & aBmpEx, Bitmap & aBitmap, unsigned
y<aBmpSize.Height() && y<rect.Y2;
++y )
{
- Scanline pScanlineReadAlpha = pAlphaReadAccess->GetScanline( y );
if( pAlphaReadAccess.get() != nullptr )
{
+ Scanline pScanlineReadAlpha = pAlphaReadAccess->GetScanline( y );
for( long x=rect.X1;
x<aBmpSize.Width() && x<rect.X2;
++x )