summaryrefslogtreecommitdiff
path: root/packages/graph
diff options
context:
space:
mode:
authorflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-06-15 21:04:54 +0000
committerflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-06-15 21:04:54 +0000
commit34a97000f6eb9de5457a7b8f2a72c78410e9d8be (patch)
tree00b1d7fa9b2143d2bf1e0592c9b2513afe00fe1e /packages/graph
parentd4a17a5382f194bc06d4b5dc9f0bbc69f72a25b1 (diff)
downloadfpc-34a97000f6eb9de5457a7b8f2a72c78410e9d8be.tar.gz
* another patch to PolyFill by borsa77
* some indention and newline mistakes fixed git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@13281 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/graph')
-rw-r--r--packages/graph/src/inc/graph.inc33
1 files changed, 18 insertions, 15 deletions
diff --git a/packages/graph/src/inc/graph.inc b/packages/graph/src/inc/graph.inc
index 8efb7f26db..80f689f9b1 100644
--- a/packages/graph/src/inc/graph.inc
+++ b/packages/graph/src/inc/graph.inc
@@ -466,7 +466,7 @@ var
{ with predefined line patterns... }
if LinePatterns[PixelCount and 15] = TRUE then
begin
- DirectPutPixel(x1,PixelCount);
+ DirectPutPixel(x1,PixelCount);
end;
end
else
@@ -590,7 +590,7 @@ var
begin
if LinePatterns[i and 15] = TRUE then
begin
- DirectPutPixel(x,y);
+ DirectPutPixel(x,y);
end;
if d < 0 then
begin
@@ -843,24 +843,29 @@ var
Begin
for j:=0 to 7 do
Begin
- { x1 mod 8 }
+ { x1 mod 8 }
if RevBitArray[x1 and 7] and TmpFillPattern <> 0 then
- DirectPutpixel(x1,y)
+ begin
+ OldCurrentColor := CurrentColor;
+ CurrentColor := FillSettings.Color;
+ DirectPutpixel(x1,y);
+ CurrentColor := OldCurrentColor;
+ end
else
begin
- { According to the TP graph manual, we overwrite everything }
- { which is filled up - checked against VGA and CGA drivers }
- { of TP. }
- OldCurrentColor := CurrentColor;
- CurrentColor := CurrentBkColor;
- DirectPutPixel(x1,y);
- CurrentColor := OldCurrentColor;
+ { According to the TP graph manual, we overwrite everything }
+ { which is filled up - checked against VGA and CGA drivers }
+ { of TP. }
+ OldCurrentColor := CurrentColor;
+ CurrentColor := CurrentBkColor;
+ DirectPutPixel(x1,y);
+ CurrentColor := OldCurrentColor;
end;
Inc(x1);
if x1 > x2 then
begin
- CurrentWriteMode := OldWriteMode;
- exit;
+ CurrentWriteMode := OldWriteMode;
+ exit;
end;
end;
end;
@@ -870,8 +875,6 @@ var
end;
-
-
procedure LineRel(Dx, Dy: smallint);
Begin