diff options
author | Noel Grandin <noel@peralex.com> | 2015-06-02 15:50:22 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-06-04 08:30:24 +0200 |
commit | d4917e99709e16c3ad8178ba47c6e1c656071082 (patch) | |
tree | d7aa174b961847c488a2edcd5e848a0f3201c85f /vcl | |
parent | ab377324bb8fe081f1e01cd04f534bcf817fda28 (diff) |
convert basebmp::Format to scoped enum
Change-Id: I6eb213d6dcf387936967271fba9e2de3879ef479
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/android/androidinst.cxx | 2 | ||||
-rw-r--r-- | vcl/headless/svpbmp.cxx | 102 | ||||
-rw-r--r-- | vcl/headless/svpinst.cxx | 18 | ||||
-rw-r--r-- | vcl/headless/svptextrender.cxx | 53 | ||||
-rw-r--r-- | vcl/headless/svpvd.cxx | 2 | ||||
-rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 7 | ||||
-rw-r--r-- | vcl/inc/headless/svpbmp.hxx | 2 | ||||
-rw-r--r-- | vcl/ios/iosinst.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 2 |
9 files changed, 95 insertions, 95 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index ea91e7a76da6..ce46fee6504f 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -121,7 +121,7 @@ public: sal_uLong nSalFrameStyle, SystemParentData *pSysParent ) : SvpSalFrame( pInstance, pParent, nSalFrameStyle, - true, basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA, + true, basebmp::Format::ThirtyTwoBitTcMaskRGBA, pSysParent ) { enableDamageTracker(); diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index 20ae87083b32..7e54bc083dbb 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -143,49 +143,49 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) sal_uInt16 nBitCount = 1; switch( m_aBitmap->getScanlineFormat() ) { - case FORMAT_ONE_BIT_MSB_GREY: - case FORMAT_ONE_BIT_MSB_PAL: + case Format::OneBitMsbGrey: + case Format::OneBitMsbPal: nBitCount = 1; pBuf->mnFormat = BMP_FORMAT_1BIT_MSB_PAL; break; - case FORMAT_ONE_BIT_LSB_GREY: - case FORMAT_ONE_BIT_LSB_PAL: + case Format::OneBitLsbGrey: + case Format::OneBitLsbPal: nBitCount = 1; pBuf->mnFormat = BMP_FORMAT_1BIT_LSB_PAL; break; - case FORMAT_FOUR_BIT_MSB_GREY: - case FORMAT_FOUR_BIT_MSB_PAL: + case Format::FourBitMsbGrey: + case Format::FourBitMsbPal: nBitCount = 4; pBuf->mnFormat = BMP_FORMAT_4BIT_MSN_PAL; break; - case FORMAT_FOUR_BIT_LSB_GREY: - case FORMAT_FOUR_BIT_LSB_PAL: + case Format::FourBitLsbGrey: + case Format::FourBitLsbPal: nBitCount = 4; pBuf->mnFormat = BMP_FORMAT_4BIT_LSN_PAL; break; - case FORMAT_EIGHT_BIT_PAL: + case Format::EightBitPal: nBitCount = 8; pBuf->mnFormat = BMP_FORMAT_8BIT_PAL; break; - case FORMAT_EIGHT_BIT_GREY: + case Format::EightBitGrey: nBitCount = 8; pBuf->mnFormat = BMP_FORMAT_8BIT_PAL; break; - case FORMAT_SIXTEEN_BIT_LSB_TC_MASK: + case Format::SixteenBitLsbTcMask: nBitCount = 16; pBuf->mnFormat = BMP_FORMAT_16BIT_TC_LSB_MASK; pBuf->maColorMask = ColorMask( 0xf800, 0x07e0, 0x001f ); break; - case FORMAT_SIXTEEN_BIT_MSB_TC_MASK: + case Format::SixteenBitMsbTcMask: nBitCount = 16; pBuf->mnFormat = BMP_FORMAT_16BIT_TC_MSB_MASK; pBuf->maColorMask = ColorMask( 0xf800, 0x07e0, 0x001f ); break; - case FORMAT_TWENTYFOUR_BIT_TC_MASK: + case Format::TwentyFourBitTcMask: nBitCount = 24; pBuf->mnFormat = BMP_FORMAT_24BIT_TC_BGR; break; - case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX: + case Format::ThirtyTwoBitTcMaskBGRX: nBitCount = 32; pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; #ifdef OSL_BIGENDIAN @@ -194,7 +194,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) pBuf->maColorMask = ColorMask( 0x00ff0000, 0x0000ff00, 0x000000ff ); #endif break; - case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA: + case Format::ThirtyTwoBitTcMaskBGRA: nBitCount = 32; pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; #ifdef OSL_BIGENDIAN @@ -203,7 +203,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) pBuf->maColorMask = ColorMask( 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 ); #endif break; - case FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB: + case Format::ThirtyTwoBitTcMaskARGB: nBitCount = 32; pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; #ifdef OSL_BIGENDIAN @@ -212,7 +212,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) pBuf->maColorMask = ColorMask( 0x0000ff00, 0x00ff0000, 0xff000000, 0x000000ff ); #endif break; - case FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR: + case Format::ThirtyTwoBitTcMaskABGR: nBitCount = 32; pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; #ifdef OSL_BIGENDIAN @@ -221,7 +221,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) pBuf->maColorMask = ColorMask( 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff ); #endif break; - case FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA: + case Format::ThirtyTwoBitTcMaskRGBA: nBitCount = 32; pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; #ifdef OSL_BIGENDIAN @@ -248,11 +248,11 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) pBuf->mpBits = m_aBitmap->getBuffer().get(); if( nBitCount <= 8 ) { - if( m_aBitmap->getScanlineFormat() == FORMAT_EIGHT_BIT_GREY || - m_aBitmap->getScanlineFormat() == FORMAT_FOUR_BIT_LSB_GREY || - m_aBitmap->getScanlineFormat() == FORMAT_FOUR_BIT_MSB_GREY || - m_aBitmap->getScanlineFormat() == FORMAT_ONE_BIT_LSB_GREY || - m_aBitmap->getScanlineFormat() == FORMAT_ONE_BIT_MSB_GREY + if( m_aBitmap->getScanlineFormat() == Format::EightBitGrey || + m_aBitmap->getScanlineFormat() == Format::FourBitLsbGrey || + m_aBitmap->getScanlineFormat() == Format::FourBitMsbGrey || + m_aBitmap->getScanlineFormat() == Format::OneBitLsbGrey || + m_aBitmap->getScanlineFormat() == Format::OneBitMsbGrey ) pBuf->maPalette = Bitmap::GetGreyPalette( 1U << nBitCount ); else @@ -287,29 +287,29 @@ void SvpSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode sal_uInt16 nBitCount = 0; switch( m_aBitmap->getScanlineFormat() ) { - case FORMAT_ONE_BIT_MSB_GREY: + case Format::OneBitMsbGrey: // FALLTHROUGH intended - case FORMAT_ONE_BIT_MSB_PAL: + case Format::OneBitMsbPal: // FALLTHROUGH intended - case FORMAT_ONE_BIT_LSB_GREY: + case Format::OneBitLsbGrey: // FALLTHROUGH intended - case FORMAT_ONE_BIT_LSB_PAL: + case Format::OneBitLsbPal: nBitCount = 1; break; - case FORMAT_FOUR_BIT_MSB_GREY: + case Format::FourBitMsbGrey: // FALLTHROUGH intended - case FORMAT_FOUR_BIT_MSB_PAL: + case Format::FourBitMsbPal: // FALLTHROUGH intended - case FORMAT_FOUR_BIT_LSB_GREY: + case Format::FourBitLsbGrey: // FALLTHROUGH intended - case FORMAT_FOUR_BIT_LSB_PAL: + case Format::FourBitLsbPal: nBitCount = 4; break; - case FORMAT_EIGHT_BIT_PAL: + case Format::EightBitPal: // FALLTHROUGH intended - case FORMAT_EIGHT_BIT_GREY: + case Format::EightBitGrey: nBitCount = 8; break; @@ -375,34 +375,34 @@ sal_uInt32 SvpSalBitmap::getBitCountFromScanlineFormat( basebmp::Format nFormat sal_uInt32 nBitCount = 1; switch( nFormat ) { - case FORMAT_ONE_BIT_MSB_GREY: - case FORMAT_ONE_BIT_LSB_GREY: - case FORMAT_ONE_BIT_MSB_PAL: - case FORMAT_ONE_BIT_LSB_PAL: + case Format::OneBitMsbGrey: + case Format::OneBitLsbGrey: + case Format::OneBitMsbPal: + case Format::OneBitLsbPal: nBitCount = 1; break; - case FORMAT_FOUR_BIT_MSB_GREY: - case FORMAT_FOUR_BIT_LSB_GREY: - case FORMAT_FOUR_BIT_MSB_PAL: - case FORMAT_FOUR_BIT_LSB_PAL: + case Format::FourBitMsbGrey: + case Format::FourBitLsbGrey: + case Format::FourBitMsbPal: + case Format::FourBitLsbPal: nBitCount = 4; break; - case FORMAT_EIGHT_BIT_PAL: - case FORMAT_EIGHT_BIT_GREY: + case Format::EightBitPal: + case Format::EightBitGrey: nBitCount = 8; break; - case FORMAT_SIXTEEN_BIT_LSB_TC_MASK: - case FORMAT_SIXTEEN_BIT_MSB_TC_MASK: + case Format::SixteenBitLsbTcMask: + case Format::SixteenBitMsbTcMask: nBitCount = 16; break; - case FORMAT_TWENTYFOUR_BIT_TC_MASK: + case Format::TwentyFourBitTcMask: nBitCount = 24; break; - case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX: - case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA: - case FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB: - case FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR: - case FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA: + case Format::ThirtyTwoBitTcMaskBGRX: + case Format::ThirtyTwoBitTcMaskBGRA: + case Format::ThirtyTwoBitTcMaskARGB: + case Format::ThirtyTwoBitTcMaskABGR: + case Format::ThirtyTwoBitTcMaskRGBA: nBitCount = 32; break; default: diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 7c94f66f0495..ddb48b8a26d3 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -427,26 +427,26 @@ Format SvpSalInstance::getFormatForBitCount( sal_uInt16 nBitCount ) switch( nBitCount ) { case 1: - return FORMAT_ONE_BIT_MSB_PAL; + return Format::OneBitMsbPal; case 4: - return FORMAT_FOUR_BIT_MSB_PAL; + return Format::FourBitMsbPal; case 8: - return FORMAT_EIGHT_BIT_PAL; + return Format::EightBitPal; case 16: #ifdef OSL_BIGENDIAN - return FORMAT_SIXTEEN_BIT_MSB_TC_MASK; + return Format::SixteenBitMsbTcMask; #else - return FORMAT_SIXTEEN_BIT_LSB_TC_MASK; + return Format::SixteenBitLsbTcMask; #endif case 24: - return FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX; + return Format::ThirtyTwoBitTcMaskBGRX; case 32: - return FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA; + return Format::ThirtyTwoBitTcMaskBGRA; case 0: #ifdef ANDROID - return FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA; + return Format::ThirtyTwoBitTcMaskRGBA; #else - return FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX; + return Format::ThirtyTwoBitTcMaskBGRX; #endif default: return SVP_DEFAULT_BITMAP_FORMAT; diff --git a/vcl/headless/svptextrender.cxx b/vcl/headless/svptextrender.cxx index 2ed928fa796c..af28eb302357 100644 --- a/vcl/headless/svptextrender.cxx +++ b/vcl/headless/svptextrender.cxx @@ -56,12 +56,13 @@ protected: virtual void RemovingFont( ServerFont& ) SAL_OVERRIDE; virtual void RemovingGlyph( GlyphData& ) SAL_OVERRIDE; - class SvpGcpHelper - { - public: - RawBitmap maRawBitmap; - BitmapDeviceSharedPtr maBitmapDev; - }; +}; + +class SvpGcpHelper +{ +public: + RawBitmap maRawBitmap; + BitmapDeviceSharedPtr maBitmapDev; }; class SvpGlyphCache : public GlyphCache @@ -113,8 +114,7 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont, if( rGlyphData.ExtDataRef().meInfo != nBmpFormat ) { - SvpGcpHelper* pGcpHelper = static_cast<SvpGcpHelper*>( - rGlyphData.ExtDataRef().mpData); + SvpGcpHelper* pGcpHelper = rGlyphData.ExtDataRef().mpData; bool bNew = pGcpHelper == 0; if( bNew ) pGcpHelper = new SvpGcpHelper; @@ -123,16 +123,16 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont, bool bFound = false; switch( nBmpFormat ) { - case FORMAT_ONE_BIT_LSB_GREY: + case Format::OneBitLsbGrey: bFound = rServerFont.GetGlyphBitmap1( aGlyphId, pGcpHelper->maRawBitmap ); break; - case FORMAT_EIGHT_BIT_GREY: + case Format::EightBitGrey: bFound = rServerFont.GetGlyphBitmap8( aGlyphId, pGcpHelper->maRawBitmap ); break; default: OSL_FAIL( "SVP GCP::GetGlyphBmp(): illegal scanline format"); // fall back to black&white mask - nBmpFormat = FORMAT_ONE_BIT_LSB_GREY; + nBmpFormat = Format::OneBitLsbGrey; bFound = false; break; } @@ -173,9 +173,8 @@ void SvpGlyphPeer::RemovingFont( ServerFont& ) void SvpGlyphPeer::RemovingGlyph( GlyphData& rGlyphData ) { - SvpGcpHelper* pGcpHelper = static_cast<SvpGcpHelper*>( - rGlyphData.ExtDataRef().mpData); - rGlyphData.ExtDataRef().meInfo = basebmp::FORMAT_NONE; + SvpGcpHelper* pGcpHelper = rGlyphData.ExtDataRef().mpData; + rGlyphData.ExtDataRef().meInfo = basebmp::Format::NONE; rGlyphData.ExtDataRef().mpData = 0; delete pGcpHelper; } @@ -183,7 +182,7 @@ void SvpGlyphPeer::RemovingGlyph( GlyphData& rGlyphData ) SvpTextRender::SvpTextRender(SvpSalGraphics& rParent) : m_rParent(rParent) , m_aTextColor(COL_BLACK) - , m_eTextFmt(basebmp::FORMAT_EIGHT_BIT_GREY) + , m_eTextFmt(basebmp::Format::EightBitGrey) { for( int i = 0; i < MAX_FALLBACK; ++i ) m_pServerFont[i] = NULL; @@ -472,22 +471,22 @@ SystemFontData SvpTextRender::GetSysFontData( int nFallbackLevel ) const void SvpTextRender::setDevice( basebmp::BitmapDeviceSharedPtr& rDevice ) { // determine matching bitmap format for masks - basebmp::Format nDeviceFmt = rDevice ? rDevice->getScanlineFormat() : basebmp::FORMAT_EIGHT_BIT_GREY; + basebmp::Format nDeviceFmt = rDevice ? rDevice->getScanlineFormat() : basebmp::Format::EightBitGrey; switch( nDeviceFmt ) { - case basebmp::FORMAT_EIGHT_BIT_GREY: - case basebmp::FORMAT_SIXTEEN_BIT_LSB_TC_MASK: - case basebmp::FORMAT_SIXTEEN_BIT_MSB_TC_MASK: - case basebmp::FORMAT_TWENTYFOUR_BIT_TC_MASK: - case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX: - case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA: - case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB: - case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR: - case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA: - m_eTextFmt = basebmp::FORMAT_EIGHT_BIT_GREY; + case basebmp::Format::EightBitGrey: + case basebmp::Format::SixteenBitLsbTcMask: + case basebmp::Format::SixteenBitMsbTcMask: + case basebmp::Format::TwentyFourBitTcMask: + case basebmp::Format::ThirtyTwoBitTcMaskBGRX: + case basebmp::Format::ThirtyTwoBitTcMaskBGRA: + case basebmp::Format::ThirtyTwoBitTcMaskARGB: + case basebmp::Format::ThirtyTwoBitTcMaskABGR: + case basebmp::Format::ThirtyTwoBitTcMaskRGBA: + m_eTextFmt = basebmp::Format::EightBitGrey; break; default: - m_eTextFmt = basebmp::FORMAT_ONE_BIT_LSB_GREY; + m_eTextFmt = basebmp::Format::OneBitLsbGrey; break; } } diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index 1dfa8c0cb848..ddd265772280 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -99,7 +99,7 @@ void InitSvpForLibreOfficeKit() { ImplSVData* pSVData = ImplGetSVData(); SvpSalInstance* pSalInstance = static_cast< SvpSalInstance* >(pSVData->mpDefInst); - pSalInstance->setBitCountFormatMapping( 32, ::basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA ); + pSalInstance->setBitCountFormatMapping( 32, ::basebmp::Format::ThirtyTwoBitTcMaskRGBA ); } #endif diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index c7c21233646b..0a352a16adfa 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -47,6 +47,7 @@ class RawBitmap; class ServerFont; class ServerFontLayout; class ServerFontLayoutEngine; +class SvpGcpHelper; namespace basegfx { class B2DPolyPolygon; } namespace vcl { struct FontCapabilities; } @@ -131,10 +132,10 @@ private: // basebmp::Format and mpData is SvpGcpHelper* struct ExtGlyphData { - int meInfo; - void* mpData; + basebmp::Format meInfo; + SvpGcpHelper* mpData; - ExtGlyphData() : meInfo(0), mpData(NULL) {} + ExtGlyphData() : meInfo(basebmp::Format::NONE), mpData(NULL) {} }; class GlyphData diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 168852e3caf2..1a331f24522d 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -27,7 +27,7 @@ #include <salbmp.hxx> -#define SVP_DEFAULT_BITMAP_FORMAT basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX +#define SVP_DEFAULT_BITMAP_FORMAT basebmp::Format::ThirtyTwoBitTcMaskBGRX class VCL_DLLPUBLIC SvpSalBitmap : public SalBitmap { diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index f2dabd53bf29..313926819d7f 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -125,7 +125,7 @@ public: sal_uLong nSalFrameStyle, SystemParentData *pSysParent ) : SvpSalFrame( pInstance, pParent, nSalFrameStyle, - true, basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA, + true, basebmp::Format::ThirtyTwoBitTcMaskRGBA, pSysParent ) { if (pParent == NULL && viewWidth > 1 && viewHeight > 1) diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index e981e053bd0c..874f250b0b16 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -2001,7 +2001,7 @@ void GtkSalFrame::AllocateFrame() aFrameSize.setY( 1 ); int cairo_stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, aFrameSize.getX()); m_aFrame = basebmp::createBitmapDevice(aFrameSize, true, - basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX, cairo_stride); + basebmp::Format::ThirtyTwoBitTcMaskBGRX, cairo_stride); m_aFrame->setDamageTracker( basebmp::IBitmapDeviceDamageTrackerSharedPtr(new DamageTracker(*this)) ); SAL_INFO("vcl.gtk3", "allocated m_aFrame size of " << maGeometry.nWidth << " x " << maGeometry.nHeight); |