You've already forked lazarus-ccr
PowerPDF: fix fpc 2.4.4 compile
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2184 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
@@ -38,6 +38,10 @@ unit PReport;
|
|||||||
|
|
||||||
interface
|
interface
|
||||||
|
|
||||||
|
{$IFDEF LAZ_POWERPDF}
|
||||||
|
{$mode objfpc}{$H+}
|
||||||
|
{$ENDIF}
|
||||||
|
|
||||||
//{$DEFINE USE_JPFONTS}
|
//{$DEFINE USE_JPFONTS}
|
||||||
//{$DEFINE USE_GBFONTS}
|
//{$DEFINE USE_GBFONTS}
|
||||||
|
|
||||||
@@ -427,7 +431,7 @@ type
|
|||||||
procedure SetFillColor(Value: TColor);
|
procedure SetFillColor(Value: TColor);
|
||||||
procedure SetLineWidth(Value: Single);
|
procedure SetLineWidth(Value: Single);
|
||||||
procedure SetLineStyle(Value: TPenStyle);
|
procedure SetLineStyle(Value: TPenStyle);
|
||||||
procedure StdFillOrStroke(Canvas: TPdfCanvas);
|
procedure StdFillOrStroke(ACanvas: TPdfCanvas);
|
||||||
protected
|
protected
|
||||||
procedure SetDash(ACanvas: TPdfCAnvas; APattern: TPenStyle);
|
procedure SetDash(ACanvas: TPdfCAnvas; APattern: TPenStyle);
|
||||||
function IsFillable: boolean; virtual;
|
function IsFillable: boolean; virtual;
|
||||||
@@ -467,7 +471,7 @@ type
|
|||||||
{ TPRPolygon }
|
{ TPRPolygon }
|
||||||
TPRPolygon = class(TPRShape)
|
TPRPolygon = class(TPRShape)
|
||||||
protected
|
protected
|
||||||
procedure Print(ACanvas: TPRCanvas; ARect: TRect); override;
|
procedure Print(prCanvas: TPRCanvas; ARect: TRect); override;
|
||||||
function IsFillable: boolean; override;
|
function IsFillable: boolean; override;
|
||||||
public
|
public
|
||||||
Points: TPRPointArray;
|
Points: TPRPointArray;
|
||||||
@@ -2110,9 +2114,9 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TPRShape.StdFillOrStroke(Canvas: TPdfCanvas);
|
procedure TPRShape.StdFillOrStroke(ACanvas: TPdfCanvas);
|
||||||
begin
|
begin
|
||||||
with Canvas do
|
with ACanvas do
|
||||||
begin
|
begin
|
||||||
if (FillColor <> clNone) and IsFillable then
|
if (FillColor <> clNone) and IsFillable then
|
||||||
SetRGBFillColor(FFillColor);
|
SetRGBFillColor(FFillColor);
|
||||||
@@ -2672,9 +2676,9 @@ end;
|
|||||||
|
|
||||||
{ TPRPolygon }
|
{ TPRPolygon }
|
||||||
|
|
||||||
procedure TPRPolygon.Print(ACanvas: TPRCanvas; ARect: TRect);
|
procedure TPRPolygon.Print(prCanvas: TPRCanvas; ARect: TRect);
|
||||||
var
|
var
|
||||||
Canvas: TPDFCanvas;
|
ACanvas: TPDFCanvas;
|
||||||
i,h: Integer;
|
i,h: Integer;
|
||||||
Pts: TPRPointArray;
|
Pts: TPRPointArray;
|
||||||
begin
|
begin
|
||||||
@@ -2690,15 +2694,15 @@ begin
|
|||||||
Pts[i].y := h - Points[i].y;
|
Pts[i].y := h - Points[i].y;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
Canvas := ACanvas.PDFCanvas;
|
ACanvas := prCanvas.PDFCanvas;
|
||||||
|
|
||||||
SetDash(Canvas, FLineStyle);
|
SetDash(ACanvas, FLineStyle);
|
||||||
|
|
||||||
Canvas.MoveTo(Pts[0].x, Pts[0].y);
|
ACanvas.MoveTo(Pts[0].x, Pts[0].y);
|
||||||
for i:=1 to Length(Pts)-1 do
|
for i:=1 to Length(Pts)-1 do
|
||||||
Canvas.LineTo(Pts[i].x, Pts[i].y);
|
ACanvas.LineTo(Pts[i].x, Pts[i].y);
|
||||||
|
|
||||||
StdFillOrStroke(Canvas);
|
StdFillOrStroke(ACanvas);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TPRPolygon.IsFillable: boolean;
|
function TPRPolygon.IsFillable: boolean;
|
||||||
|
Reference in New Issue
Block a user