paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-14 02:20:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

aggpas: fixed Line positions

Browse Source 
git-svn-id: trunk@22116 -
This commit is contained in:
mattias 2009-10-12 15:11:12 +00:00
parent 6aed7efee7
commit 78a617c4e2
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
components/aggpas/src/agg_fpimage.pas
View File

@ -1197,7 +1197,7 @@ begin
if SrcCanvas is TAggFPCanvas then begin if SrcCanvas is TAggFPCanvas then begin
AggCopyImage(TAggFPCanvas(SrcCanvas).Image, AggCopyImage(TAggFPCanvas(SrcCanvas).Image,
SourceRect.Left,SourceRect.Top,SourceRect.Right,SourceRect.Bottom, SourceRect.Left,SourceRect.Top,SourceRect.Right,SourceRect.Bottom,
DstX,DstY); DstX+0.5,DstY+0.5);
end else begin end else begin
dx:=DstX-SourceRect.Left; dx:=DstX-SourceRect.Left;
dy:=DstY-SourceRect.Top; dy:=DstY-SourceRect.Top;
@ -1250,7 +1250,7 @@ var
SrcX: LongInt; SrcX: LongInt;
begin begin
if SrcImage is TAggFPImage then begin if SrcImage is TAggFPImage then begin
AggCopyImage(TAggFPImage(SrcImage),x,y); AggCopyImage(TAggFPImage(SrcImage),x+0.5,y+0.5);
end else begin end else begin
r:=Classes.Rect(0,0,SrcImage.Width,SrcImage.Height); r:=Classes.Rect(0,0,SrcImage.Width,SrcImage.Height);
r.Left:=Max(r.Left+x,0)-x; r.Left:=Max(r.Left+x,0)-x;
@ -1279,7 +1279,7 @@ begin
cy:=(Bounds.Top+Bounds.Bottom) div 2; cy:=(Bounds.Top+Bounds.Bottom) div 2;
rx:=Abs(Bounds.Right-Bounds.Left) div 2; rx:=Abs(Bounds.Right-Bounds.Left) div 2;
ry:=Abs(Bounds.Bottom-Bounds.Top) div 2; ry:=Abs(Bounds.Bottom-Bounds.Top) div 2;
el.Construct(cx ,cy ,rx ,ry ,0 ,2 * pi ); el.Construct(cx+0.5 ,cy+0.5 ,rx ,ry ,0 ,2 * pi );
Path.m_path.add_path(@el ,0 ,false ); Path.m_path.add_path(@el ,0 ,false );
Path.m_path.close_polygon; Path.m_path.close_polygon;
@ -1301,7 +1301,7 @@ begin
cy:=(Bounds.Top+Bounds.Bottom) div 2; cy:=(Bounds.Top+Bounds.Bottom) div 2;
rx:=Abs(Bounds.Right-Bounds.Left) div 2; rx:=Abs(Bounds.Right-Bounds.Left) div 2;
ry:=Abs(Bounds.Bottom-Bounds.Top) div 2; ry:=Abs(Bounds.Bottom-Bounds.Top) div 2;
el.Construct(cx ,cy ,rx ,ry ,0 ,2 * pi ); el.Construct(cx+0.5 ,cy+0.5 ,rx ,ry ,0 ,2 * pi );
Path.m_path.add_path(@el ,0 ,false ); Path.m_path.add_path(@el ,0 ,false );
Path.m_path.close_polygon; Path.m_path.close_polygon;
@ -1333,8 +1333,8 @@ end;
procedure TAggFPCanvas.DoLine(x1, y1, x2, y2: integer); procedure TAggFPCanvas.DoLine(x1, y1, x2, y2: integer);
begin begin
Path.m_path.remove_all; Path.m_path.remove_all;
Path.m_path.move_to(x1 ,y1 ); Path.m_path.move_to(x1+0.5 ,y1+0.5 );
Path.m_path.line_to(x2 ,y2 ); Path.m_path.line_to(x2+0.5 ,y2+0.5 );
AggDrawPath(AGG_StrokeOnly ); AggDrawPath(AGG_StrokeOnly );
end; end;
@ -1347,11 +1347,11 @@ begin
Path.m_path.remove_all; Path.m_path.remove_all;
i:=low(points); i:=low(points);
p:=points[i]; p:=points[i];
Path.m_path.move_to(p.x ,p.y ); Path.m_path.move_to(p.x+0.5 ,p.y+0.5 );
inc(i); inc(i);
while i<=high(points) do begin while i<=high(points) do begin
p:=points[i]; p:=points[i];
Path.m_path.line_to(p.x,p.y); Path.m_path.line_to(p.x+0.5,p.y+0.5);
inc(i); inc(i);
end; end;
AggClosePolygon; AggClosePolygon;
@ -1367,11 +1367,11 @@ begin
Path.m_path.remove_all; Path.m_path.remove_all;
i:=low(points); i:=low(points);
p:=points[i]; p:=points[i];
Path.m_path.move_to(p.x ,p.y ); Path.m_path.move_to(p.x+0.5 ,p.y+0.5 );
inc(i); inc(i);
while i<=high(points) do begin while i<=high(points) do begin
p:=points[i]; p:=points[i];
Path.m_path.line_to(p.x,p.y); Path.m_path.line_to(p.x+0.5,p.y+0.5);
inc(i); inc(i);
end; end;
AggClosePolygon; AggClosePolygon;
@ -1387,11 +1387,11 @@ begin
Path.m_path.remove_all; Path.m_path.remove_all;
i:=low(points); i:=low(points);
p:=points[i]; p:=points[i];
Path.m_path.move_to(p.x ,p.y ); Path.m_path.move_to(p.x+0.5 ,p.y+0.5 );
inc(i); inc(i);
while i<=high(points) do begin while i<=high(points) do begin
p:=points[i]; p:=points[i];
Path.m_path.line_to(p.x,p.y); Path.m_path.line_to(p.x+0.5,p.y+0.5);
inc(i); inc(i);
end; end;
AggDrawPath(AGG_StrokeOnly ); AggDrawPath(AGG_StrokeOnly );
@ -1400,10 +1400,10 @@ end;
procedure TAggFPCanvas.DoRectangle(const Bounds: TRect); procedure TAggFPCanvas.DoRectangle(const Bounds: TRect);
begin begin
Path.m_path.remove_all; Path.m_path.remove_all;
Path.m_path.move_to(Bounds.Left,Bounds.Top); Path.m_path.move_to(Bounds.Left+0.5,Bounds.Top+0.5);
Path.m_path.line_to(Bounds.Right,Bounds.Top); Path.m_path.line_to(Bounds.Right+0.5,Bounds.Top+0.5);
Path.m_path.line_to(Bounds.Right,Bounds.Bottom); Path.m_path.line_to(Bounds.Right+0.5,Bounds.Bottom+0.5);
Path.m_path.line_to(Bounds.Left,Bounds.Bottom); Path.m_path.line_to(Bounds.Left+0.5,Bounds.Bottom+0.5);
AggClosePolygon; AggClosePolygon;
AggDrawPath(AGG_StrokeOnly); AggDrawPath(AGG_StrokeOnly);
end; end;
@ -1411,17 +1411,17 @@ end;
procedure TAggFPCanvas.DoRectangleFill(const Bounds: TRect); procedure TAggFPCanvas.DoRectangleFill(const Bounds: TRect);
begin begin
Path.m_path.remove_all; Path.m_path.remove_all;
Path.m_path.move_to(Bounds.Left,Bounds.Top); Path.m_path.move_to(Bounds.Left+0.5,Bounds.Top+0.5);
Path.m_path.line_to(Bounds.Right,Bounds.Top); Path.m_path.line_to(Bounds.Right+0.5,Bounds.Top+0.5);
Path.m_path.line_to(Bounds.Right,Bounds.Bottom); Path.m_path.line_to(Bounds.Right+0.5,Bounds.Bottom+0.5);
Path.m_path.line_to(Bounds.Left,Bounds.Bottom); Path.m_path.line_to(Bounds.Left+0.5,Bounds.Bottom+0.5);
AggClosePolygon; AggClosePolygon;
AggDrawPath(AGG_FillAndStroke); AggDrawPath(AGG_FillAndStroke);
end; end;
procedure TAggFPCanvas.DoTextOut(x, y: integer; str: string); procedure TAggFPCanvas.DoTextOut(x, y: integer; str: string);
begin begin
AggTextOut(x,y,str); AggTextOut(x+0.5,y+0.5,str);
end; end;
function TAggFPCanvas.GetColor(x, y: integer): TFPColor; function TAggFPCanvas.GetColor(x, y: integer): TFPColor;