diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-06 13:49:40 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-06 13:49:40 +0000 |
| commit | 840045888a03e3e43f2b1358d9b1c8868473432b (patch) | |
| tree | a482f47ad90fb2d3cc24753c3d79db656d3996a9 /vcl | |
| parent | 9d792fb23f471dbd37d92067bdd7c1e941d2a7a6 (diff) | |
INTEGRATION: CWS vcl67 (1.20.16); FILE MERGED
2006/09/21 16:15:48 pl 1.20.16.1: #i69725# mask access is needed for alpha mask also
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/pngread.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 627320bc2199..24c3c8a92f25 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pngread.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2006-09-17 12:08:56 $ + * last change: $Author: kz $ $Date: 2006-11-06 14:49:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -792,10 +792,15 @@ BOOL PNGReaderImpl::ImplReadTransparent() if( mbTransparent && !mbAlphaChannel && !mpMaskBmp ) { if( bNeedAlpha) + { mpAlphaMask = new AlphaMask( maTargetSize ); + mpMaskAcc = mpAlphaMask->AcquireWriteAccess(); + } else + { mpMaskBmp = new Bitmap( maTargetSize, 1 ); - mpMaskAcc = mpMaskBmp->AcquireWriteAccess(); + mpMaskAcc = mpMaskBmp->AcquireWriteAccess(); + } mbTransparent = (mpMaskAcc != NULL); if( !mbTransparent ) return FALSE; |