* Fix warnings and hints

git-svn-id: trunk@43484 -

packages/fcl-image/src/ellipses.pp

@@ -43,34 +43,25 @@ type
 
   TEllipseInfo = class
   private
-    fcx, fcy, frx,fry,
+    fcx, fcy, frx,fry : double;
-    fa1, fa2, frot : real;
-    fx1,fy1, fx2,fy2 : integer;
     InfoList : TList;
     procedure FreeList;
     procedure ClearList;
     function FindXIndex (x:integer) : integer;
-    procedure PrepareCalculation (var np:integer; var delta:real);
+    procedure PrepareCalculation (out np:integer; out delta:real);
     function NewInfoRec (anX:integer) : PEllipseInfoData;
-    procedure CalculateCircular (const b:TRect; var x,y,rx,ry:real);
+    procedure CalculateCircular (const b:TRect; out x,y,rx,ry:real);
   public
     constructor create;
     destructor destroy; override;
     function GetInfoForX (x:integer; var ytopmax,ytopmin,ybotmax,ybotmin:integer):boolean;
     function GetInfoForX (x:integer; var Info:PEllipseInfoData):boolean;
     procedure GatherEllipseInfo (const bounds:TRect);
-    procedure GatherArcInfo (const bounds:TRect; alpha1,alpha2:real);
+    property cx : double read fcx; // center point
-    property cx : real read fcx; // center point
+    property cy : double read fcy;
-    property cy : real read fcy;
+    property rhor : double read frx; // radius
-    property rhor : real read frx; // radius
+    property rver : double read fry;
-    property rver : real read fry;
     { only usable when created with GatherArcInfo }
-    property a1 : real read fa1;    // angle 1 and point on ellipse
-    property x1 : integer read fx1;
-    property y1 : integer read fy1;
-    property a2 : real read fa2;    // angle 2 and point on ellipse
-    property x2 : integer read fx2;
-    property y2 : integer read fy2;
   end;
 
 implementation
@@ -115,6 +106,7 @@ end;
 function TEllipseInfo.GetInfoForX (x:integer; var ytopmax,ytopmin,ybotmax,ybotmin:integer):boolean;
 var r : PEllipseInfoData;
 begin
+  R:=Nil;
   result := GetInfoForX (x, r);
   if assigned(r) then
     begin
@@ -142,7 +134,7 @@ begin
     Info := PEllipseInfoData(InfoList[r])
 end;
 
-procedure TEllipseInfo.PrepareCalculation (var np:integer; var delta:real);
+procedure TEllipseInfo.PrepareCalculation (out np:integer; out delta:real);
 begin
   np := round(1.5708 * sqrt(sqr(frx)+sqr(fry)) );
   // number of pixel in quarter circel to calculate without gaps in drawing
@@ -163,7 +155,7 @@ begin
     end;
 end;
 
-procedure TEllipseInfo.CalculateCircular (const b:TRect; var x,y,rx,ry:real);
+procedure TEllipseInfo.CalculateCircular (const b:TRect; out x,y,rx,ry:real);
 begin
   with b do
     begin
@@ -294,25 +286,6 @@ begin
     end;
 end;
 
-procedure TEllipseInfo.GatherArcInfo (const bounds:TRect; alpha1,alpha2:real);
-var stAngle,endAngle:real;
-
-  procedure CheckAngles;
-  begin
-    if a1 < a2 then
-      begin
-      stAngle := a1;
-      endAngle := a2;
-      end
-    else
-      begin
-      stAngle := a2;
-      endAngle := a1;
-      end;
-  end;
-
-begin
-end;
 
 { The drawing routines }
 
@@ -403,6 +376,7 @@ begin
   infoIn := TEllipseInfo.Create;
   infoOut := TEllipseInfo.Create;
   dec (width);
+  id:=Nil;
   try
     infoOut.GatherEllipseInfo(bounds);
     with bounds do
@@ -438,6 +412,7 @@ var info : TEllipseInfo;
     id : PEllipseInfoData;
     CountDown, CountUp, half : integer;
 begin
+  id:=Nil;
   with canv.pen do
     case mode of
       pmMask : MyPutPix := @PutPixelAnd;
@@ -499,7 +474,6 @@ end;
 procedure FillEllipseColor (Canv:TFPCustomCanvas; const Bounds:TRect; const c:TFPColor);
 var info : TEllipseInfo;
     r, y : integer;
-    id : PEllipseInfoData;
 begin
   info := TEllipseInfo.Create;
   try
@@ -521,7 +495,6 @@ end;
 procedure FillEllipseHashHorizontal (Canv:TFPCustomCanvas; const Bounds:TRect; width:integer; const c:TFPColor);
 var info : TEllipseInfo;
     r, y : integer;
-    id : PEllipseInfoData;
 begin
   info := TEllipseInfo.Create;
   try
@@ -539,7 +512,6 @@ end;
 procedure FillEllipseHashVertical (Canv:TFPCustomCanvas; const Bounds:TRect; width:integer; const c:TFPColor);
 var info : TEllipseInfo;
     r, y : integer;
-    id : PEllipseInfoData;
 begin
   info := TEllipseInfo.Create;
   try
@@ -557,7 +529,6 @@ end;
 procedure FillEllipseHashDiagonal (Canv:TFPCustomCanvas; const Bounds:TRect; width:integer; const c:TFPColor);
 var info : TEllipseInfo;
     r, y : integer;
-    id : PEllipseInfoData;
     w : integer;
 begin
   info := TEllipseInfo.Create;
@@ -579,7 +550,6 @@ end;
 procedure FillEllipseHashBackDiagonal (Canv:TFPCustomCanvas; const Bounds:TRect; width:integer; const c:TFPColor);
 var info : TEllipseInfo;
     r, y : integer;
-    id : PEllipseInfoData;
     w : integer;
 begin
   info := TEllipseInfo.Create;
@@ -601,7 +571,6 @@ end;
 procedure FillEllipseHashDiagCross (Canv:TFPCustomCanvas; const Bounds:TRect; width:integer; const c:TFPColor);
 var info : TEllipseInfo;
     r, y : integer;
-    id : PEllipseInfoData;
     wy,w1,w2 : integer;
 begin
   info := TEllipseInfo.Create;
@@ -627,7 +596,6 @@ end;
 procedure FillEllipseHashCross (Canv:TFPCustomCanvas; const Bounds:TRect; width:integer; const c:TFPColor);
 var info : TEllipseInfo;
     r, y : integer;
-    id : PEllipseInfoData;
 begin
   info := TEllipseInfo.Create;
   try
@@ -649,7 +617,6 @@ end;
 procedure FillEllipseImage (Canv:TFPCustomCanvas; const Bounds:TRect; const Image:TFPCustomImage);
 var info : TEllipseInfo;
     r, y : integer;
-    id : PEllipseInfoData;
     w : integer;
 begin
   info := TEllipseInfo.Create;
@@ -670,7 +637,6 @@ end;
 procedure FillEllipseImageRel (Canv:TFPCustomCanvas; const Bounds:TRect; const Image:TFPCustomImage);
 var info : TEllipseInfo;
     r, y : integer;
-    id : PEllipseInfoData;
     xo,yo, xi,yi : integer;
 begin
   info := TEllipseInfo.Create;

packages/fcl-image/src/fpcanvas.inc

@@ -64,7 +64,6 @@ end;
 
 procedure TFPCustomCanvas.RemoveHelpers;
 var r : integer;
-    OldState : boolean;
 begin
   for r := FHelpers.count-1 downto 0 do
     with TFPCanvasHelper(FHelpers[r]) do
@@ -334,6 +333,7 @@ end;
 
 function TFPCustomCanvas.TextExtent(const Text: string): TSize;
 begin
+  Result:=Default(TSize);
   GetTextSize(Text, Result.cx, Result.cy);
 end;
 
@@ -381,6 +381,7 @@ end;
 
 function TFPCustomCanvas.TextExtent(const Text: unicodestring): TSize;
 begin
+  Result:=Default(TSize);
   GetTextSize(Text, Result.cx, Result.cy);
 end;
 
@@ -684,7 +685,7 @@ begin
 end;
         
 procedure TFPCustomCanvas.Rectangle (const Bounds:TRect);
-var np,nb,dp,db,pb : boolean;
+var np,nb,dp,db: boolean;
 begin
   np:= Pen.style <> psClear; // Need pen ?
   nb:= Brush.style <> bsClear;  // Need brush ?
@@ -802,7 +803,7 @@ begin
 end;
 
 procedure TFPCustomCanvas.StretchDraw(x, y, w, h: integer; source: TFPCustomImage);
-var i : TFPCustomInterpolation;
+var
     FreeInterpolation : boolean;
     IP : TFPCustomInterpolation;
 begin

packages/fcl-image/src/fpinterpolation.inc

@@ -139,7 +139,6 @@ var
   yEntry: Pointer;
   SrcStartY: LongInt;
   LastSrcStartY: LongInt;
-  LastyEntry: Pointer;
   sy: Integer;
   xEntry: Pointer;
   sx: LongInt;
@@ -162,7 +161,6 @@ begin
     // current y line
     GetMem(HorzResized,w*ySupport*SizeOf(TFPColor));
 
-    LastyEntry:=nil;
     SrcStartY:=0;
     for dy:=0 to h-1 do
     begin
@@ -173,7 +171,6 @@ begin
         NewSupportLines:=ySupport;
       end else
       begin
-        LastyEntry:=yEntry;
         LastSrcStartY:=SrcStartY;
         inc(yEntry,yEntrySize);
         SrcStartY:=PInteger(yEntry)^;

packages/fcl-image/src/fpwritebmp.pp

@@ -414,6 +414,7 @@ var i, j, k, couples, singles, lastsingle : integer;
     nibline : pbyte; { temporary array of nibbles }
     even : boolean;
 begin
+  even:=false;
   getmem(nibline,width);
   try
     k:=(Width div 2) + (Width mod 2);

packages/fcl-image/src/pixtools.pp

@@ -60,7 +60,7 @@ procedure FillFloodImageRel (Canv:TFPCustomCanvas; x,y :integer; const Image:TFP
 
 implementation
 
-uses clipping, ellipses;
+uses clipping;
 
 procedure FillRectangleColor (Canv:TFPCustomCanvas; x1,y1, x2,y2:integer);
 begin
@@ -587,7 +587,7 @@ type
     DoneList : TList;
   end;
 
-function FindDoneIndex (const data:PFloodFillData; x:integer; var index:integer):boolean;
+function FindDoneIndex (const data:PFloodFillData; x:integer; out index:integer):boolean;
 begin
   with data^.DoneList do
     begin