diff options
Diffstat (limited to 'vcl/inc/vcl/bitmap.hxx')
| -rw-r--r-- | vcl/inc/vcl/bitmap.hxx | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index cfcd863dfb85..d514977fda38 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,14 +145,6 @@ enum BmpFilter // ------------------------------------------------------------------------ -enum BmpColorMode -{ - BMP_COLOR_NORMAL = 0, - BMP_COLOR_HIGHCONTRAST = 1, - BMP_COLOR_MONOCHROME_BLACK = 2, - BMP_COLOR_MONOCHROME_WHITE = 3 -}; - // -------------------- // - FilterParameters - // -------------------- @@ -257,7 +250,6 @@ private: MapMode maPrefMapMode; Size maPrefSize; -//#if 0 // _SOLAR__PRIVATE public: @@ -267,9 +259,9 @@ public: SAL_DLLPRIVATE void ImplSetImpBitmap( ImpBitmap* pImpBmp ); SAL_DLLPRIVATE void ImplAssignWithSize( const Bitmap& rBitmap ); - SAL_DLLPRIVATE static sal_Bool ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset ); + SAL_DLLPRIVATE static sal_Bool ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset, sal_Bool bMSOFormat = sal_False ); SAL_DLLPRIVATE static sal_Bool ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset ); - SAL_DLLPRIVATE static sal_Bool ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown ); + SAL_DLLPRIVATE static sal_Bool ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown, sal_Bool bMSOFormat = sal_False ); SAL_DLLPRIVATE static sal_Bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, sal_Bool bQuad ); SAL_DLLPRIVATE static sal_Bool ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown ); SAL_DLLPRIVATE sal_Bool ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bCompressed ) const; @@ -308,8 +300,6 @@ public: SAL_DLLPRIVATE sal_Bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress ); SAL_DLLPRIVATE sal_Bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress ); -//#endif // PRIVATE - public: Bitmap(); @@ -364,7 +354,7 @@ public: sal_uLong GetChecksum() const; Bitmap CreateDisplayBitmap( OutputDevice* pDisplay ); - Bitmap GetColorTransformedBitmap( BmpColorMode eColorMode ) const; + Bitmap GetColorTransformedBitmap() const; static const BitmapPalette& GetGreyPalette( int nEntries ); @@ -764,7 +754,7 @@ public: public: - sal_Bool Read( SvStream& rIStm, sal_Bool bFileHeader = sal_True ); + sal_Bool Read( SvStream& rIStm, sal_Bool bFileHeader = sal_True, sal_Bool bMSOFormat = sal_False ); sal_Bool Write( SvStream& rOStm, sal_Bool bCompressed = sal_True, sal_Bool bFileHeader = sal_True ) const; friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Bitmap& rBitmap ); @@ -852,3 +842,5 @@ inline sal_uLong Bitmap::GetSizeBytes() const } #endif // _SV_BITMAP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |