paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-15 17:59:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

FpVectorial: Cleanup based on compiler hints.

Browse Source 
git-svn-id: trunk@48476 -
This commit is contained in:
juha 2015-03-24 17:50:02 +00:00
parent 997a2f114d
commit addc44e0f5
7 changed files with 22 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/fpvectorial/epsvectorialreader.pas
View File

@ -495,7 +495,6 @@ end;
} }
procedure TPSTokenizer.ReadFromStream(AStream: TStream); procedure TPSTokenizer.ReadFromStream(AStream: TStream);
var var
i: Integer;
CurChar: Char; CurChar: Char;
CurLine: Integer = 1; CurLine: Integer = 1;
State: TPostScriptScannerState = ssSearchingToken; State: TPostScriptScannerState = ssSearchingToken;
@ -504,7 +503,6 @@ var
ExpressionToken: TExpressionToken; ExpressionToken: TExpressionToken;
ArrayToken, NewArrayToken: TArrayToken; ArrayToken, NewArrayToken: TArrayToken;
DictionaryToken: TDictionaryToken; DictionaryToken: TDictionaryToken;
Len: Integer;
lReturnState: TStack; // of TPostScriptScannerState lReturnState: TStack; // of TPostScriptScannerState
lExpressionStateReturn: TPostScriptScannerState; lExpressionStateReturn: TPostScriptScannerState;
lIsEndOfLine: Boolean; lIsEndOfLine: Boolean;
@ -1092,8 +1090,6 @@ end;
procedure TvEPSVectorialReader.ExecuteOperatorToken(AToken: TExpressionToken; procedure TvEPSVectorialReader.ExecuteOperatorToken(AToken: TExpressionToken;
AData: TvVectorialPage; ADoc: TvVectorialDocument; ANextToken: TPSToken); AData: TvVectorialPage; ADoc: TvVectorialDocument; ANextToken: TPSToken);
var
Param1, Param2: TPSToken;
begin begin
if AToken.StrValue = '' then if AToken.StrValue = '' then
begin begin

40
components/fpvectorial/fpvectorial.pas
View File

@ -1802,7 +1802,7 @@ procedure TvTable.CalculateColWidths(ADest: TFPCustomCanvas);
var var
CurRow: TvTableRow; CurRow: TvTableRow;
CurCell: TvTableCell; CurCell: TvTableCell;
lLeft, lTop, lRight, lBottom, lWidth: Double; lWidth: Double;
col, row, i: Integer; col, row, i: Integer;
//DebugStr: string; //DebugStr: string;
OriginalColWidthsInMM: array of Double; OriginalColWidthsInMM: array of Double;
@ -1868,7 +1868,7 @@ var
col, row: Integer; col, row: Integer;
CurRow: TvTableRow; CurRow: TvTableRow;
CurCell: TvTableCell; CurCell: TvTableCell;
lCellHeight, lRowHeight: Double; lCellHeight: Double;
begin begin
TableHeight := 0; TableHeight := 0;
@ -1986,7 +1986,7 @@ procedure TvTable.Render(ADest: TFPCustomCanvas; var ARenderInfo: TvRenderInfo;
end; end;
var var
row, col: Integer; row: Integer;
CurRow: TvTableRow; CurRow: TvTableRow;
lEntityRenderInfo: TvRenderInfo; lEntityRenderInfo: TvRenderInfo;
begin begin
@ -2442,7 +2442,7 @@ end;
procedure T2DEllipticalArcSegment.CalculateCenter; procedure T2DEllipticalArcSegment.CalculateCenter;
var var
XStart, YStart, lT1, lT2: Double; XStart, YStart, lT1: Double;
CX1, CY1, CX2, CY2, LeftMostX, LeftMostY, RightMostX, RightMostY: Double; CX1, CY1, CX2, CY2, LeftMostX, LeftMostY, RightMostX, RightMostY: Double;
RotatedCenter: T3DPoint; RotatedCenter: T3DPoint;
begin begin
@ -2537,7 +2537,6 @@ end;
procedure T2DEllipticalArcSegment.CalculateEllipseBoundingBox(ADest: TFPCustomCanvas; procedure T2DEllipticalArcSegment.CalculateEllipseBoundingBox(ADest: TFPCustomCanvas;
var ALeft, ATop, ARight, ABottom: Double); var ALeft, ATop, ARight, ABottom: Double);
var var
MajorAxis, MinorAxis: Double;
t1, t2, t3: Double; t1, t2, t3: Double;
x1, x2, x3: Double; x1, x2, x3: Double;
y1, y2, y3: Double; y1, y2, y3: Double;
@ -3035,7 +3034,6 @@ function TvEntityWithPenAndBrush.GenerateDebugTree(
ADestRoutine: TvDebugAddItemProc; APageItem: Pointer): Pointer; ADestRoutine: TvDebugAddItemProc; APageItem: Pointer): Pointer;
var var
lStr: string; lStr: string;
lCurPathSeg: TPathSegment;
begin begin
lStr := Format('[%s] Name=%s X=%f Y=%f Pen.Color=%s Pen.Style=%s Brush.Color=%s Brush.Style=%s %s', lStr := Format('[%s] Name=%s X=%f Y=%f Pen.Color=%s Pen.Style=%s Brush.Color=%s Brush.Style=%s %s',
[Self.ClassName, Self.Name, X, Y, [Self.ClassName, Self.Name, X, Y,
@ -3065,12 +3063,9 @@ end;
procedure TvEntityWithPenBrushAndFont.ApplyFontToCanvas(ADest: TFPCustomCanvas; procedure TvEntityWithPenBrushAndFont.ApplyFontToCanvas(ADest: TFPCustomCanvas;
ARenderInfo: TvRenderInfo; AFont: TvFont; AMulX: Double); ARenderInfo: TvRenderInfo; AFont: TvFont; AMulX: Double);
var var
i: Integer;
{$ifdef USE_LCL_CANVAS} {$ifdef USE_LCL_CANVAS}
ALCLDest: TCanvas absolute ADest; ALCLDest: TCanvas absolute ADest;
{$endif} {$endif}
//
LowerDim: T3DPoint;
begin begin
ADest.Font.Size := Round(AmulX * AFont.Size); ADest.Font.Size := Round(AmulX * AFont.Size);
ADest.Font.Bold := AFont.Bold; ADest.Font.Bold := AFont.Bold;
@ -3119,7 +3114,6 @@ function TvEntityWithPenBrushAndFont.GenerateDebugTree(
ADestRoutine: TvDebugAddItemProc; APageItem: Pointer): Pointer; ADestRoutine: TvDebugAddItemProc; APageItem: Pointer): Pointer;
var var
lStr: string; lStr: string;
lCurPathSeg: TPathSegment;
begin begin
Result := inherited GenerateDebugTree(ADestRoutine, APageItem); Result := inherited GenerateDebugTree(ADestRoutine, APageItem);
// Add the font debug info in a sub-item // Add the font debug info in a sub-item
@ -3455,7 +3449,7 @@ procedure TPath.Render(ADest: TFPCustomCanvas; var ARenderInfo: TvRenderInfo; AD
end; end;
var var
j, k: Integer; j: Integer;
PosX, PosY: Double; // Not modified by ADestX, etc PosX, PosY: Double; // Not modified by ADestX, etc
CoordX, CoordY: Integer; CoordX, CoordY: Integer;
CurSegment: TPathSegment; CurSegment: TPathSegment;
@ -3463,10 +3457,8 @@ var
Cur2DBSegment: T2DBezierSegment absolute CurSegment; Cur2DBSegment: T2DBezierSegment absolute CurSegment;
Cur2DArcSegment: T2DEllipticalArcSegment absolute CurSegment; Cur2DArcSegment: T2DEllipticalArcSegment absolute CurSegment;
// For bezier // For bezier
CurX, CurY: Integer; // Not modified by ADestX, etc
CoordX2, CoordY2, CoordX3, CoordY3, CoordX4, CoordY4: Integer; CoordX2, CoordY2, CoordX3, CoordY3, CoordX4, CoordY4: Integer;
CurveLength: Integer; //t: Double;
t: Double;
// For polygons // For polygons
lPoints: array of TPoint; lPoints: array of TPoint;
// for elliptical arcs // for elliptical arcs
@ -3705,7 +3697,7 @@ procedure TPath.RenderInternalPolygon(ADest: TFPCustomCanvas;
end; end;
var var
j, k: Integer; j: Integer;
CoordX, CoordY: Integer; CoordX, CoordY: Integer;
CurSegment: TPathSegment; CurSegment: TPathSegment;
Cur2DSegment: T2DSegment absolute CurSegment; Cur2DSegment: T2DSegment absolute CurSegment;
@ -4229,7 +4221,6 @@ function TvRectangle.GenerateDebugTree(ADestRoutine: TvDebugAddItemProc;
APageItem: Pointer): Pointer; APageItem: Pointer): Pointer;
var var
lStr: string; lStr: string;
lCurPathSeg: TPathSegment;
begin begin
Result := inherited GenerateDebugTree(ADestRoutine, APageItem); Result := inherited GenerateDebugTree(ADestRoutine, APageItem);
// Add the font debug info in a sub-item // Add the font debug info in a sub-item
@ -4405,7 +4396,6 @@ function TvAlignedDimension.GenerateDebugTree(ADestRoutine: TvDebugAddItemProc;
APageItem: Pointer): Pointer; APageItem: Pointer): Pointer;
var var
lStr: string; lStr: string;
lCurPathSeg: TPathSegment;
begin begin
Result := inherited GenerateDebugTree(ADestRoutine, APageItem); Result := inherited GenerateDebugTree(ADestRoutine, APageItem);
// Add the font debug info in a sub-item // Add the font debug info in a sub-item
@ -4515,7 +4505,6 @@ function TvRadialDimension.GenerateDebugTree(ADestRoutine: TvDebugAddItemProc;
APageItem: Pointer): Pointer; APageItem: Pointer): Pointer;
var var
lStr, lIsDiameterStr: string; lStr, lIsDiameterStr: string;
lCurPathSeg: TPathSegment;
begin begin
Result := inherited GenerateDebugTree(ADestRoutine, APageItem); Result := inherited GenerateDebugTree(ADestRoutine, APageItem);
// Add the font debug info in a sub-item // Add the font debug info in a sub-item
@ -4547,7 +4536,6 @@ procedure TvArcDimension.Render(ADest: TFPCustomCanvas;
var var
Points: array of TPoint; Points: array of TPoint;
lAngleLeft, lAngleRight: Double;
lTriangleCenter, lTriangleCorner: T3DPoint; lTriangleCenter, lTriangleCorner: T3DPoint;
{$ifdef USE_LCL_CANVAS} {$ifdef USE_LCL_CANVAS}
ALCLDest: TCanvas absolute ADest; ALCLDest: TCanvas absolute ADest;
@ -4632,8 +4620,7 @@ end;
function TvArcDimension.GenerateDebugTree(ADestRoutine: TvDebugAddItemProc; function TvArcDimension.GenerateDebugTree(ADestRoutine: TvDebugAddItemProc;
APageItem: Pointer): Pointer; APageItem: Pointer): Pointer;
var var
lStr, lIsDiameterStr: string; lStr: string;
lCurPathSeg: TPathSegment;
begin begin
Result := inherited GenerateDebugTree(ADestRoutine, APageItem); Result := inherited GenerateDebugTree(ADestRoutine, APageItem);
// Add the font debug info in a sub-item // Add the font debug info in a sub-item
@ -5395,7 +5382,7 @@ const
var var
lToken: TvFormulaElement; lToken: TvFormulaElement;
lStr: string; lStr: string;
FPointSeparator, FCommaSeparator: TFormatSettings; FPointSeparator: TFormatSettings;
begin begin
FPointSeparator := DefaultFormatSettings; FPointSeparator := DefaultFormatSettings;
FPointSeparator.DecimalSeparator := '.'; FPointSeparator.DecimalSeparator := '.';
@ -5426,7 +5413,7 @@ var
i: Integer; i: Integer;
lTmpStr: string = ''; lTmpStr: string = '';
lState: Integer; lState: Integer;
lFirstTmpStrChar, lCurChar: Char; lCurChar: Char;
begin begin
lState := 0; lState := 0;
@ -5557,7 +5544,6 @@ procedure TvFormula.PositionSubparts(ADest: TFPCustomCanvas; ABaseX, ABaseY: Dou
var var
lElement: TvFormulaElement; lElement: TvFormulaElement;
lPosX: Double = 0; lPosX: Double = 0;
lPosY: Double = 0;
lMaxHeight: Double = 0; lMaxHeight: Double = 0;
begin begin
CalculateHeight(ADest); CalculateHeight(ADest);
@ -5855,7 +5841,6 @@ end;
procedure TvInsert.Render(ADest: TFPCustomCanvas; var ARenderInfo: TvRenderInfo; ADestX: Integer; procedure TvInsert.Render(ADest: TFPCustomCanvas; var ARenderInfo: TvRenderInfo; ADestX: Integer;
ADestY: Integer; AMulX: Double; AMulY: Double); ADestY: Integer; AMulX: Double; AMulY: Double);
var var
lEntity: TvEntity;
OldForceRenderBlock: Boolean; OldForceRenderBlock: Boolean;
begin begin
inherited Render(ADest, ARenderInfo, ADestX, ADestY, AMulX, AMulY); inherited Render(ADest, ARenderInfo, ADestX, ADestY, AMulX, AMulY);
@ -6334,8 +6319,6 @@ end;
{ TvVectorialPage } { TvVectorialPage }
procedure TvVectorialPage.ClearTmpPath; procedure TvVectorialPage.ClearTmpPath;
var
segment, oldsegment: TPathSegment;
begin begin
FTmpPath.Points := nil; FTmpPath.Points := nil;
FTmpPath.PointsEnd := nil; FTmpPath.PointsEnd := nil;
@ -6537,7 +6520,7 @@ end;
function TvVectorialPage.AddPathCopyMem(APath: TPath; AOnlyCreate: Boolean = False): TPath; function TvVectorialPage.AddPathCopyMem(APath: TPath; AOnlyCreate: Boolean = False): TPath;
var var
lPath: TPath; lPath: TPath;
Len: Integer; //Len: Integer;
begin begin
lPath := TPath.Create(Self); lPath := TPath.Create(Self);
lPath.Assign(APath); lPath.Assign(APath);
@ -7117,6 +7100,7 @@ end;
function TvTextPageSequence.RemoveEntity(AEntity: TvEntity; function TvTextPageSequence.RemoveEntity(AEntity: TvEntity;
AFreeAfterRemove: Boolean): Boolean; AFreeAfterRemove: Boolean): Boolean;
begin begin
Result := True;
MainText.Clear; MainText.Clear;
end; end;

5
components/fpvectorial/fpvtocanvas.pas
View File

@ -9,10 +9,7 @@ interface
{$endif} {$endif}
uses uses
Classes, SysUtils, Math, fpcanvas, fpvectorial;
fpcanvas,
fpimage,
fpvectorial, fpvutils;
procedure DrawFPVectorialToCanvas(ASource: TvVectorialPage; procedure DrawFPVectorialToCanvas(ASource: TvVectorialPage;
ADest: TFPCustomCanvas; ADest: TFPCustomCanvas;

4
components/fpvectorial/mathmlvectorialreader.pas
View File

@ -13,9 +13,9 @@ unit mathmlvectorialreader;
interface interface
uses uses
Classes, SysUtils, math, Classes, SysUtils,
laz2_xmlread, laz2_dom, laz2_xmlread, laz2_dom,
fpvectorial, fpvutils, lazutf8; fpvectorial;
type type
{ TvMathMLVectorialReader } { TvMathMLVectorialReader }

10
components/fpvectorial/odgvectorialreader.pas
View File

@ -554,7 +554,6 @@ end;
procedure TvODGVectorialReader.ApplyGraphicAttributeToPenAndBrush(ANodeName, procedure TvODGVectorialReader.ApplyGraphicAttributeToPenAndBrush(ANodeName,
ANodeValue: string; var APen: TvPen; var ABrush: TvBrush); ANodeValue: string; var APen: TvPen; var ABrush: TvBrush);
var var
i: Integer;
lColor: TFPColor; lColor: TFPColor;
begin begin
case ANodeName of case ANodeName of
@ -920,10 +919,9 @@ end;
procedure TvODGVectorialReader.ConvertPathStringToTPath(AStr: string; procedure TvODGVectorialReader.ConvertPathStringToTPath(AStr: string;
AData: TvVectorialPage; ADest: TPath; ADeltaX, ADeltaY: Double; AInfo: TCustomShapeInfo); AData: TvVectorialPage; ADest: TPath; ADeltaX, ADeltaY: Double; AInfo: TCustomShapeInfo);
var var
x1, y1, x2, y2, lCurX, lCurY: double; x1, y1, x2, y2: double;
t1, t2, lSrcX, lSrcY, lDestX, lDestY: Double; t1, t2, lSrcX, lSrcY, lDestX, lDestY: Double;
j: Integer; j: Integer;
lNodeName, lNodeValue: string;
lTokenizer: TSVGPathTokenizer; lTokenizer: TSVGPathTokenizer;
CurToken: TSVGToken; CurToken: TSVGToken;
begin begin
@ -931,8 +929,6 @@ begin
y1 := 0.0; y1 := 0.0;
x2 := 0.0; x2 := 0.0;
y2 := 0.0; y2 := 0.0;
lCurX := 0.0;
lCurY := 0.0;
lTokenizer := TSVGPathTokenizer.Create; lTokenizer := TSVGPathTokenizer.Create;
try try
@ -1091,7 +1087,7 @@ var
x1, y1, x2, y2, lWidth, lHeight: double; x1, y1, x2, y2, lWidth, lHeight: double;
i: Integer; i: Integer;
lNodeName, lNodeValue: string; lNodeName, lNodeValue: string;
lCurNode, lTextNode, lEnhancedGeometryNode, lDrawTypeAttrib: TDOMNode; lCurNode: TDOMNode;
lSkewX, lSkewY, lRotate, lTranslateX, lTranslateY: Double; lSkewX, lSkewY, lRotate, lTranslateX, lTranslateY: Double;
// various possible custom shape types // various possible custom shape types
lGroup: TvEntityWithSubEntities; lGroup: TvEntityWithSubEntities;
@ -1673,7 +1669,6 @@ function TvODGVectorialReader.ReadSVGColor(AValue: string): TFPColor;
var var
lValue, lStr: string; lValue, lStr: string;
lStrings: TStringList; lStrings: TStringList;
i: Integer;
begin begin
Result := colBlack; Result := colBlack;
lValue := Trim(LowerCase(AValue)); lValue := Trim(LowerCase(AValue));
@ -2302,7 +2297,6 @@ procedure TvODGVectorialReader.ReadFromStylesXMLDocument(
var var
DocStylesNode, AutomaticStylesNode, MasterStylesNode, ElementNode: TDOMNode; DocStylesNode, AutomaticStylesNode, MasterStylesNode, ElementNode: TDOMNode;
CurPage: TvVectorialPage; CurPage: TvVectorialPage;
i: Integer;
lNodeName: String; lNodeName: String;
begin begin
DocStylesNode := AXMLDocument.DocumentElement;//.FindNode('office:document-styles'); DocStylesNode := AXMLDocument.DocumentElement;//.FindNode('office:document-styles');

6
components/fpvectorial/svgvectorialreader.pas
View File

@ -1659,9 +1659,9 @@ var
lTextStr: string = ''; lTextStr: string = '';
lx, ly: double; lx, ly: double;
lText: TvText; lText: TvText;
i: Integer; //i: Integer;
lNodeName, lNodeValue: DOMString; //lNodeName, lNodeValue: DOMString;
lCurNode: TDOMNode; //lCurNode: TDOMNode;
begin begin
lx := 0.0; lx := 0.0;
ly := 0.0; ly := 0.0;

4
components/fpvectorial/svgvectorialwriter.pas
View File

@ -245,7 +245,7 @@ const
TEXT_ANCHORS: array[TvTextAnchor] of string = ('start', 'middle', 'end'); TEXT_ANCHORS: array[TvTextAnchor] of string = ('start', 'middle', 'end');
TEXT_DECO: array[0..3] of string = ('none', 'underline', 'line-through', 'line-through,underline'); TEXT_DECO: array[0..3] of string = ('none', 'underline', 'line-through', 'line-through,underline');
var var
i, j, FontSize: Integer; FontSize: Integer;
TextStr: String; TextStr: String;
PtX, PtY: double; PtX, PtY: double;
begin begin
@ -327,7 +327,7 @@ procedure TvSVGVectorialWriter.WriteEntities(AStrings: TStrings;
AData: TvVectorialPage; ADoc: TvVectorialDocument); AData: TvVectorialPage; ADoc: TvVectorialDocument);
var var
lEntity: TvEntity; lEntity: TvEntity;
i, j: Integer; i: Integer;
begin begin
for i := 0 to AData.GetEntitiesCount() - 1 do for i := 0 to AData.GetEntitiesCount() - 1 do
begin begin