Kaydet (Commit) 4e63c0f7 authored tarafından Regina Henschel's avatar Regina Henschel

#i123379 SVG wrong kind of markers on mid position

Author:Christina Roßmanith
üst b94437b6
...@@ -958,7 +958,7 @@ namespace svgio ...@@ -958,7 +958,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))
{ {
...@@ -967,20 +967,22 @@ namespace svgio ...@@ -967,20 +967,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