diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-03-09 13:08:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-13 08:38:33 +0000 |
| commit | 7c0e3d0b37131b12262d0f610505b3384923c4a1 (patch) | |
| tree | 572046e375af0e25864ff2e155a0fa0226bd4ca7 /filter | |
| parent | 25ea809f5b4548ff887aa4bb10bbf7b2fe86aedb (diff) | |
convert GraphicDrawMode to scoped enum
Change-Id: I18eec89c4e1ebb86d64297e7cef4b36bf12df59f
Reviewed-on: https://gerrit.libreoffice.org/35004
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index b32f965ef8b0..4c8cc125978c 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -3984,7 +3984,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject || pGraphicAttr->IsAdjusted() ) { SvMemoryStream aSt( sizeof( GraphicAttr ) ); - aSt.WriteUInt16( pGraphicAttr->GetDrawMode() ) + aSt.WriteUInt16( (sal_uInt16)pGraphicAttr->GetDrawMode() ) .WriteUInt32( static_cast<sal_uInt32>(pGraphicAttr->GetMirrorFlags()) ) .WriteInt32( pGraphicAttr->GetLeftCrop() ) .WriteInt32( pGraphicAttr->GetTopCrop() ) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 2393e288bce3..d170540f7178 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3859,11 +3859,11 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons } sal_Int16 nBrightness = (sal_Int16)( (sal_Int32)GetPropertyValue( DFF_Prop_pictureBrightness, 0 ) / 327 ); sal_Int32 nGamma = GetPropertyValue( DFF_Prop_pictureGamma, 0x10000 ); - GraphicDrawMode eDrawMode = GRAPHICDRAWMODE_STANDARD; + GraphicDrawMode eDrawMode = GraphicDrawMode::Standard; switch ( GetPropertyValue( DFF_Prop_pictureActive, 0 ) & 6 ) { - case 4 : eDrawMode = GRAPHICDRAWMODE_GREYS; break; - case 6 : eDrawMode = GRAPHICDRAWMODE_MONO; break; + case 4 : eDrawMode = GraphicDrawMode::Greys; break; + case 6 : eDrawMode = GraphicDrawMode::Mono; break; case 0 : { //office considers the converted values of (in OOo) 70 to be the @@ -3873,13 +3873,13 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons { nContrast = 0; nBrightness = 0; - eDrawMode = GRAPHICDRAWMODE_WATERMARK; + eDrawMode = GraphicDrawMode::Watermark; }; } break; } - if ( nContrast || nBrightness || ( nGamma != 0x10000 ) || ( eDrawMode != GRAPHICDRAWMODE_STANDARD ) ) + if ( nContrast || nBrightness || ( nGamma != 0x10000 ) || ( eDrawMode != GraphicDrawMode::Standard ) ) { // MSO uses a different algorithm for contrast+brightness, LO applies contrast before brightness, // while MSO apparently applies half of brightness before contrast and half after. So if only @@ -3894,16 +3894,16 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons rSet.Put( SdrGrafContrastItem( (sal_Int16)nContrast ) ); if ( nGamma != 0x10000 ) rSet.Put( SdrGrafGamma100Item( nGamma / 655 ) ); - if ( eDrawMode != GRAPHICDRAWMODE_STANDARD ) + if ( eDrawMode != GraphicDrawMode::Standard ) rSet.Put( SdrGrafModeItem( eDrawMode ) ); } else { - if ( eDrawMode == GRAPHICDRAWMODE_WATERMARK ) + if ( eDrawMode == GraphicDrawMode::Watermark ) { nContrast = 60; nBrightness = 70; - eDrawMode = GRAPHICDRAWMODE_STANDARD; + eDrawMode = GraphicDrawMode::Standard; } switch ( aGraf.GetType() ) { @@ -3912,9 +3912,9 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons BitmapEx aBitmapEx( aGraf.GetBitmapEx() ); if ( nBrightness || nContrast || ( nGamma != 0x10000 ) ) aBitmapEx.Adjust( nBrightness, (sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x10000, false, true ); - if ( eDrawMode == GRAPHICDRAWMODE_GREYS ) + if ( eDrawMode == GraphicDrawMode::Greys ) aBitmapEx.Convert( BmpConversion::N8BitGreys ); - else if ( eDrawMode == GRAPHICDRAWMODE_MONO ) + else if ( eDrawMode == GraphicDrawMode::Mono ) aBitmapEx.Convert( BmpConversion::N1BitThreshold ); aGraf = aBitmapEx; @@ -3926,9 +3926,9 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons GDIMetaFile aGdiMetaFile( aGraf.GetGDIMetaFile() ); if ( nBrightness || nContrast || ( nGamma != 0x10000 ) ) aGdiMetaFile.Adjust( nBrightness, (sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x10000, false, true ); - if ( eDrawMode == GRAPHICDRAWMODE_GREYS ) + if ( eDrawMode == GraphicDrawMode::Greys ) aGdiMetaFile.Convert( MtfConversion::N8BitGreys ); - else if ( eDrawMode == GRAPHICDRAWMODE_MONO ) + else if ( eDrawMode == GraphicDrawMode::Mono ) aGdiMetaFile.Convert( MtfConversion::N1BitThreshold ); aGraf = aGdiMetaFile; } |