diff options
author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2017-11-05 00:02:49 +0100 |
---|---|---|
committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2017-11-16 21:55:54 +0100 |
commit | d0c4cee7e5ad00363d264aec0011a4b07983b19d (patch) | |
tree | fa15f8e5dd76f92681455572d4a7f99bedc0c409 /drawinglayer/source/tools/emfpcustomlinecap.cxx | |
parent | silence coverity#1421084 Uncaught exception (diff) | |
download | core-d0c4cee7e5ad00363d264aec0011a4b07983b19d.tar.gz core-d0c4cee7e5ad00363d264aec0011a4b07983b19d.zip |
tdf#113704 Implement proper reading of the EmfPlusRegionNode
Regions are specified as a binary tree of region nodes, and each node must
either be a terminal node or specify one or two child nodes.
Nodes contains two child nodes:
RegionNodeDataTypeAnd = 0x00000001,
RegionNodeDataTypeOr = 0x00000002,
RegionNodeDataTypeXor = 0x00000003,
RegionNodeDataTypeExclude = 0x00000004,
RegionNodeDataTypeComplement = 0x00000005,
Terminal nodes:
RegionNodeDataTypeRect = 0x10000000,
RegionNodeDataTypePath = 0x10000001,
RegionNodeDataTypeEmpty = 0x10000002,
RegionNodeDataTypeInfinite = 0x10000003
RegionNode must contain at least one element.
Change-Id: I668e5892701b979f09bcf5bbce44a43226676192
Reviewed-on: https://gerrit.libreoffice.org/44324
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Tested-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'drawinglayer/source/tools/emfpcustomlinecap.cxx')
-rw-r--r-- | drawinglayer/source/tools/emfpcustomlinecap.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drawinglayer/source/tools/emfpcustomlinecap.cxx b/drawinglayer/source/tools/emfpcustomlinecap.cxx index 4357276a18f8..91eeb4ea8c52 100644 --- a/drawinglayer/source/tools/emfpcustomlinecap.cxx +++ b/drawinglayer/source/tools/emfpcustomlinecap.cxx @@ -81,7 +81,7 @@ namespace emfplushelper SAL_INFO("drawinglayer", "EMF+\t\theader: 0x" << std::hex << pathHeader << " points: " << std::dec << pathPoints << " additional flags: 0x" << std::hex << pathFlags << std::dec); EMFPPath path(pathPoints); - path.Read(s, pathFlags, rR); + path.Read(s, pathFlags); polygon = path.GetPolygon(rR, false); mbIsFilled = bFill; |