diff options
| author | Noel Grandin <noel@peralex.com> | 2012-01-30 13:17:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-30 13:18:38 +0000 |
| commit | 61451fec9b4ece2d2ef9d1d337dfc9e78c422d93 (patch) | |
| tree | 7db6906da867d6af5a765579e9338b0838e34daf /vcl | |
| parent | refactor ConvertLineEnd (diff) | |
| download | core-61451fec9b4ece2d2ef9d1d337dfc9e78c422d93.tar.gz core-61451fec9b4ece2d2ef9d1d337dfc9e78c422d93.zip | |
fdo#44981 - remove obsolete SWAPLONG macros
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/bmpacc.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 22 | ||||
| -rw-r--r-- | vcl/source/gdi/pngread.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/pngwrite.cxx | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index a3174e69e32f..c4ce0e31ef82 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -289,7 +289,7 @@ void BitmapReadAccess::ImplZeroInitUnusedBits() sal_uInt8* pLast4Bytes = (sal_uInt8*) GetBuffer() + ( nScanSize - 4 ); #ifdef OSL_LITENDIAN - nMask = SWAPLONG( nMask ); + nMask = OSL_SWAPDWORD( nMask ); #endif for( sal_uInt32 i = 0; i < nHeight; i++, pLast4Bytes += nScanSize ) ( *(sal_uInt32*) pLast4Bytes ) &= nMask; diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 6aaedd6558fb..38261b9b095e 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -991,17 +991,17 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) // swapped if( nType > 100L ) { - nType = SWAPLONG( nType ); - nLen = SWAPLONG( nLen ); - nWidth = SWAPLONG( nWidth ); - nHeight = SWAPLONG( nHeight ); - nMapMode = SWAPLONG( nMapMode ); - nScaleNumX = SWAPLONG( nScaleNumX ); - nScaleDenomX = SWAPLONG( nScaleDenomX ); - nScaleNumY = SWAPLONG( nScaleNumY ); - nScaleDenomY = SWAPLONG( nScaleDenomY ); - nOffsX = SWAPLONG( nOffsX ); - nOffsY = SWAPLONG( nOffsY ); + nType = OSL_SWAPDWORD( nType ); + nLen = OSL_SWAPDWORD( nLen ); + nWidth = OSL_SWAPDWORD( nWidth ); + nHeight = OSL_SWAPDWORD( nHeight ); + nMapMode = OSL_SWAPDWORD( nMapMode ); + nScaleNumX = OSL_SWAPDWORD( nScaleNumX ); + nScaleDenomX = OSL_SWAPDWORD( nScaleDenomX ); + nScaleNumY = OSL_SWAPDWORD( nScaleNumY ); + nScaleDenomY = OSL_SWAPDWORD( nScaleDenomY ); + nOffsX = OSL_SWAPDWORD( nOffsX ); + nOffsY = OSL_SWAPDWORD( nOffsY ); } aSize = Size( nWidth, nHeight ); diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index cb4f72ea37de..983753720cff 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -286,7 +286,7 @@ bool PNGReaderImpl::ReadNextChunk() // calculate chunktype CRC (swap it back to original byte order) sal_uInt32 nChunkType = mnChunkType; #if defined(__LITTLEENDIAN) || defined(OSL_LITENDIAN) - nChunkType = SWAPLONG( nChunkType ); + nChunkType = OSL_SWAPDWORD( nChunkType ); #endif sal_uInt32 nCRC32 = rtl_crc32( 0, &nChunkType, 4 ); diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 04c4588d0ac2..bc251057bda1 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -281,7 +281,7 @@ sal_Bool PNGWriterImpl::Write( SvStream& rOStm ) { sal_uInt32 nType = aBeg->nType; #if defined(__LITTLEENDIAN) || defined(OSL_LITENDIAN) - nType = SWAPLONG( nType ); + nType = OSL_SWAPDWORD( nType ); #endif sal_uInt32 nCRC = rtl_crc32( 0, &nType, 4 ); sal_uInt32 nDataSize = aBeg->aData.size(); |