Revert "fix canvas bitmap rendering (argb32 pixmaps) fixes color in n#780830"

This reverts commit 46e53913.

Conflicts:
	vcl/inc/salbmp.hxx
	vcl/source/gdi/gdimtf.cxx
	vcl/unx/generic/gdi/salgdi2.cxx

Change-Id: Ifa893b687c724ea71655aa4e084a44858695073e

vcl/inc/salbmp.hxx

@@ -47,7 +47,6 @@ public:
     virtual bool            Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
                                     Size& rSize,
                                     bool bMask = false ) = 0;
-    virtual bool            HasAlpha() const { return false; }
     virtual void            Destroy() = 0;
     virtual Size            GetSize() const = 0;
     virtual sal_uInt16      GetBitCount() const = 0;

vcl/inc/unx/salbmp.h

@@ -75,7 +75,6 @@ private:
     BitmapBuffer*   mpDIB;
     ImplSalDDB*     mpDDB;
     bool            mbGrey;
-    bool            mbHasAlpha;
 
 public:
 
@@ -150,8 +149,6 @@ public:
     virtual BitmapBuffer*       AcquireBuffer( bool bReadOnly );
     virtual void                ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
     virtual bool                GetSystemData( BitmapSystemData& rData );
-    virtual bool                HasAlpha() const { return mbHasAlpha; }
-    virtual void                SetHasAlpha( bool bHasAlpha ) { mbHasAlpha = bHasAlpha; }
 };
 
 // --------------

vcl/inc/unx/salgdi.h

@@ -322,11 +322,6 @@ public:
                                              const SalBitmap& rSourceBitmap,
                                              const SalBitmap& rAlphaBitmap );
 
-    bool                    drawAlphaBitmapOpt( const SalTwoRect&,
-                                                const SalBitmap& rSourceBitmap,
-                                                const SalBitmap& rAlphaBitmap,
-                                                bool bUseAlphaBitmap = true );
-
     virtual bool            drawAlphaRect( long nX, long nY, long nWidth,
                                            long nHeight, sal_uInt8 nTransparency );
 

vcl/source/gdi/gdimtf.cxx

@@ -446,30 +446,6 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
                 }
 
                 SalBitmap* pSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap();
-#if defined(UNX) && !defined(ANDROID) && !defined(IOS) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
-                X11SalBitmap* X11Bmp = static_cast< X11SalBitmap* >( pSalBmp );
-
-                // for pdf export metafile recording, don't break
-                // other code's assumption that Bitmap with alpha
-                // channel comes as BitmapEx
-                if( !pOut->GetExtOutDevData() )
-                {
-                    X11Bmp->SetHasAlpha( true );
-                    if( X11Bmp->Create( xBitmapCanvas, aSize ) )
-                    {
-                        Bitmap aBitmap( X11Bmp );
-                        if ( pOut->GetMapMode() == MAP_PIXEL )
-                            pOut->DrawBitmap( rPos, aBitmap );
-                        else
-                            pOut->DrawBitmap( rPos, rLogicDestSize, aBitmap );
-                        return true;
-                    }
-                }
-                else
-#endif
-                {
-                    // for Windows and Mac, exclusively use this code
-                    // path. The inline alpha on X11 is a hack.
                 SalBitmap* pSalMask = ImplGetSVData()->mpDefInst->CreateSalBitmap();
                 if( pSalBmp->Create( xBitmapCanvas, aSize ) && pSalMask->Create( xBitmapCanvas, aSize, true ) )
                 {
@@ -483,9 +459,9 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
                         pOut->DrawBitmapEx( rPos, rLogicDestSize, aBitmapEx );
                     return true;
                 }
-                    delete pSalMask;
-                }
+
                 delete pSalBmp;
+                delete pSalMask;
             }
         }
     }

vcl/unx/generic/gdi/salbmp.cxx

@@ -43,7 +43,6 @@
 #include <unx/salbmp.h>
 #include <unx/salinst.h>
 #include <unx/x11/xlimits.hxx>
-#include "xrender_peer.hxx"
 
 #if defined HAVE_VALGRIND_HEADERS
 #include <valgrind/memcheck.h>
@@ -67,7 +66,6 @@ X11SalBitmap::X11SalBitmap()
     : mpDIB( NULL )
     , mpDDB( NULL )
     , mbGrey( false )
-    , mbHasAlpha( false )
 {
 }
 

vcl/unx/generic/gdi/salgdi2.cxx

@@ -479,9 +479,6 @@ void X11SalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSa
         XChangeGC( pXDisp, aGC, nValues, &aNewVal );
     }
 
-    if ( rSalBitmap.GetBitCount() == 32 && rSalBitmap.HasAlpha() )
-        drawAlphaBitmapOpt( *pPosAry, rSalBitmap, rSalBitmap, false );
-    else
     static_cast<const X11SalBitmap&>(rSalBitmap).ImplDraw( aDrawable, m_nXScreen, nDepth, *pPosAry, aGC );
 
     if( rSalBitmap.GetBitCount() == 1 )
@@ -606,15 +603,9 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect* pPosAry,
 
 bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
     const SalBitmap& rSrcBitmap, const SalBitmap& rAlphaBmp )
-{
-    return drawAlphaBitmapOpt( rTR, rSrcBitmap, rAlphaBmp );
-}
-
-bool X11SalGraphics::drawAlphaBitmapOpt( const SalTwoRect& rTR,
-                                         const SalBitmap& rSrcBitmap, const SalBitmap& rAlphaBmp, bool bUseAlphaBitmap )
 {
     // non 8-bit alpha not implemented yet
-    if( bUseAlphaBitmap && rAlphaBmp.GetBitCount() != 8 )
+    if( rAlphaBmp.GetBitCount() != 8 )
         return false;
 
     // horizontal mirroring not implemented yet
@@ -636,12 +627,10 @@ bool X11SalGraphics::drawAlphaBitmapOpt( const SalTwoRect& rTR,
     const SalVisual& rSalVis = pSalDisp->GetVisual( m_nXScreen );
     Display* pXDisplay = pSalDisp->GetDisplay();
 
-    Picture aAlphaPic = 0;
-    Pixmap aAlphaPM = 0;
     // create source Picture
     int nDepth = m_pVDev ? m_pVDev->GetDepth() : rSalVis.GetDepth();
     const X11SalBitmap& rSrcX11Bmp = static_cast<const X11SalBitmap&>( rSrcBitmap );
-    ImplSalDDB* pSrcDDB = rSrcX11Bmp.ImplGetDDB( hDrawable_, m_nXScreen, bUseAlphaBitmap ? nDepth : 32, rTR );
+    ImplSalDDB* pSrcDDB = rSrcX11Bmp.ImplGetDDB( hDrawable_, m_nXScreen, nDepth, rTR );
     if( !pSrcDDB )
         return false;
 
@@ -649,7 +638,7 @@ bool X11SalGraphics::drawAlphaBitmapOpt( const SalTwoRect& rTR,
     // we requested. E.g. mask pixmaps are always compatible with the drawable
     // TODO: find an appropriate picture format for these cases
     //       then remove the workaround below and the one for #i75531#
-    if( bUseAlphaBitmap && nDepth != pSrcDDB->ImplGetDepth() )
+    if( nDepth != pSrcDDB->ImplGetDepth() )
         return false;
 
     Pixmap aSrcPM = pSrcDDB->ImplGetPixmap();
@@ -660,14 +649,13 @@ bool X11SalGraphics::drawAlphaBitmapOpt( const SalTwoRect& rTR,
     // TODO: use scoped picture
     Visual* pSrcXVisual = rSalVis.GetVisual();
     XRenderPeer& rPeer = XRenderPeer::GetInstance();
-    XRenderPictFormat* pSrcVisFmt = bUseAlphaBitmap ? rPeer.FindVisualFormat( pSrcXVisual ) : rPeer.FindStandardFormat( PictStandardARGB32 );
+    XRenderPictFormat* pSrcVisFmt = rPeer.FindVisualFormat( pSrcXVisual );
     if( !pSrcVisFmt )
         return false;
     Picture aSrcPic = rPeer.CreatePicture( aSrcPM, pSrcVisFmt, 0, NULL );
     if( !aSrcPic )
         return false;
 
-    if ( bUseAlphaBitmap ) {
     // create alpha Picture
 
     // TODO: use SalX11Bitmap functionality and caching for the Alpha Pixmap
@@ -704,7 +692,7 @@ bool X11SalGraphics::drawAlphaBitmapOpt( const SalTwoRect& rTR,
         pAlphaBits, pAlphaBuffer->mnWidth, pAlphaBuffer->mnHeight,
         pAlphaFormat->depth, pAlphaBuffer->mnScanlineSize );
 
-        aAlphaPM = limitXCreatePixmap( pXDisplay, hDrawable_,
+    Pixmap aAlphaPM = limitXCreatePixmap( pXDisplay, hDrawable_,
         rTR.mnDestWidth, rTR.mnDestHeight, 8 );
 
     XGCValues aAlphaGCV;
@@ -721,27 +709,21 @@ bool X11SalGraphics::drawAlphaBitmapOpt( const SalTwoRect& rTR,
 
     XRenderPictureAttributes aAttr;
     aAttr.repeat = true;
-        aAlphaPic = rPeer.CreatePicture( aAlphaPM, pAlphaFormat, CPRepeat, &aAttr );
+    Picture aAlphaPic = rPeer.CreatePicture( aAlphaPM, pAlphaFormat, CPRepeat, &aAttr );
     if( !aAlphaPic )
         return false;
-    }
 
     // set clipping
     if( mpClipRegion && !XEmptyRegion( mpClipRegion ) )
         rPeer.SetPictureClipRegion( aDstPic, mpClipRegion );
 
     // paint source * mask over destination picture
-    rPeer.CompositePicture( PictOpOver, aSrcPic, bUseAlphaBitmap ? aAlphaPic : None, aDstPic,
+    rPeer.CompositePicture( PictOpOver, aSrcPic, aAlphaPic, aDstPic,
         rTR.mnSrcX, rTR.mnSrcY, 0, 0,
         rTR.mnDestX, rTR.mnDestY, rTR.mnDestWidth, rTR.mnDestHeight );
 
-    if ( bUseAlphaBitmap )
-    {
-        if ( aAlphaPic )
     rPeer.FreePicture( aAlphaPic );
-        if ( aAlphaPM )
-            XFreePixmap( pXDisplay, aAlphaPM );
-    }
+    XFreePixmap(pXDisplay, aAlphaPM);
     rPeer.FreePicture( aSrcPic );
     return true;
 }