diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-09-28 22:33:50 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-09-28 22:57:00 +0000 |
commit | 8730974f3da0ce385cac84b81b8ae3169001399c (patch) | |
tree | 18aa51ff350fdd28b84c024c4b13396c465236fc /include/vcl/bmpacc.hxx | |
parent | 1a57c512c051cb8b1809f00e569a402ff6be5878 (diff) |
vcl: cleanup headers - remove comments, tabify
Change-Id: I718832960abe07450bc9fdda15297cb5e56f84e4
Reviewed-on: https://gerrit.libreoffice.org/11674
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include/vcl/bmpacc.hxx')
-rw-r--r-- | include/vcl/bmpacc.hxx | 105 |
1 files changed, 54 insertions, 51 deletions
diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx index 359c16829031..252599b5f76c 100644 --- a/include/vcl/bmpacc.hxx +++ b/include/vcl/bmpacc.hxx @@ -67,50 +67,6 @@ class VCL_DLLPUBLIC BitmapReadAccess { friend class BitmapWriteAccess; -private: - - BitmapReadAccess() {} - BitmapReadAccess( const BitmapReadAccess& ) {} - BitmapReadAccess& operator=( const BitmapReadAccess& ) { return *this; } - -protected: - Bitmap maBitmap; - BitmapBuffer* mpBuffer; - Scanline* mpScanBuf; - ColorMask maColorMask; - FncGetPixel mFncGetPixel; - FncSetPixel mFncSetPixel; - bool mbModify; - - -SAL_DLLPRIVATE void ImplCreate( Bitmap& rBitmap ); -SAL_DLLPRIVATE void ImplDestroy(); -SAL_DLLPRIVATE bool ImplSetAccessPointers( sal_uLong nFormat ); - -public: - -SAL_DLLPRIVATE void ImplZeroInitUnusedBits(); -SAL_DLLPRIVATE BitmapBuffer* ImplGetBitmapBuffer() const { return mpBuffer; } - - DECL_FORMAT( _1BIT_MSB_PAL ) - DECL_FORMAT( _1BIT_LSB_PAL ) - DECL_FORMAT( _4BIT_MSN_PAL ) - DECL_FORMAT( _4BIT_LSN_PAL ) - DECL_FORMAT( _8BIT_PAL ) - DECL_FORMAT( _8BIT_TC_MASK ) - DECL_FORMAT( _16BIT_TC_MSB_MASK ) - DECL_FORMAT( _16BIT_TC_LSB_MASK ) - DECL_FORMAT( _24BIT_TC_BGR ) - DECL_FORMAT( _24BIT_TC_RGB ) - DECL_FORMAT( _24BIT_TC_MASK ) - DECL_FORMAT( _32BIT_TC_ABGR ) - DECL_FORMAT( _32BIT_TC_ARGB ) - DECL_FORMAT( _32BIT_TC_BGRA ) - DECL_FORMAT( _32BIT_TC_RGBA ) - DECL_FORMAT( _32BIT_TC_MASK ) -protected: - BitmapReadAccess( Bitmap& rBitmap, bool bModify ); - public: BitmapReadAccess( Bitmap& rBitmap ); virtual ~BitmapReadAccess(); @@ -125,10 +81,10 @@ public: inline bool IsTopDown() const; inline bool IsBottomUp() const; - inline sal_uLong GetScanlineFormat() const; - inline sal_uLong GetScanlineSize() const; + inline sal_uLong GetScanlineFormat() const; + inline sal_uLong GetScanlineSize() const; - inline sal_uInt16 GetBitCount() const; + inline sal_uInt16 GetBitCount() const; inline BitmapColor GetBestMatchingColor( const BitmapColor& rBitmapColor ); inline Scanline GetBuffer() const; @@ -136,10 +92,10 @@ public: inline bool HasPalette() const; inline const BitmapPalette& GetPalette() const; - inline sal_uInt16 GetPaletteEntryCount() const; + inline sal_uInt16 GetPaletteEntryCount() const; inline const BitmapColor& GetPaletteColor( sal_uInt16 nColor ) const; inline const BitmapColor& GetBestPaletteColor( const BitmapColor& rBitmapColor ) const; - sal_uInt16 GetBestPaletteIndex( const BitmapColor& rBitmapColor ) const; + sal_uInt16 GetBestPaletteIndex( const BitmapColor& rBitmapColor ) const; inline bool HasColorMask() const; inline ColorMask& GetColorMask() const; @@ -152,11 +108,58 @@ public: inline sal_uInt8 GetLuminance( long nY, long nX ) const; /** Get the interpolated color at coordinates fY, fX; if outside, return rFallback */ - BitmapColor GetInterpolatedColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; + BitmapColor GetInterpolatedColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; /** Get the color at coordinates fY, fX; if outside, return rFallback. Automatically does the correct inside/outside checks, e.g. static_cast< sal_uInt32 >(-0.25) *is* 0, not -1 and has to be outside */ - BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; + BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; + +private: + + BitmapReadAccess() {} + BitmapReadAccess( const BitmapReadAccess& ) {} + BitmapReadAccess& operator=( const BitmapReadAccess& ) { return *this; } + +protected: + Bitmap maBitmap; + BitmapBuffer* mpBuffer; + Scanline* mpScanBuf; + ColorMask maColorMask; + FncGetPixel mFncGetPixel; + FncSetPixel mFncSetPixel; + bool mbModify; + + + SAL_DLLPRIVATE void ImplCreate( Bitmap& rBitmap ); + SAL_DLLPRIVATE void ImplDestroy(); + SAL_DLLPRIVATE bool ImplSetAccessPointers( sal_uLong nFormat ); + +public: + + SAL_DLLPRIVATE void ImplZeroInitUnusedBits(); + SAL_DLLPRIVATE BitmapBuffer* + ImplGetBitmapBuffer() const { return mpBuffer; } + + DECL_FORMAT( _1BIT_MSB_PAL ) + DECL_FORMAT( _1BIT_LSB_PAL ) + DECL_FORMAT( _4BIT_MSN_PAL ) + DECL_FORMAT( _4BIT_LSN_PAL ) + DECL_FORMAT( _8BIT_PAL ) + DECL_FORMAT( _8BIT_TC_MASK ) + DECL_FORMAT( _16BIT_TC_MSB_MASK ) + DECL_FORMAT( _16BIT_TC_LSB_MASK ) + DECL_FORMAT( _24BIT_TC_BGR ) + DECL_FORMAT( _24BIT_TC_RGB ) + DECL_FORMAT( _24BIT_TC_MASK ) + DECL_FORMAT( _32BIT_TC_ABGR ) + DECL_FORMAT( _32BIT_TC_ARGB ) + DECL_FORMAT( _32BIT_TC_BGRA ) + DECL_FORMAT( _32BIT_TC_RGBA ) + DECL_FORMAT( _32BIT_TC_MASK ) + +protected: + BitmapReadAccess( Bitmap& rBitmap, bool bModify ); + }; // - BitmapWriteAccess - |