diff options
Diffstat (limited to 'vcl/source/gdi/bitmap2.cxx')
| -rw-r--r-- | vcl/source/gdi/bitmap2.cxx | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx index 43a0d405669b..ab259bfb37c6 100644 --- a/vcl/source/gdi/bitmap2.cxx +++ b/vcl/source/gdi/bitmap2.cxx @@ -31,19 +31,11 @@ #include <valgrind/memcheck.h> #endif - -// ----------- -// - Defines - -// ----------- - #define DIBCOREHEADERSIZE ( 12UL ) #define DIBINFOHEADERSIZE ( sizeof( DIBInfoHeader ) ) #define BITMAPINFOHEADER 0x28 -// ---------------------- -// - Compression defines -// ---------------------- - +// Compression defines #define COMPRESS_OWN ('S'|('D'<<8UL)) #define COMPRESS_NONE ( 0UL ) #define RLE_8 ( 1UL ) @@ -51,10 +43,6 @@ #define BITFIELDS ( 3UL ) #define ZCOMPRESS ( COMPRESS_OWN | 0x01000000UL ) /* == 'SD01' (binary) */ -// ----------------- -// - DIBInfoHeader - -// ----------------- - struct DIBInfoHeader { sal_uInt32 nSize; @@ -101,26 +89,18 @@ namespace } } -// ---------- -// - Bitmap - -// ---------- - SvStream& operator>>( SvStream& rIStm, Bitmap& rBitmap ) { rBitmap.Read( rIStm, sal_True ); return rIStm; } -// ------------------------------------------------------------------ - SvStream& operator<<( SvStream& rOStm, const Bitmap& rBitmap ) { rBitmap.Write( rOStm, sal_False, sal_True ); return rOStm; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Read( SvStream& rIStm, sal_Bool bFileHeader, sal_Bool bIsMSOFormat ) { const sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); @@ -151,8 +131,6 @@ sal_Bool Bitmap::Read( SvStream& rIStm, sal_Bool bFileHeader, sal_Bool bIsMSOFor return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset, sal_Bool bIsMSOFormat ) { DIBInfoHeader aHeader; @@ -255,8 +233,6 @@ sal_Bool Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset, return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset ) { sal_uInt32 nTmp32; @@ -290,8 +266,6 @@ sal_Bool Bitmap::ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown, sal_Bool bIsMSOFormat ) { // BITMAPINFOHEADER or BITMAPCOREHEADER @@ -407,8 +381,6 @@ sal_Bool Bitmap::ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, return( ( rHeader.nPlanes == 1 ) && ( rIStm.GetError() == 0UL ) ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, sal_Bool bQuad ) { const sal_uInt16 nColors = rAcc.GetPaletteEntryCount(); @@ -436,8 +408,6 @@ sal_Bool Bitmap::ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, s return( rIStm.GetError() == 0UL ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown ) { const sal_uLong nAlignedWidth = AlignedWidth4Bytes( rHeader.nWidth * rHeader.nBitCount ); @@ -659,8 +629,6 @@ sal_Bool Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, Bitma return( rIStm.GetError() == 0UL ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::Write( SvStream& rOStm, sal_Bool bCompressed, sal_Bool bFileHeader ) const { DBG_ASSERT( mpImpBmp, "Empty Bitmaps can't be saved" ); @@ -701,8 +669,6 @@ sal_Bool Bitmap::Write( SvStream& rOStm, sal_Bool bCompressed, sal_Bool bFileHea return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bCompressed ) const { const MapMode aMapPixel( MAP_PIXEL ); @@ -851,8 +817,6 @@ sal_Bool Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool return bRet; } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc ) { sal_uInt32 nPalCount = ( rAcc.HasPalette() ? rAcc.GetPaletteEntryCount() : @@ -868,8 +832,6 @@ sal_Bool Bitmap::ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc return( rOStm.GetError() == 0UL ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc ) { const sal_uInt16 nColors = rAcc.GetPaletteEntryCount(); @@ -894,8 +856,6 @@ sal_Bool Bitmap::ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc ) return( rOStm.GetError() == 0UL ); } -// ------------------------------------------------------------------ - #if defined HAVE_VALGRIND_HEADERS namespace { @@ -1086,8 +1046,6 @@ sal_Bool Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc, return( rOStm.GetError() == 0UL ); } -// ------------------------------------------------------------------ - void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bRLE4 ) { @@ -1191,8 +1149,6 @@ void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, while ( !bEndDecoding && ( nY >= 0L ) ); } -// ------------------------------------------------------------------ - sal_Bool Bitmap::ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bRLE4 ) { const sal_uLong nWidth = rAcc.Width(); |