diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-12 09:20:19 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-12 09:54:57 +0100 |
| commit | 352580fedebcb9ae3c4200d343f88f98b9faa22a (patch) | |
| tree | b29d3ed74aa9a55588d214501275b479695063e0 /vcl/source | |
| parent | 548cf61edf5c3b0960dca7090c380ddc94ed6567 (diff) | |
Revert "pass argb32 pixmaps from vcl to canvas, avoiding x11 roundtrips"
This reverts commit 6b8e311ddc633bb13053d13c5d0f29240039846b.
Conflicts:
canvas/source/cairo/cairo_canvasbitmap.cxx
vcl/unx/generic/gdi/salgdi2.cxx
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/gdi/bitmap.cxx | 13 | ||||
| -rw-r--r-- | vcl/source/helper/canvastools.cxx | 25 |
2 files changed, 1 insertions, 37 deletions
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 98de0a4e2f84..436092a89828 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -1901,17 +1901,4 @@ bool Bitmap::GetSystemData( BitmapSystemData& rData ) const return bRet; } -bool Bitmap::HasAlpha() -{ - bool bRet = false; - if( mpImpBmp ) - { - SalBitmap* pSalBitmap = mpImpBmp->ImplGetSalBitmap(); - if( pSalBitmap ) - bRet = pSalBitmap->HasAlpha(); - } - - return bRet; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index d05f7e78bfb3..75ad8721e3a9 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -21,8 +21,6 @@ #include <rtl/logfile.hxx> #include <cppuhelper/compbase1.hxx> -#include <com/sun/star/beans/XFastPropertySet.hpp> - #include <com/sun/star/geometry/RealSize2D.hpp> #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/geometry/RealRectangle2D.hpp> @@ -72,32 +70,11 @@ namespace vcl { namespace unotools { - uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >& xGraphicDevice, + uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/, const ::BitmapEx& inputBitmap ) { RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xBitmapFromBitmapEx()" ); - if ( inputBitmap.GetBitmap().HasAlpha() ) - { - geometry::IntegerSize2D aSize; - - aSize.Width = aSize.Height = 1; - - uno::Reference< rendering::XBitmap > xBitmap = xGraphicDevice->createCompatibleAlphaBitmap( aSize ); - - uno::Reference< beans::XFastPropertySet > rPropSet( xBitmap, uno::UNO_QUERY ); - if ( rPropSet.is() ) - { - Bitmap aBitmap = inputBitmap.GetBitmap(); - rPropSet->setFastPropertyValue( 0, uno::Any( sal_Int64( &aBitmap ))); - - aSize = xBitmap->getSize(); - - if ( aSize.Width != 1 || aSize.Height != 1 ) - return xBitmap; - } - } - return new vcl::unotools::VclCanvasBitmap( inputBitmap ); } |