Changeset 95 for trunk/Packages/Common/Image.php

Timestamp:

Dec 6, 2021, 11:33:48 AM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Added: Explicit types for better type checking.
• Fixed: Support for php 8.0.

File:

• trunk/Packages/Common/Image.php (modified) (10 diffs)

trunk/Packages/Common/Image.php

@@ -9 +9 @@
 class Font
 {
-  var $Size;
-  var $FileName;
-  var $Color;
+  public int $Size;
+  public string $FileName;
+  public int $Color;
 
   function __construct()
@@ -23 +23 @@
 class Pen
 {
-  var $Color;
-  var $X;
-  var $Y;
+  public int $Color;
+  public int $X;
+  public int $Y;
 
   function __construct()
@@ -33 +33 @@
     $this->Y = 0;
   }
-
 }
 
 class Brush
 {
-  var $Color;
+  public int $Color;
 
   function __construct()
@@ -44 +43 @@
     $this->Color = COLOR_BLACK;
   }
-
 }
 
 class Image
 {
-  var $Image;
-  var $Type;
-  var $Font;
-  var $Pen;
+  public $Image;
+  public int $Type;
+  public Font $Font;
+  public Pen $Pen;
+  public Brush $Brush;
 
   function __construct()
@@ -63 +62 @@
   }
 
-  function SaveToFile($FileName)
+  function SaveToFile(string $FileName): void
   {
     if ($this->Type == IMAGETYPE_JPEG)
@@ -71 +70 @@
     if ($this->Type == IMAGETYPE_GIF)
     {
-      imagegif ($this->Image, $FileName);
+      imagegif($this->Image, $FileName);
     } else
     if ($this->Type == IMAGETYPE_PNG)
@@ -79 +78 @@
   }
 
-  function LoadFromFile($FileName)
+  function LoadFromFile(string $FileName): void
   {
     $ImageInfo = getimagesize($FileName);
@@ -89 +88 @@
     if ($this->Type == IMAGETYPE_GIF)
     {
-      $this->Image = imagecreatefromgif($FileName);
+      $this->Image = imagecreatefromgif ($FileName);
     } else
     if ( $this->Type == IMAGETYPE_PNG)
@@ -97 +96 @@
   }
 
-  function Output()
+  function Output(): void
   {
-    $this->SaveToFile(NULL);
+    $this->SaveToFile('');
   }
 
-  function SetSize($Width, $Height)
+  function SetSize(int $Width, int $Height): void
   {
     $NewImage = imagecreatetruecolor($Width, $Height);
@@ -110 +109 @@
   }
 
-  function GetWidth()
+  function GetWidth(): int
   {
     return imagesx($this->Image);
   }
 
-  function GetHeight()
+  function GetHeight(): int
   {
     return imagesy($this->Image);
   }
 
-  function TextOut($X, $Y, $Text)
+  function TextOut(int $X, int $Y, string $Text): void
   {
     imagettftext($this->Image, $this->Font->Size, 0, $X, $Y, $this->ConvertColor($this->Font->Color), $this->Font->FileName, $Text);
   }
 
-  function ConvertColor($Color)
+  function ConvertColor(int $Color): int
   {
     return imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff);
   }
 
-  function FillRect($X1, $Y1, $X2, $Y2)
+  function FillRect(int $X1, int $Y1, int $X2, int $Y2): void
   {
     imagefilledrectangle($this->Image, $X1, $Y1, $X2, $Y2, $this->ConvertColor($this->Brush->Color));
   }
 
-  function Line($X1, $Y1, $X2, $Y2)
+  function Line(int $X1, int $Y1, int $X2, int $Y2): void
   {
     imageline($this->Image, $X1, $Y1, $X2, $Y2, $this->ConvertColor($this->Pen->Color));