Kaydet (Commit) 81d175db authored tarafından Chr. Rossmanith's avatar Chr. Rossmanith Kaydeden (comit) Norbert Thiebaud

fdo63235 - correct usage of marker-start/-end for svg path data

marker orientation will be corrected in a subsequent patch

Change-Id: I0c833b62d06ad21ebe5fbaf170cfb22cecbf146d
Reviewed-on: https://gerrit.libreoffice.org/6086Reviewed-by: 's avatarRegina Henschel <rb.henschel@t-online.de>
Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst e450a2c5
...@@ -949,7 +949,7 @@ namespace svgio ...@@ -949,7 +949,7 @@ namespace svgio
basegfx::B2DRange aClipRange; basegfx::B2DRange aClipRange;
const SvgMarkerNode* pPrepared = 0; const SvgMarkerNode* pPrepared = 0;
if(pStart) if(pStart && a==0)
{ {
if(prepare_singleMarker(aMarkerPrimitives, aMarkerTransform, aClipRange, *pStart)) if(prepare_singleMarker(aMarkerPrimitives, aMarkerTransform, aClipRange, *pStart))
{ {
...@@ -958,20 +958,22 @@ namespace svgio ...@@ -958,20 +958,22 @@ namespace svgio
} }
} }
if(pMid && nMarkerCount > 2) if(pMid)
{ {
if(pMid == pPrepared || prepare_singleMarker(aMarkerPrimitives, aMarkerTransform, aClipRange, *pMid)) if(pMid == pPrepared || prepare_singleMarker(aMarkerPrimitives, aMarkerTransform, aClipRange, *pMid))
{ {
pPrepared = pMid; pPrepared = pMid;
const sal_uInt32 nFirstIndex(a==0 ? 1 : 0);
const sal_uInt32 nLastIndex(a==nCount-1 ? nMarkerCount-1 : nMarkerCount);
for(sal_uInt32 b(1); b < nMarkerCount - 1; b++) for(sal_uInt32 b(nFirstIndex); b < nLastIndex; b++)
{ {
add_singleMarker(rTarget, aMarkerPrimitives, aMarkerTransform, aClipRange, *pPrepared, aCandidate, b); add_singleMarker(rTarget, aMarkerPrimitives, aMarkerTransform, aClipRange, *pPrepared, aCandidate, b);
} }
} }
} }
if(pEnd) if(pEnd && a==nCount-1)
{ {
if(pEnd == pPrepared || prepare_singleMarker(aMarkerPrimitives, aMarkerTransform, aClipRange, *pEnd)) if(pEnd == pPrepared || prepare_singleMarker(aMarkerPrimitives, aMarkerTransform, aClipRange, *pEnd))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment