From 044dc9fcca4df6ca21df790bdb14660f951e4598 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Wed, 21 Jun 2017 12:19:52 +0200 Subject: emfplus: migrate gdiplus reader to drawinglayer In the current state interpretation of the GDI+ data is needed in the MetafilePrimitive in the drawinglayer project. Migrate helper stuff and reader from cppcanvas to drawinglayer as tooling, prepare tooling, prepare changing from direct canvas rendering, isolate and migrate existing tooling from MetafilePrimitive from reading emf/wmf to places where it can be commonly used by both, prepare cange of different graphic statue usages, start changing XForm to B2DHomMatrix conversions, ... Change-Id: I2d6954f69464653d111abb316fd9654ad3499c3f --- drawinglayer/Library_drawinglayer.mk | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'drawinglayer/Library_drawinglayer.mk') diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 32daccd9d43e..f9e61604fce7 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -9,6 +9,11 @@ $(eval $(call gb_Library_Library,drawinglayer)) +$(eval $(call gb_Library_set_include,drawinglayer,\ + $$(INCLUDE) \ + -I$(SRCDIR)/drawinglayer/inc \ +)) + $(eval $(call gb_Library_add_defs,drawinglayer,\ -DDRAWINGLAYER_DLLIMPLEMENTATION \ )) @@ -68,7 +73,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive2d/bitmapprimitive2d \ drawinglayer/source/primitive2d/borderlineprimitive2d \ drawinglayer/source/primitive2d/controlprimitive2d \ - drawinglayer/source/primitive2d/cropprimitive2d \ + drawinglayer/source/primitive2d/cropprimitive2d \ drawinglayer/source/primitive2d/discretebitmapprimitive2d \ drawinglayer/source/primitive2d/discreteshadowprimitive2d \ drawinglayer/source/primitive2d/embedded3dprimitive2d \ @@ -76,7 +81,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive2d/fillgraphicprimitive2d \ drawinglayer/source/primitive2d/fillgradientprimitive2d \ drawinglayer/source/primitive2d/fillhatchprimitive2d \ - drawinglayer/source/primitive2d/graphicprimitivehelper2d \ + drawinglayer/source/primitive2d/graphicprimitivehelper2d \ drawinglayer/source/primitive2d/graphicprimitive2d \ drawinglayer/source/primitive2d/gridprimitive2d \ drawinglayer/source/primitive2d/groupprimitive2d \ @@ -90,7 +95,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive2d/modifiedcolorprimitive2d \ drawinglayer/source/primitive2d/objectinfoprimitive2d \ drawinglayer/source/primitive2d/pagepreviewprimitive2d \ - drawinglayer/source/primitive2d/patternfillprimitive2d \ + drawinglayer/source/primitive2d/patternfillprimitive2d \ drawinglayer/source/primitive2d/pointarrayprimitive2d \ drawinglayer/source/primitive2d/polygonprimitive2d \ drawinglayer/source/primitive2d/polypolygonprimitive2d \ @@ -99,8 +104,8 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive2d/sdrdecompositiontools2d \ drawinglayer/source/primitive2d/shadowprimitive2d \ drawinglayer/source/primitive2d/structuretagprimitive2d \ - drawinglayer/source/primitive2d/svggradientprimitive2d \ - drawinglayer/source/primitive2d/textbreakuphelper \ + drawinglayer/source/primitive2d/svggradientprimitive2d \ + drawinglayer/source/primitive2d/textbreakuphelper \ drawinglayer/source/primitive2d/textdecoratedprimitive2d \ drawinglayer/source/primitive2d/texteffectprimitive2d \ drawinglayer/source/primitive2d/textenumsprimitive2d \ @@ -134,7 +139,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive3d/textureprimitive3d \ drawinglayer/source/primitive3d/transformprimitive3d \ drawinglayer/source/processor2d/baseprocessor2d \ - drawinglayer/source/processor2d/processor2dtools \ + drawinglayer/source/processor2d/processor2dtools \ drawinglayer/source/processor2d/contourextractor2d \ drawinglayer/source/processor2d/getdigitlanguage \ drawinglayer/source/processor2d/helperwrongspellrenderer \ @@ -154,9 +159,20 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/processor3d/shadow3dextractor \ drawinglayer/source/processor3d/zbufferprocessor3d \ drawinglayer/source/texture/texture3d \ - drawinglayer/source/tools/converters \ - drawinglayer/source/drawinglayeruno/drawinglayeruno \ - drawinglayer/source/drawinglayeruno/xprimitive2drenderer \ + drawinglayer/source/tools/converters \ + drawinglayer/source/tools/emfplushelper \ + drawinglayer/source/tools/emfphelperdata \ + drawinglayer/source/tools/emfpbrush \ + drawinglayer/source/tools/emfppath \ + drawinglayer/source/tools/emfppen \ + drawinglayer/source/tools/emfpregion \ + drawinglayer/source/tools/emfpimage \ + drawinglayer/source/tools/emfpfont \ + drawinglayer/source/tools/emfpstringformat \ + drawinglayer/source/tools/emfpcustomlinecap \ + drawinglayer/source/tools/wmfemfhelper \ + drawinglayer/source/drawinglayeruno/drawinglayeruno \ + drawinglayer/source/drawinglayeruno/xprimitive2drenderer \ drawinglayer/source/texture/texture \ drawinglayer/source/dumper/XShapeDumper \ drawinglayer/source/dumper/EnhancedShapeDumper \ -- cgit v1.2.3