strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#89151#: don't convert alpha bitmaps to transparent bitmaps for printing

Browse source
This commit is contained in:
Kai Ahrens 2001-07-04 14:25:01 +00:00
parent c50f4c74d0
commit ed396986ec
1 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
vcl/source/gdi/outdev2.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: outdev2.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: ka $ $Date: 2000-10-26 08:46:33 $
* last change: $Author: ka $ $Date: 2001-07-04 15:25:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -825,9 +825,49 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize
if( OUTDEV_PRINTER == meOutDevType )
{
Bitmap aBmp( aBmpEx.GetBitmap() ), aMask( aBmpEx.GetMask() );
Bitmap aBmp( aBmpEx.GetBitmap() );
if( aBmpEx.IsAlpha() )
{
if( !aBmp.IsEmpty() )
{
TwoRect aPosAry;
aPosAry.mnSrcX = rSrcPtPixel.X();
aPosAry.mnSrcY = rSrcPtPixel.Y();
aPosAry.mnSrcWidth = rSrcSizePixel.Width();
aPosAry.mnSrcHeight = rSrcSizePixel.Height();
aPosAry.mnDestX = ImplLogicXToDevicePixel( rDestPt.X() );
aPosAry.mnDestY = ImplLogicYToDevicePixel( rDestPt.Y() );
aPosAry.mnDestWidth = ImplLogicWidthToDevicePixel( rDestSize.Width() );
aPosAry.mnDestHeight = ImplLogicHeightToDevicePixel( rDestSize.Height() );
const ULONG nMirrFlags = ImplAdjustTwoRect( aPosAry, aBmp.GetSizePixel() );
if ( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight )
{
if ( nMirrFlags )
aBmp.Mirror( nMirrFlags );
#ifndef REMOTE_APPSERVER
mpGraphics->DrawBitmap( &aPosAry, *aBmp.ImplGetImpBitmap()->ImplGetSalBitmap() );
#else
aBmp.ImplDrawRemote( this,
Point( aPosAry.mnSrcX, aPosAry.mnSrcY ),
Size( aPosAry.mnSrcWidth, aPosAry.mnSrcHeight ),
Point( aPosAry.mnDestX, aPosAry.mnDestY ),
Size( aPosAry.mnDestWidth, aPosAry.mnDestHeight ) );
#endif
}
}
}
else
{
Bitmap aMask( aBmpEx.GetMask() );
aBmp.Replace( aMask, Color( COL_WHITE ) );
ImplPrintTransparent( aBmp, aMask, rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel );
}
return;
}
#ifndef REMOTE_APPSERVER