[Libreoffice-commits] core.git: drawinglayer/source include/vcl svx/source vcl/osx vcl/source vcl/unx
Noel Grandin
noelgrandin at gmail.com
Mon May 30 06:38:29 UTC 2016
drawinglayer/source/texture/texture3d.cxx | 6 +-
include/vcl/bitmapex.hxx | 8 +--
svx/source/svdraw/svdfmtf.cxx | 4 -
vcl/osx/salinst.cxx | 4 -
vcl/source/gdi/bitmapex.cxx | 62 +++++++++++++++---------------
vcl/source/gdi/dibtools.cxx | 17 ++++----
vcl/source/gdi/pdfwriter_impl.cxx | 6 +-
vcl/source/image/Image.cxx | 2
vcl/source/outdev/bitmap.cxx | 6 +-
vcl/unx/generic/window/salframe.cxx | 8 +--
10 files changed, 62 insertions(+), 61 deletions(-)
New commits:
commit 6a5a2350c1c4924dd3fe92c8a3016c8c8ca1c275
Author: Noel Grandin <noelgrandin at gmail.com>
Date: Sun May 29 12:35:04 2016 +0200
convert TransparentType to scoped enum
Change-Id: I25ec59fd41b5aa8741a9e864b5204481a84c3ba6
Reviewed-on: https://gerrit.libreoffice.org/25601
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index a3915d5..4e4d19b 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -117,11 +117,11 @@ namespace drawinglayer
{
switch(maBitmapEx.GetTransparentType())
{
- case TRANSPARENT_NONE:
+ case TransparentType::NONE:
{
break;
}
- case TRANSPARENT_COLOR:
+ case TransparentType::Color:
{
const BitmapColor aBitmapColor(mpReadBitmap->GetColor(rY, rX));
@@ -132,7 +132,7 @@ namespace drawinglayer
break;
}
- case TRANSPARENT_BITMAP:
+ case TransparentType::Bitmap:
{
OSL_ENSURE(mpReadTransparence, "OOps, transparence type Bitmap, but no read access created in the constructor (?)");
const BitmapColor aBitmapColor(mpReadTransparence->GetPixel(rY, rX));
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 28e1d89..fd2c9a7 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -33,11 +33,11 @@ namespace com { namespace sun { namespace star { namespace rendering {
class XBitmapCanvas;
} } } }
-enum TransparentType
+enum class TransparentType
{
- TRANSPARENT_NONE,
- TRANSPARENT_COLOR,
- TRANSPARENT_BITMAP
+ NONE,
+ Color,
+ Bitmap
};
class VCL_DLLPUBLIC BitmapEx
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 31d488b..f2f186e 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1586,11 +1586,11 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct)
{
aOldMask = aBitmapEx.GetAlpha();
}
- else if(TRANSPARENT_BITMAP == aBitmapEx.GetTransparentType())
+ else if(TransparentType::Bitmap == aBitmapEx.GetTransparentType())
{
aOldMask = aBitmapEx.GetMask();
}
- else if(TRANSPARENT_COLOR == aBitmapEx.GetTransparentType())
+ else if(TransparentType::Color == aBitmapEx.GetTransparentType())
{
aOldMask = aBitmapEx.GetBitmap().CreateMask(aBitmapEx.GetTransparentColor());
}
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 3bbff24..31b1542 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -1052,7 +1052,7 @@ CGImageRef CreateCGImage( const Image& rImage )
else
xImage = pSalBmp->CreateCroppedImage( 0, 0, pSalBmp->mnWidth, pSalBmp->mnHeight );
}
- else if( aBmpEx.GetTransparentType() == TRANSPARENT_BITMAP )
+ else if( aBmpEx.GetTransparentType() == TransparentType::Bitmap )
{
Bitmap aMask( aBmpEx.GetMask() );
QuartzSalBitmap* pMaskBmp = static_cast<QuartzSalBitmap*>(aMask.ImplGetImpBitmap()->ImplGetSalBitmap());
@@ -1061,7 +1061,7 @@ CGImageRef CreateCGImage( const Image& rImage )
else
xImage = pSalBmp->CreateCroppedImage( 0, 0, pSalBmp->mnWidth, pSalBmp->mnHeight );
}
- else if( aBmpEx.GetTransparentType() == TRANSPARENT_COLOR )
+ else if( aBmpEx.GetTransparentType() == TransparentType::Color )
{
Color aTransColor( aBmpEx.GetTransparentColor() );
SalColor nTransColor = MAKE_SALCOLOR( aTransColor.GetRed(), aTransColor.GetGreen(), aTransColor.GetBlue() );
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index ed911d0..220c716 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -49,7 +49,7 @@
using namespace ::com::sun::star;
BitmapEx::BitmapEx() :
- eTransparent( TRANSPARENT_NONE ),
+ eTransparent( TransparentType::NONE ),
bAlpha ( false )
{
}
@@ -65,7 +65,7 @@ BitmapEx::BitmapEx( const BitmapEx& rBitmapEx ) :
}
BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ) :
- eTransparent( TRANSPARENT_NONE ),
+ eTransparent( TransparentType::NONE ),
bAlpha ( false )
{
if( rBitmapEx.IsEmpty() )
@@ -92,7 +92,7 @@ BitmapEx::BitmapEx( const OUString& rIconName )
}
BitmapEx::BitmapEx( const ResId& rResId ) :
- eTransparent( TRANSPARENT_NONE ),
+ eTransparent( TransparentType::NONE ),
bAlpha ( false )
{
ResMgr* pResMgr = nullptr;
@@ -124,7 +124,7 @@ void BitmapEx::loadFromIconTheme( const OUString& rIconName )
BitmapEx::BitmapEx( const Bitmap& rBmp ) :
aBitmap ( rBmp ),
aBitmapSize ( aBitmap.GetSizePixel() ),
- eTransparent( TRANSPARENT_NONE ),
+ eTransparent( TransparentType::NONE ),
bAlpha ( false )
{
}
@@ -133,7 +133,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) :
aBitmap ( rBmp ),
aMask ( rMask ),
aBitmapSize ( aBitmap.GetSizePixel() ),
- eTransparent ( !rMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
+ eTransparent ( !rMask ? TransparentType::NONE : TransparentType::Bitmap ),
bAlpha ( false )
{
if(!!aBitmap && !!aMask && aBitmap.GetSizePixel() != aMask.GetSizePixel())
@@ -154,7 +154,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) :
aBitmap ( rBmp ),
aMask ( rAlphaMask.ImplGetBitmap() ),
aBitmapSize ( aBitmap.GetSizePixel() ),
- eTransparent ( !rAlphaMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
+ eTransparent ( !rAlphaMask ? TransparentType::NONE : TransparentType::Bitmap ),
bAlpha ( !rAlphaMask.IsEmpty() )
{
if(!!aBitmap && !!aMask && aBitmap.GetSizePixel() != aMask.GetSizePixel())
@@ -174,7 +174,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor ) :
aBitmap ( rBmp ),
aBitmapSize ( aBitmap.GetSizePixel() ),
aTransparentColor ( rTransparentColor ),
- eTransparent ( TRANSPARENT_BITMAP ),
+ eTransparent ( TransparentType::Bitmap ),
bAlpha ( false )
{
aMask = aBitmap.CreateMask( aTransparentColor );
@@ -213,10 +213,10 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const
if( aBitmapSize != rBitmapEx.aBitmapSize )
return false;
- if( eTransparent == TRANSPARENT_NONE )
+ if( eTransparent == TransparentType::NONE )
return true;
- if( eTransparent == TRANSPARENT_COLOR )
+ if( eTransparent == TransparentType::Color )
return aTransparentColor == rBitmapEx.aTransparentColor;
return( ( aMask == rBitmapEx.aMask ) && ( bAlpha == rBitmapEx.bAlpha ) );
@@ -231,7 +231,7 @@ void BitmapEx::SetEmpty()
{
aBitmap.SetEmpty();
aMask.SetEmpty();
- eTransparent = TRANSPARENT_NONE;
+ eTransparent = TransparentType::NONE;
bAlpha = false;
}
@@ -242,7 +242,7 @@ void BitmapEx::Clear()
bool BitmapEx::IsTransparent() const
{
- return( eTransparent != TRANSPARENT_NONE );
+ return( eTransparent != TransparentType::NONE );
}
bool BitmapEx::IsAlpha() const
@@ -254,11 +254,11 @@ Bitmap BitmapEx::GetBitmap( const Color* pTransReplaceColor ) const
{
Bitmap aRetBmp( aBitmap );
- if( pTransReplaceColor && ( eTransparent != TRANSPARENT_NONE ) )
+ if( pTransReplaceColor && ( eTransparent != TransparentType::NONE ) )
{
Bitmap aTempMask;
- if( eTransparent == TRANSPARENT_COLOR )
+ if( eTransparent == TransparentType::Color )
aTempMask = aBitmap.CreateMask( aTransparentColor );
else
aTempMask = aMask;
@@ -300,7 +300,7 @@ sal_uLong BitmapEx::GetSizeBytes() const
{
sal_uLong nSizeBytes = aBitmap.GetSizeBytes();
- if( eTransparent == TRANSPARENT_BITMAP )
+ if( eTransparent == TransparentType::Bitmap )
nSizeBytes += aMask.GetSizeBytes();
return nSizeBytes;
@@ -318,7 +318,7 @@ BitmapChecksum BitmapEx::GetChecksum() const
UInt32ToSVBT32( (long) bAlpha, aBT32 );
nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
- if( ( TRANSPARENT_BITMAP == eTransparent ) && !aMask.IsEmpty() )
+ if( ( TransparentType::Bitmap == eTransparent ) && !aMask.IsEmpty() )
{
BCToBCOA( aMask.GetChecksum(), aBCOA );
nCrc = vcl_get_checksum( nCrc, aBCOA, BITMAP_CHECKSUM_SIZE );
@@ -343,7 +343,7 @@ bool BitmapEx::Invert()
{
bRet = aBitmap.Invert();
- if( bRet && ( eTransparent == TRANSPARENT_COLOR ) )
+ if( bRet && ( eTransparent == TransparentType::Color ) )
aTransparentColor = BitmapColor( aTransparentColor ).Invert();
}
@@ -358,7 +358,7 @@ bool BitmapEx::Mirror( BmpMirrorFlags nMirrorFlags )
{
bRet = aBitmap.Mirror( nMirrorFlags );
- if( bRet && ( eTransparent == TRANSPARENT_BITMAP ) && !!aMask )
+ if( bRet && ( eTransparent == TransparentType::Bitmap ) && !!aMask )
aMask.Mirror( nMirrorFlags );
}
@@ -373,7 +373,7 @@ bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag
{
bRet = aBitmap.Scale( rScaleX, rScaleY, nScaleFlag );
- if( bRet && ( eTransparent == TRANSPARENT_BITMAP ) && !!aMask )
+ if( bRet && ( eTransparent == TransparentType::Bitmap ) && !!aMask )
{
aMask.Scale( rScaleX, rScaleY, nScaleFlag );
}
@@ -415,17 +415,17 @@ bool BitmapEx::Rotate( long nAngle10, const Color& rFillColor )
if( bTransRotate )
{
- if( eTransparent == TRANSPARENT_COLOR )
+ if( eTransparent == TransparentType::Color )
bRet = aBitmap.Rotate( nAngle10, aTransparentColor );
else
{
bRet = aBitmap.Rotate( nAngle10, COL_BLACK );
- if( eTransparent == TRANSPARENT_NONE )
+ if( eTransparent == TransparentType::NONE )
{
aMask = Bitmap( aBitmapSize, 1 );
aMask.Erase( COL_BLACK );
- eTransparent = TRANSPARENT_BITMAP;
+ eTransparent = TransparentType::Bitmap;
}
if( bRet && !!aMask )
@@ -436,7 +436,7 @@ bool BitmapEx::Rotate( long nAngle10, const Color& rFillColor )
{
bRet = aBitmap.Rotate( nAngle10, rFillColor );
- if( bRet && ( eTransparent == TRANSPARENT_BITMAP ) && !!aMask )
+ if( bRet && ( eTransparent == TransparentType::Bitmap ) && !!aMask )
aMask.Rotate( nAngle10, COL_WHITE );
}
@@ -457,7 +457,7 @@ bool BitmapEx::Crop( const Rectangle& rRectPixel )
{
bRet = aBitmap.Crop( rRectPixel );
- if( bRet && ( eTransparent == TRANSPARENT_BITMAP ) && !!aMask )
+ if( bRet && ( eTransparent == TransparentType::Bitmap ) && !!aMask )
aMask.Crop( rRectPixel );
aBitmapSize = aBitmap.GetSizePixel();
@@ -487,7 +487,7 @@ bool BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor, bo
{
bRet = aBitmap.Expand( nDX, nDY, pInitColor );
- if( bRet && ( eTransparent == TRANSPARENT_BITMAP ) && !!aMask )
+ if( bRet && ( eTransparent == TransparentType::Bitmap ) && !!aMask )
{
Color aColor( bExpandTransparent ? COL_WHITE : COL_BLACK );
aMask.Expand( nDX, nDY, &aColor );
@@ -513,7 +513,7 @@ bool BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc,
{
bRet = aBitmap.CopyPixel( rRectDst, rRectSrc );
- if( bRet && ( eTransparent == TRANSPARENT_BITMAP ) && !!aMask )
+ if( bRet && ( eTransparent == TransparentType::Bitmap ) && !!aMask )
aMask.CopyPixel( rRectDst, rRectSrc );
}
}
@@ -546,7 +546,7 @@ bool BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc,
aMask = pAlpha->ImplGetBitmap();
delete pAlpha;
- eTransparent = TRANSPARENT_BITMAP;
+ eTransparent = TransparentType::Bitmap;
bAlpha = true;
aMask.CopyPixel( rRectDst, rRectSrc, &pBmpExSrc->aMask );
}
@@ -564,7 +564,7 @@ bool BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc,
{
aMask = Bitmap( GetSizePixel(), 1 );
aMask.Erase( Color( COL_BLACK ) );
- eTransparent = TRANSPARENT_BITMAP;
+ eTransparent = TransparentType::Bitmap;
aMask.CopyPixel( rRectDst, rRectSrc, &pBmpExSrc->aMask );
}
}
@@ -597,7 +597,7 @@ bool BitmapEx::Erase( const Color& rFillColor )
{
bRet = aBitmap.Erase( rFillColor );
- if( bRet && ( eTransparent == TRANSPARENT_BITMAP ) && !!aMask )
+ if( bRet && ( eTransparent == TransparentType::Bitmap ) && !!aMask )
{
// Respect transparency on fill color
if( rFillColor.GetTransparency() )
@@ -722,13 +722,13 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const
{
switch(eTransparent)
{
- case TRANSPARENT_NONE:
+ case TransparentType::NONE:
{
// Not transparent, ergo all covered
nTransparency = 0x00;
break;
}
- case TRANSPARENT_COLOR:
+ case TransparentType::Color:
{
Bitmap aTestBitmap(aBitmap);
BitmapReadAccess* pRead = aTestBitmap.AcquireReadAccess();
@@ -747,7 +747,7 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const
}
break;
}
- case TRANSPARENT_BITMAP:
+ case TransparentType::Bitmap:
{
if(!aMask.IsEmpty())
{
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 75e39e6..2b4992d 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1658,16 +1658,16 @@ bool ReadDIBBitmapEx(
if(bRetval)
{
- sal_uInt8 transparent = TRANSPARENT_NONE;
-
- rIStm.ReadUChar( transparent );
+ sal_uInt8 tmp = 0;
+ rIStm.ReadUChar( tmp );
+ TransparentType transparent = (TransparentType)tmp;
bRetval = !rIStm.GetError();
if(bRetval)
{
switch (transparent)
{
- case TRANSPARENT_BITMAP:
+ case TransparentType::Bitmap:
{
Bitmap aMask;
@@ -1694,7 +1694,7 @@ bool ReadDIBBitmapEx(
}
break;
}
- case TRANSPARENT_COLOR:
+ case TransparentType::Color:
{
Color aTransparentColor;
@@ -1707,6 +1707,7 @@ bool ReadDIBBitmapEx(
}
break;
}
+ default: break;
}
}
}
@@ -1748,13 +1749,13 @@ bool WriteDIBBitmapEx(
{
rOStm.WriteUInt32( 0x25091962 );
rOStm.WriteUInt32( 0xACB20201 );
- rOStm.WriteUChar( rSource.eTransparent );
+ rOStm.WriteUChar( (sal_uChar)rSource.eTransparent );
- if(TRANSPARENT_BITMAP == rSource.eTransparent)
+ if(TransparentType::Bitmap == rSource.eTransparent)
{
return ImplWriteDIB(rSource.aMask, nullptr, rOStm, true, true);
}
- else if(TRANSPARENT_COLOR == rSource.eTransparent)
+ else if(TransparentType::Color == rSource.eTransparent)
{
WriteColor( rOStm, rSource.aTransparentColor );
return true;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 27e4322..c04a8bd 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -11146,15 +11146,15 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
{
switch( rObject.m_aBitmap.GetTransparentType() )
{
- case TRANSPARENT_NONE:
+ case TransparentType::NONE:
// comes from drawMask function
if( aBitmap.GetBitCount() == 1 && rObject.m_bDrawMask )
bMask = true;
break;
- case TRANSPARENT_COLOR:
+ case TransparentType::Color:
aTransparentColor = rObject.m_aBitmap.GetTransparentColor();
break;
- case TRANSPARENT_BITMAP:
+ case TransparentType::Bitmap:
bWriteMask = true;
break;
}
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index 417c3fe..20c3777 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -67,7 +67,7 @@ Image::Image( const ResId& rResId ) :
if( nObjMask & RscImageFlags::MaskColor )
{
- if( !aBmpEx.IsEmpty() && aBmpEx.GetTransparentType() == TRANSPARENT_NONE )
+ if( !aBmpEx.IsEmpty() && aBmpEx.GetTransparentType() == TransparentType::NONE )
{
const Color aMaskColor( ResId( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()), *pResMgr ) );
aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMaskColor );
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index a07b32c..1c54f0e 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -246,7 +246,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt,
if( ImplIsRecordLayout() )
return;
- if( TRANSPARENT_NONE == rBitmapEx.GetTransparentType() )
+ if( TransparentType::NONE == rBitmapEx.GetTransparentType() )
{
DrawBitmap( rDestPt, rBitmapEx.GetBitmap() );
}
@@ -265,7 +265,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
if( ImplIsRecordLayout() )
return;
- if ( TRANSPARENT_NONE == rBitmapEx.GetTransparentType() )
+ if ( TransparentType::NONE == rBitmapEx.GetTransparentType() )
{
DrawBitmap( rDestPt, rDestSize, rBitmapEx.GetBitmap() );
}
@@ -285,7 +285,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
if( ImplIsRecordLayout() )
return;
- if( TRANSPARENT_NONE == rBitmapEx.GetTransparentType() )
+ if( TransparentType::NONE == rBitmapEx.GetTransparentType() )
{
DrawBitmap( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, rBitmapEx.GetBitmap() );
}
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 061abbf..c6d728d 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -216,16 +216,16 @@ static void CreateNetWmAppIcon( sal_uInt16 nIcon, NetWmIconData& netwm_icon )
AlphaMask mask;
switch( aIcon.GetTransparentType())
{
- case TRANSPARENT_NONE:
+ case TransparentType::NONE:
{
sal_uInt8 nTrans = 0;
mask = AlphaMask( icon.GetSizePixel(), &nTrans );
}
break;
- case TRANSPARENT_COLOR:
+ case TransparentType::Color:
mask = AlphaMask( icon.CreateMask( aIcon.GetTransparentColor() ) );
break;
- case TRANSPARENT_BITMAP:
+ case TransparentType::Bitmap:
mask = aIcon.GetAlpha();
break;
}
@@ -294,7 +294,7 @@ static bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXScreen
icon_mask = None;
- if( TRANSPARENT_BITMAP == aIcon.GetTransparentType() )
+ if( TransparentType::Bitmap == aIcon.GetTransparentType() )
{
icon_mask = XCreatePixmap( pDisplay->GetDisplay(),
pDisplay->GetRootWindow( pDisplay->GetDefaultXScreen() ),
More information about the Libreoffice-commits
mailing list