diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 12:55:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 12:55:42 +0000 |
| commit | d3487db1d6746d817707717143eb94fa26040bb1 (patch) | |
| tree | 3780c5d18b5728595eb80f257cac4fded0ce376c /vcl/source/gdi/pngwrite.cxx | |
| parent | 910ece14d73a270c2790b8d50466845053203124 (diff) | |
INTEGRATION: CWS sixtyfour05 (1.7.28); FILE MERGED
2006/04/07 13:52:41 kendy 1.7.28.1: #i64108#
64bit: ULONG <-> sal_uInt32 conversion
Diffstat (limited to 'vcl/source/gdi/pngwrite.cxx')
| -rw-r--r-- | vcl/source/gdi/pngwrite.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index a7e069505ad6..5fbb169bc6d7 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pngwrite.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2006-03-16 12:55:52 $ + * last change: $Author: hr $ $Date: 2006-04-19 13:55:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -123,7 +123,7 @@ private: void ImplWritePalette(); void ImplOpenChunk( ULONG nChunkType ); void ImplWriteChunk( BYTE nNumb ); - void ImplWriteChunk( ULONG nNumb ); + void ImplWriteChunk( sal_uInt32 nNumb ); void ImplWriteChunk( unsigned char* pSource, sal_uInt32 nDatSize ); void ImplCloseChunk( void ); }; @@ -306,8 +306,8 @@ std::vector< vcl::PNGWriter::ChunkData >& PNGWriterImpl::GetChunks() BOOL PNGWriterImpl::ImplWriteHeader() { ImplOpenChunk(PNGCHUNK_IHDR); - ImplWriteChunk( ( mnWidth = (ULONG)mpAccess->Width() ) ); - ImplWriteChunk( ( mnHeight = (ULONG)mpAccess->Height() ) ); + ImplWriteChunk( sal_uInt32( mnWidth = mpAccess->Width() ) ); + ImplWriteChunk( sal_uInt32( mnHeight = mpAccess->Height() ) ); if ( mnWidth && mnHeight && mnBitsPerPixel && mbStatus ) { @@ -664,7 +664,7 @@ void PNGWriterImpl::ImplWriteChunk ( BYTE nSource ) maChunkSeq.back().aData.push_back( nSource ); } -void PNGWriterImpl::ImplWriteChunk ( ULONG nSource ) +void PNGWriterImpl::ImplWriteChunk ( sal_uInt32 nSource ) { vcl::PNGWriter::ChunkData& rChunkData = maChunkSeq.back(); rChunkData.aData.push_back( (sal_uInt8)( nSource >> 24 ) ); |