diff options
| author | Radek Doulik <rodo@novell.com> | 2013-03-14 09:36:43 +0100 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2013-03-14 13:21:24 +0100 |
| commit | 22f63477a3300d474c3d6832232b888f75c7290c (patch) | |
| tree | 7fc4d0970fd5d58fe950e9b618ba87533c53b6e8 /vcl/inc | |
| parent | i#119478# Fixed application of transparency to table cells. (diff) | |
| download | core-22f63477a3300d474c3d6832232b888f75c7290c.tar.gz core-22f63477a3300d474c3d6832232b888f75c7290c.zip | |
pass argb32 pixmaps from vcl to canvas, avoiding costly x11 roundtrips
- fixes also problem with emf+ rendering for slideshow
Change-Id: Icb894d3f37b29f23d3f267c944d827eefbf47fda
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/salbmp.h | 4 | ||||
| -rw-r--r-- | vcl/inc/vcl/bitmap.hxx | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index 6973507d15d7..70307a175a7c 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -80,6 +80,7 @@ public: SAL_DLLPRIVATE bool ImplCreateFromDrawable( Drawable aDrawable, + void* pVisual, SalX11Screen nXScreen, long nDrawableDepth, long nX, @@ -162,6 +163,7 @@ class ImplSalDDB private: Pixmap maPixmap; + void* mpVisual; SalTwoRect maTwoRect; long mnDepth; SalX11Screen mnXScreen; @@ -193,6 +195,7 @@ public: ImplSalDDB( Drawable aDrawable, + void *pVisual, SalX11Screen nXScreen, long nDrawableDepth, long nX, @@ -204,6 +207,7 @@ public: ~ImplSalDDB(); Pixmap ImplGetPixmap() const { return maPixmap; } + void* ImplGetVisual() const { return mpVisual; } long ImplGetWidth() const { return maTwoRect.mnDestWidth; } long ImplGetHeight() const { return maTwoRect.mnDestHeight; } long ImplGetDepth() const { return mnDepth; } diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index 7e1fced00998..2a0b139df92e 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -325,6 +325,7 @@ struct BitmapSystemData void* rImageContext; //Image context (CGContextRef) #else void* aPixmap; + void* aVisual; #endif int mnWidth; int mnHeight; @@ -846,6 +847,8 @@ public: const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL ); + bool HasAlpha(); + public: BitmapReadAccess* AcquireReadAccess(); BitmapWriteAccess* AcquireWriteAccess(); |