[Libreoffice-commits] core.git: vcl/source

[Noel Grandin]

 vcl/source/bitmap/BitmapTools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit db22599c8c5a4a8b553194c05fff65bd6d71ab40
Author: Noel Grandin <noelgrandin at gmail.com>
Date:   Sat Mar 24 14:41:15 2018 +0200

    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 at yahoo.fr>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

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 )