diff options
author | Michael Meeks <michael.meeks@suse.com> | 2013-06-10 12:24:10 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-11 14:41:50 +0100 |
commit | 056c7b46d42c9cb891cb269a2561f1cf34cafe10 (patch) | |
tree | 38796501a62da442db6f771f87075311a60ced65 /include | |
parent | 85165a18e9f8123d80246bedfad0acd8a314f715 (diff) |
Revert "pass argb32 pixmaps from vcl to canvas, avoiding costly x11 ...
This reverts commit 22f63477a3300d474c3d6832232b888f75c7290c.
Conflicts:
canvas/source/cairo/cairo_canvasbitmap.cxx
Change-Id: Ib266050ebc6eaca4fbd36ed013ac95a1b4b9d316
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/bitmap.hxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 4ca9cc1759f0..1715022b4790 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -307,7 +307,6 @@ struct BitmapSystemData void* rImageContext; //Image context (CGContextRef) #else void* aPixmap; - void* aVisual; #endif int mnWidth; int mnHeight; @@ -823,8 +822,6 @@ public: const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL ); - bool HasAlpha(); - public: /** Draw a blend frame to the Bitmap |