diff options
author | Tomaž Vajngerl <quikee@gmail.com> | 2012-07-26 20:41:59 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2012-07-26 21:01:25 +0200 |
commit | d37ea5bc4b3370f9181de2f74a6c27c02c77bb5d (patch) | |
tree | 4eac9414aa92076e28b27c7aec6a4cc4e24b7661 /vcl | |
parent | 376927e48c0d6da2933e9cf3eb8b8a2b92bf843a (diff) |
Remove useless code separaion comments in bitmapex.cxx
Change-Id: Ic77244abfc68da4b5e64d2159d5700e8ac03a999
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index beba5d50a6a7..d4fea95a6f10 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -48,18 +48,12 @@ #include <image.h> #include <impimagetree.hxx> -// ------------ -// - BitmapEx - -// ------------ - BitmapEx::BitmapEx() : eTransparent( TRANSPARENT_NONE ), bAlpha ( sal_False ) { } -// ------------------------------------------------------------------ - BitmapEx::BitmapEx( const BitmapEx& rBitmapEx ) : aBitmap ( rBitmapEx.aBitmap ), aMask ( rBitmapEx.aMask ), @@ -92,8 +86,6 @@ BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ) : CopyPixel( aDestRect, aSrcRect, &rBitmapEx ); } -// ------------------------------------------------------------------ - BitmapEx::BitmapEx( const ResId& rResId ) : eTransparent( TRANSPARENT_NONE ), bAlpha ( sal_False ) @@ -119,8 +111,6 @@ BitmapEx::BitmapEx( const ResId& rResId ) : } } -// ------------------------------------------------------------------ - BitmapEx::BitmapEx( const Bitmap& rBmp ) : aBitmap ( rBmp ), aBitmapSize ( aBitmap.GetSizePixel() ), @@ -129,8 +119,6 @@ BitmapEx::BitmapEx( const Bitmap& rBmp ) : { } -// ------------------------------------------------------------------ - BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) : aBitmap ( rBmp ), aMask ( rMask ), @@ -149,8 +137,6 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) : } } -// ------------------------------------------------------------------ - BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) : aBitmap ( rBmp ), aMask ( rAlphaMask.ImplGetBitmap() ), @@ -168,8 +154,6 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) : aBitmap.Convert( BMP_CONVERSION_24BIT ); } -// ------------------------------------------------------------------ - BitmapEx::BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor ) : aBitmap ( rBmp ), aBitmapSize ( aBitmap.GetSizePixel() ), @@ -183,16 +167,10 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor ) : "BitmapEx::BitmapEx(): size mismatch for bitmap and alpha mask." ); } -// ------------------------------------------------------------------ - BitmapEx::~BitmapEx() { } -// ------------------------------------------------------------------ - -// ------------------------------------------------------------------ - BitmapEx& BitmapEx::operator=( const BitmapEx& rBitmapEx ) { if( &rBitmapEx != this ) @@ -208,8 +186,6 @@ BitmapEx& BitmapEx::operator=( const BitmapEx& rBitmapEx ) return *this; } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const { if( eTransparent != rBitmapEx.eTransparent ) @@ -230,8 +206,6 @@ sal_Bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const return( ( aMask == rBitmapEx.aMask ) && ( bAlpha == rBitmapEx.bAlpha ) ); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::IsEqual( const BitmapEx& rBmpEx ) const { return( rBmpEx.eTransparent == eTransparent && @@ -240,15 +214,11 @@ sal_Bool BitmapEx::IsEqual( const BitmapEx& rBmpEx ) const rBmpEx.aMask.IsEqual( aMask ) ); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::IsEmpty() const { return( aBitmap.IsEmpty() && aMask.IsEmpty() ); } -// ------------------------------------------------------------------ - void BitmapEx::SetEmpty() { aBitmap.SetEmpty(); @@ -257,29 +227,21 @@ void BitmapEx::SetEmpty() bAlpha = sal_False; } -// ------------------------------------------------------------------ - void BitmapEx::Clear() { SetEmpty(); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::IsTransparent() const { return( eTransparent != TRANSPARENT_NONE ); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::IsAlpha() const { return( IsTransparent() && bAlpha ); } -// ------------------------------------------------------------------ - Bitmap BitmapEx::GetBitmap( const Color* pTransReplaceColor ) const { Bitmap aRetBmp( aBitmap ); @@ -302,8 +264,6 @@ Bitmap BitmapEx::GetBitmap( const Color* pTransReplaceColor ) const return aRetBmp; } -// ------------------------------------------------------------------ - Bitmap BitmapEx::GetMask() const { Bitmap aRet( aMask ); @@ -314,8 +274,6 @@ Bitmap BitmapEx::GetMask() const return aRet; } -// ------------------------------------------------------------------ - AlphaMask BitmapEx::GetAlpha() const { AlphaMask aAlpha; @@ -328,8 +286,6 @@ AlphaMask BitmapEx::GetAlpha() const return aAlpha; } -// ------------------------------------------------------------------ - sal_uLong BitmapEx::GetSizeBytes() const { sal_uLong nSizeBytes = aBitmap.GetSizeBytes(); @@ -340,8 +296,6 @@ sal_uLong BitmapEx::GetSizeBytes() const return nSizeBytes; } -// ------------------------------------------------------------------ - sal_uLong BitmapEx::GetChecksum() const { sal_uInt32 nCrc = aBitmap.GetChecksum(); @@ -362,15 +316,11 @@ sal_uLong BitmapEx::GetChecksum() const return nCrc; } -// ------------------------------------------------------------------ - void BitmapEx::SetSizePixel( const Size& rNewSize ) { Scale( rNewSize ); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Invert() { sal_Bool bRet = sal_False; @@ -386,8 +336,6 @@ sal_Bool BitmapEx::Invert() return bRet; } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) { sal_Bool bRet = sal_False; @@ -403,8 +351,6 @@ sal_Bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag ) { sal_Bool bRet = sal_False; @@ -425,8 +371,6 @@ sal_Bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uLon return bRet; } -// ------------------------------------------------------------------------ - sal_Bool BitmapEx::Scale( const Size& rNewSize, sal_uLong nScaleFlag ) { sal_Bool bRet; @@ -532,8 +476,6 @@ sal_Bool BitmapEx::Rotate( long nAngle10, const Color& rFillColor ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Crop( const Rectangle& rRectPixel ) { sal_Bool bRet = sal_False; @@ -554,22 +496,16 @@ sal_Bool BitmapEx::Crop( const Rectangle& rRectPixel ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Convert( BmpConversion eConversion ) { return( !!aBitmap ? aBitmap.Convert( eConversion ) : sal_False ); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce ) { return( !!aBitmap ? aBitmap.ReduceColors( nNewColorCount, eReduce ) : sal_False ); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor, sal_Bool bExpandTransparent ) { sal_Bool bRet = sal_False; @@ -593,8 +529,6 @@ sal_Bool BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor return bRet; } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const BitmapEx* pBmpExSrc ) { @@ -682,8 +616,6 @@ sal_Bool BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectS return bRet; } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Erase( const Color& rFillColor ) { sal_Bool bRet = sal_False; @@ -711,29 +643,21 @@ sal_Bool BitmapEx::Erase( const Color& rFillColor ) return bRet; } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Dither( sal_uLong nDitherFlags ) { return( !!aBitmap ? aBitmap.Dither( nDitherFlags ) : sal_False ); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) { return( !!aBitmap ? aBitmap.Replace( rSearchColor, rReplaceColor, nTol ) : sal_False ); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Replace( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, const sal_uLong* pTols ) { return( !!aBitmap ? aBitmap.Replace( pSearchColors, pReplaceColors, nColorCount, (sal_uLong*) pTols ) : sal_False ); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent, short nChannelRPercent, short nChannelGPercent, short nChannelBPercent, double fGamma, sal_Bool bInvert ) @@ -743,30 +667,22 @@ sal_Bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent, fGamma, bInvert ) : sal_False ); } -// ------------------------------------------------------------------ - sal_Bool BitmapEx::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress ) { return( !!aBitmap ? aBitmap.Filter( eFilter, pFilterParam, pProgress ) : sal_False ); } -// ------------------------------------------------------------------ - void BitmapEx::Draw( OutputDevice* pOutDev, const Point& rDestPt ) const { pOutDev->DrawBitmapEx( rDestPt, *this ); } -// ------------------------------------------------------------------ - void BitmapEx::Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize ) const { pOutDev->DrawBitmapEx( rDestPt, rDestSize, *this ); } -// ------------------------------------------------------------------ - BitmapEx BitmapEx:: AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize) { Point aEmptyPoint(0,0); @@ -821,7 +737,6 @@ BitmapEx BitmapEx:: AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize return aRet; } -// ------------------------------------------------------------------ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const { @@ -893,8 +808,6 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const return nTransparency; } -// ------------------------------------------------------------------ - SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx ) { rBitmapEx.aBitmap.Write( rOStm ); @@ -911,8 +824,6 @@ SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx ) return rOStm; } -// ------------------------------------------------------------------ - SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx ) { Bitmap aBmp; |