diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:30:30 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:30:30 +0000 |
| commit | 21ff7210ea104ea0fb1aaaafc272f65142188c7b (patch) | |
| tree | a67fd5a15c0158c3220658148296f542469e27f9 /vcl/source/gdi/pngwrite.cxx | |
| parent | 8d3ae04ec6704d53fe9e3f00d80ec000a4346086 (diff) | |
INTEGRATION: CWS warnings01 (1.6.70); FILE MERGED
2006/05/23 19:51:24 sb 1.6.70.4: RESYNC: (1.7-1.8); FILE MERGED
2006/04/07 18:50:22 sb 1.6.70.3: RESYNC: (1.6-1.7); FILE MERGED
2006/03/17 16:12:52 pl 1.6.70.2: #i55991# removed warnings for windows platform
2005/10/21 17:31:19 pl 1.6.70.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'vcl/source/gdi/pngwrite.cxx')
| -rw-r--r-- | vcl/source/gdi/pngwrite.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 5fbb169bc6d7..b7a1104a423f 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pngwrite.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2006-04-19 13:55:42 $ + * last change: $Author: hr $ $Date: 2006-06-19 19:30:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -132,13 +132,13 @@ private: PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) : - mnLastPercent ( 0UL ), - mnInterlaced ( 0 ), mnCompLevel ( PNG_DEF_COMPRESSION ), + mnInterlaced ( 0 ), + mbStatus ( TRUE ), mpAccess ( NULL ), mpMaskAccess ( NULL ), - mbStatus ( TRUE ), - mpZCodec ( new ZCodec( DEFAULT_IN_BUFSIZE, DEFAULT_OUT_BUFSIZE, MAX_MEM_USAGE ) ) + mpZCodec ( new ZCodec( DEFAULT_IN_BUFSIZE, DEFAULT_OUT_BUFSIZE, MAX_MEM_USAGE ) ), + mnLastPercent ( 0UL ) { if ( !rBmpEx.IsEmpty() ) { @@ -190,7 +190,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, mpAccess = aBmp.AcquireReadAccess(); // TRUE RGB with alphachannel if( mpAccess ) { - if ( ( mbTrueAlpha = rBmpEx.IsAlpha() ) ) + if ( ( mbTrueAlpha = rBmpEx.IsAlpha() ) != FALSE ) { AlphaMask aMask( rBmpEx.GetAlpha() ); mpMaskAccess = aMask.AcquireReadAccess(); @@ -509,7 +509,7 @@ ULONG PNGWriterImpl::ImplGetFilter ( ULONG nY, ULONG nXStart, ULONG nXAdd ) { ULONG nShift = ( nXIndex & 7 ) ^ 7; if ( nShift == 7) - *pDest = (BYTE) mpAccess->GetPixel( nY, nX ) << nShift; + *pDest = (BYTE)(mpAccess->GetPixel( nY, nX ) << nShift); else if ( nShift == 0 ) *pDest++ |= (BYTE) mpAccess->GetPixel( nY, nX ) << nShift; else |