From 92d3025521ec8939b66500347f8d38ed5b24e3c8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 25 May 2016 12:05:54 +0200 Subject: Convert MtfConversion to scoped enum Change-Id: I694fe139531a10467265b028ad15df0eda6d723a Reviewed-on: https://gerrit.libreoffice.org/25442 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/gdi/gdimtf.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl') 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(pColParam)->eConversion ) + if( MtfConversion::N1BitThreshold == static_cast(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 ); } -- cgit