diff options
| author | Armin Le Grand <alg@apache.org> | 2013-01-10 16:28:40 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2013-01-10 16:28:40 +0000 |
| commit | ef3931ff410117e1237b3bef7bc090e8b83b9519 (patch) | |
| tree | 8e02a7db820f632e343c984e9b327fe2578bcb23 /avmedia/source | |
| parent | 534ef6b86ac9ef61e4e7ae98c12149fc9dc9c204 (diff) | |
#121504# Support for alpha channel in clipboard for all systems
Notes
Notes:
merged as: e0cce521f1ad0cc384d30ce2f1077ea229fffe62
Diffstat (limited to 'avmedia/source')
| -rw-r--r-- | avmedia/source/win/framegrabber.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index b1e11d03959f..c3fa9e347de8 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -47,6 +47,7 @@ #include <tools/stream.hxx> #include <vcl/graph.hxx> #include <unotools/localfilehelper.hxx> +#include <vcl/dibtools.hxx> #define AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_DirectX" #define AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_DirectX" @@ -191,7 +192,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe SvMemoryStream aMemStm( pBuffer, nSize, STREAM_READ | STREAM_WRITE ); Bitmap aBmp; - if( aBmp.Read( aMemStm, false ) && !aBmp.IsEmpty() ) + if( ReadDIB(aBmp, aMemStm, false ) && !aBmp.IsEmpty() ) { const Graphic aGraphic( aBmp ); xRet = aGraphic.GetXGraphic(); |