diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-25 12:05:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-26 07:25:53 +0000 |
| commit | 92d3025521ec8939b66500347f8d38ed5b24e3c8 (patch) | |
| tree | 49caa68d29d8dea2421c88a674f1773877956dc5 | |
| parent | 702eb3d389f7525674f0743a46c987bc981394f3 (diff) | |
Convert MtfConversion to scoped enum
Change-Id: I694fe139531a10467265b028ad15df0eda6d723a
Reviewed-on: https://gerrit.libreoffice.org/25442
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
| -rw-r--r-- | include/vcl/gdimtf.hxx | 8 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 1728f90553a0..cf802ecbdede 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3930,9 +3930,9 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons if ( nBrightness || nContrast || ( nGamma != 0x10000 ) ) aGdiMetaFile.Adjust( nBrightness, (sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x10000, false, true ); if ( eDrawMode == GRAPHICDRAWMODE_GREYS ) - aGdiMetaFile.Convert( MTF_CONVERSION_8BIT_GREYS ); + aGdiMetaFile.Convert( MtfConversion::N8BitGreys ); else if ( eDrawMode == GRAPHICDRAWMODE_MONO ) - aGdiMetaFile.Convert( MTF_CONVERSION_1BIT_THRESHOLD ); + aGdiMetaFile.Convert( MtfConversion::N1BitThreshold ); aGraf = aGdiMetaFile; } break; diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 332e110c99b4..e75107f1b4e1 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -43,11 +43,11 @@ class Gradient; #define GDI_METAFILE_END ((size_t)0xFFFFFFFF) #define GDI_METAFILE_LABEL_NOTFOUND ((size_t)0xFFFFFFFF) -enum MtfConversion +enum class MtfConversion { - MTF_CONVERSION_NONE = 0, - MTF_CONVERSION_1BIT_THRESHOLD = 1, - MTF_CONVERSION_8BIT_GREYS = 2 + NONE = 0, + N1BitThreshold = 1, + N8BitGreys = 2 }; diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 70291ebbea8e..1f934f786c69 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -1513,11 +1513,11 @@ void GraphicManager::ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, Gr switch( aAttr.GetDrawMode() ) { case GRAPHICDRAWMODE_MONO: - rMtf.Convert( MTF_CONVERSION_1BIT_THRESHOLD ); + rMtf.Convert( MtfConversion::N1BitThreshold ); break; case GRAPHICDRAWMODE_GREYS: - rMtf.Convert( MTF_CONVERSION_8BIT_GREYS ); + rMtf.Convert( MtfConversion::N8BitGreys ); break; case GRAPHICDRAWMODE_WATERMARK: diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 9185ded909c5..ea29eef04680 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -1848,7 +1848,7 @@ Color GDIMetaFile::ImplColConvertFnc( const Color& rColor, const void* pColParam { sal_uInt8 cLum = rColor.GetLuminance(); - if( MTF_CONVERSION_1BIT_THRESHOLD == static_cast<const ImplColConvertParam*>(pColParam)->eConversion ) + if( MtfConversion::N1BitThreshold == static_cast<const ImplColConvertParam*>(pColParam)->eConversion ) cLum = ( cLum < 128 ) ? 0 : 255; return Color( rColor.GetTransparency(), cLum, cLum, cLum ); @@ -2269,13 +2269,13 @@ void GDIMetaFile::Adjust( short nLuminancePercent, short nContrastPercent, void GDIMetaFile::Convert( MtfConversion eConversion ) { // nothing to do? => return quickly - if( eConversion != MTF_CONVERSION_NONE ) + if( eConversion != MtfConversion::NONE ) { ImplColConvertParam aColParam; ImplBmpConvertParam aBmpParam; aColParam.eConversion = eConversion; - aBmpParam.eConversion = ( MTF_CONVERSION_1BIT_THRESHOLD == eConversion ) ? BMP_CONVERSION_1BIT_THRESHOLD : BMP_CONVERSION_8BIT_GREYS; + aBmpParam.eConversion = ( MtfConversion::N1BitThreshold == eConversion ) ? BMP_CONVERSION_1BIT_THRESHOLD : BMP_CONVERSION_8BIT_GREYS; ImplExchangeColors( ImplColConvertFnc, &aColParam, ImplBmpConvertFnc, &aBmpParam ); } |