diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-03-16 11:52:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-03-16 11:52:51 +0000 |
| commit | 1e7de165aabae96c5d19f14819cbd10506e5a02a (patch) | |
| tree | 5f91a9c240042dedd4719be32c57bbc5b711e400 | |
| parent | d1e947a2cc6333ce0f33d29ff3dfe7ae612c1793 (diff) | |
INTEGRATION: CWS sixtyfour02 (1.10.4); FILE MERGED
2006/02/23 08:59:17 cmc 1.10.4.3: #i62227# streaming ULONGS to disk
2006/02/23 08:48:21 cmc 1.10.4.2: accidental commit
2006/02/21 14:58:44 cmc 1.10.4.1: #i62227# stream sal_uInt32 explicitly as is currently assumed implicitly
| -rw-r--r-- | vcl/source/gdi/bitmap2.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx index 39a15fdf06e2..7f1cb4c742ab 100644 --- a/vcl/source/gdi/bitmap2.cxx +++ b/vcl/source/gdi/bitmap2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmap2.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2006-02-09 14:50:28 $ + * last change: $Author: vg $ $Date: 2006-03-16 12:52:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -212,7 +212,7 @@ BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset ) if( ZCOMPRESS == aHeader.nCompression ) { ZCodec aCodec; - ULONG nCodedSize, nUncodedSize; + sal_uInt32 nCodedSize, nUncodedSize; ULONG nCodedPos; // read coding information @@ -692,7 +692,7 @@ BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompre DIBInfoHeader aHeader; ULONG nImageSizePos; ULONG nEndPos; - ULONG nCompression = 0; + sal_uInt32 nCompression = 0; BOOL bRet = FALSE; aHeader.nSize = DIBINFOHEADERSIZE; @@ -776,7 +776,7 @@ BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompre ZCodec aCodec; SvMemoryStream aMemStm( aHeader.nSizeImage + 4096, 65535 ); ULONG nCodedPos = rOStm.Tell(), nLastPos; - ULONG nCodedSize, nUncodedSize; + sal_uInt32 nCodedSize, nUncodedSize; // write uncoded data palette if( aHeader.nColsUsed ) |