From 715df6e9f8926e511dbdee52367ec08676f71952 Mon Sep 17 00:00:00 2001 From: Bartosz Kosiorek Date: Fri, 14 Apr 2017 00:04:57 +0200 Subject: tdf#107159 EMF+ Add support for EmfPlusDrawArc record EmfPlusDrawArc record specifies drawing the arc of an ellipse. Change-Id: I87788a9b14f518a383cbc5b804af635427e4c395 Reviewed-on: https://gerrit.libreoffice.org/36537 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek --- cppcanvas/source/mtfrenderer/emfplus.cxx | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index f1e2f4f7f401..6b2d8d84db06 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -76,7 +76,7 @@ namespace #define EmfPlusRecordTypeDrawEllipse 0x400F #define EmfPlusRecordTypeFillPie 0x4010 #define EmfPlusRecordTypeDrawPie 0x4011 -//TODO EmfPlusRecordTypeDrawArc 0x4012 +#define EmfPlusRecordTypeDrawArc 0x4012 //TODO EmfPlusRecordTypeFillRegion 0x4013 #define EmfPlusRecordTypeFillPath 0x4014 #define EmfPlusRecordTypeDrawPath 0x4015 @@ -155,6 +155,7 @@ const char* emfTypeToName(sal_uInt16 type) case EmfPlusRecordTypeDrawEllipse: return "EmfPlusRecordTypeDrawEllipse"; case EmfPlusRecordTypeFillPie: return "EmfPlusRecordTypeFillPie"; case EmfPlusRecordTypeDrawPie: return "EmfPlusRecordTypeDrawPie"; + case EmfPlusRecordTypeDrawArc: return "EmfPlusRecordTypeDrawArc"; case EmfPlusRecordTypeFillPath: return "EmfPlusRecordTypeFillPath"; case EmfPlusRecordTypeDrawPath: return "EmfPlusRecordTypeDrawPath"; case EmfPlusRecordTypeDrawBeziers: return "EmfPlusRecordTypeDrawBeziers"; @@ -892,6 +893,7 @@ namespace cppcanvas break; case EmfPlusRecordTypeFillPie: case EmfPlusRecordTypeDrawPie: + case EmfPlusRecordTypeDrawArc: { float startAngle, sweepAngle; @@ -903,10 +905,14 @@ namespace cppcanvas rMF.ReadUInt32( brushIndexOrColor ); SAL_INFO("cppcanvas.emf", "EMF+ FillPie colorOrIndex: " << brushIndexOrColor); } - else + else if ( type == EmfPlusRecordTypeDrawPie ) { SAL_INFO("cppcanvas.emf", "EMF+ DrawPie"); } + else + { + SAL_INFO("cppcanvas.emf", "EMF+ DrawArc"); + } rMF.ReadFloat( startAngle ).ReadFloat( sweepAngle ); float dx, dy, dw, dh; @@ -937,8 +943,11 @@ namespace cppcanvas " startAngle: " << startAngle << " sweepAngle: " << sweepAngle); B2DPolygon polygon = basegfx::tools::createPolygonFromEllipseSegment (mappedCenter, mappedSize.getX (), mappedSize.getY (), startAngle, endAngle); - polygon.append (mappedCenter); - polygon.setClosed (true); + if ( type != EmfPlusRecordTypeDrawArc ) + { + polygon.append (mappedCenter); + polygon.setClosed (true); + } B2DPolyPolygon polyPolygon (polygon); if ( type == EmfPlusRecordTypeFillPie ) -- cgit v1.2.3