paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 19:35:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpvectorial: Fix svgreader crashing if stroke-dasharray is "none". Fix w3schools demo file "polyline2svg" to display correctly.

Browse Source 
git-svn-id: trunk@50933 -
This commit is contained in:
wp 2015-12-19 14:47:08 +00:00
parent 25cfeb51ee
commit 649bb59f7e
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/fpvectorial/fpvectorial.pas
View File

@ -3437,6 +3437,7 @@ var
begin begin
if not (Brush.Kind in [bkVerticalGradient, bkHorizontalGradient]) then if not (Brush.Kind in [bkVerticalGradient, bkHorizontalGradient]) then
Exit; Exit;
lColor1 := Brush.Gradient_colors[1]; lColor1 := Brush.Gradient_colors[1];
lColor2 := Brush.Gradient_colors[0]; lColor2 := Brush.Gradient_colors[0];
if Brush.Kind = bkVerticalGradient then if Brush.Kind = bkVerticalGradient then
@ -4106,14 +4107,13 @@ begin
y2 := Max(y2, CoordY); y2 := Max(y2, CoordY);
end; end;
DrawBrushGradient(ADest, ARenderInfo, x1, y1, x2, y2, ADestX, ADestY, AMulX, AMulY); DrawBrushGradient(ADest, ARenderInfo, x1, y1, x2, y2, ADestX, ADestY, AMulX, AMulY);
// Reset pen!
inherited Render(ADest, ARenderInfo, ADestX, ADestY, AMulX, AMulY, ADoDraw);
end; end;
{$ENDIF} {$ENDIF}
// //
// For other paths, draw more carefully // For other paths, draw more carefully
// //
ApplyPenToCanvas(ADest, ARenderInfo, Pen);
PrepareForSequentialReading; PrepareForSequentialReading;
for j := 0 to Len - 1 do for j := 0 to Len - 1 do
@ -4132,7 +4132,7 @@ begin
PosX := Cur2DSegment.X; PosX := Cur2DSegment.X;
PosY := Cur2DSegment.Y; PosY := Cur2DSegment.Y;
{$ifdef FPVECTORIAL_TOCANVAS_DEBUG} {$ifdef FPVECTORIAL_TOCANVAS_DEBUG}
Write(Format(' M%d,%d', [CoordY, CoordY])); Write(Format(' M%d,%d', [CoordX, CoordY]));
{$endif} {$endif}
end; end;
// This element can override temporarely the Pen // This element can override temporarely the Pen
@ -4153,7 +4153,7 @@ begin
ADest.Pen.FPColor := Pen.Color; ADest.Pen.FPColor := Pen.Color;
{$ifdef FPVECTORIAL_TOCANVAS_DEBUG} {$ifdef FPVECTORIAL_TOCANVAS_DEBUG}
Write(Format(' L%d,%d', [CoordToCanvasX(Cur2DSegment.X), CoordToCanvasY(Cur2DSegment.Y)])); Write(Format(' L%d,%d', [CoordX2, CoordY2]));
{$endif} {$endif}
end; end;
st2DLine, st3DLine: st2DLine, st3DLine:
@ -4168,7 +4168,7 @@ begin
PosX := Cur2DSegment.X; PosX := Cur2DSegment.X;
PosY := Cur2DSegment.Y; PosY := Cur2DSegment.Y;
{$ifdef FPVECTORIAL_TOCANVAS_DEBUG} {$ifdef FPVECTORIAL_TOCANVAS_DEBUG}
Write(Format(' L%d,%d', [CoordX, CoordY])); Write(Format(' L%d,%d', [CoordX2, CoordY2]));
{$endif} {$endif}
end; end;
{ To draw a bezier we need to divide the interval in parts and make { To draw a bezier we need to divide the interval in parts and make
@ -4203,10 +4203,10 @@ begin
{$ifdef FPVECTORIAL_TOCANVAS_DEBUG} {$ifdef FPVECTORIAL_TOCANVAS_DEBUG}
Write(Format(' ***C%d,%d %d,%d %d,%d %d,%d', Write(Format(' ***C%d,%d %d,%d %d,%d %d,%d',
[CoordToCanvasX(PosX), CoordToCanvasY(PosY), [CoordToCanvasX(PosX, ADestX, AMulX), CoordToCanvasY(PosY, ADestY, AMulY),
CoordToCanvasX(Cur2DBSegment.X2), CoordToCanvasY(Cur2DBSegment.Y2), CoordToCanvasX(Cur2DBSegment.X2, ADestX, AMulX), CoordToCanvasY(Cur2DBSegment.Y2, ADestY, AMulY),
CoordToCanvasX(Cur2DBSegment.X3), CoordToCanvasY(Cur2DBSegment.Y3), CoordToCanvasX(Cur2DBSegment.X3, ADestX, AMulX), CoordToCanvasY(Cur2DBSegment.Y3, ADestY, AMulY),
CoordToCanvasX(Cur2DBSegment.X), CoordToCanvasY(Cur2DBSegment.Y)])); CoordToCanvasX(Cur2DBSegment.X, ADestX, AMulX), CoordToCanvasY(Cur2DBSegment.Y, ADestY, AMulY)]));
{$endif} {$endif}
end; end;
// Alligned Ellipse equation: // Alligned Ellipse equation:

3
components/fpvectorial/svgvectorialreader.pas
View File

@ -2752,6 +2752,9 @@ var
patt: array of LongWord; patt: array of LongWord;
i: Integer; i: Integer;
begin begin
if AStr = 'none' then
exit;
float_patt := ReadSpaceSeparatedFloats(AStr, ','); float_patt := ReadSpaceSeparatedFloats(AStr, ',');
if Length(float_patt) < 2 then if Length(float_patt) < 2 then
exit; exit;