From 98d964adb90c08c0ac2d4cb5e1c7bc7d131149ea Mon Sep 17 00:00:00 2001
From: JCOGS Design <13821249+jcogs-design@users.noreply.github.com>
Date: Tue, 7 Jun 2022 19:07:53 +0100
Subject: [PATCH] Remove some php 8.1 deprecation warnings

Replace some implicit float->int conversions with use of round(x,0)
---
 src/Color.php | 101 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 83 insertions(+), 18 deletions(-)

diff --git a/src/Color.php b/src/Color.php
index 5efee50..4392a1b 100644
--- a/src/Color.php
+++ b/src/Color.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace GDText;
 
 /**
@@ -43,26 +44,72 @@ public function __construct($red = 0, $green = 0, $blue = 0, $alpha = null)
 
     /**
      * Parses string to Color object representation.
+     * Modified by Gavin Lawrie @ JCOGS Design to add rbg/rgba/4/8 hex colour support
+     * Updated code PRd to https://github.com/stil/gd-text on 21/Nov/2021
+     * 
      * @param string $str String with color information, ex. #000000
      * @return Color
-     * @todo Add parsing of CSS-like strings: rgb(), rgba(), hsl()
+     * @todo Add parsing of CSS-like string: hsl()
      */
     public static function parseString($str)
     {
+        // CSS opacity value is in range 0-1, where 1 = opaque, 0 = transparent.
+        // This is the opposite of GD where value is in range 0-127 and 0 = opaque, 127 = transparent
+        // Work with CSS type value until end of function and then flip into GD compatible value
+        // Set default opacity to CSS friendly value of 1 (fully opaque)
+        $alpha = 1;
+
+        // Remove # if present
         $str = str_replace('#', '', $str);
-        if (strlen($str) == 6) {
-            $r = hexdec(substr($str, 0, 2));
-            $g = hexdec(substr($str, 2, 2));
-            $b = hexdec(substr($str, 4, 2));
-        } else if (strlen($str) == 3) {
-            $r = hexdec(str_repeat(substr($str, 0, 1), 2));
-            $g = hexdec(str_repeat(substr($str, 1, 1), 2));
-            $b = hexdec(str_repeat(substr($str, 2, 1), 2));
+
+        // Check to see if str is in rgb(a) format
+        if (strtolower(substr($str, 0, 4)) == 'rgba') {
+            preg_match('/rgba\((.*)\)/', $str, $matches);
+            $values = explode(',', $matches[1]);
+            if (count($values) == 4) {
+                $alpha = trim(array_pop($values));
+            } else {
+                $alpha = $alpha ?? 1;
+            }
+            $rgb = $values;
+        } elseif (strtolower(substr($str, 0, 3)) == 'rgb') {
+            // Check to see if str is in rgb format
+            preg_match('/rgb\((.*)\)/', $str, $matches);
+            list($r, $g, $b) = explode(',', $matches[1]);
+            $rgb = array($r, $g, $b);
+        } elseif (strlen($str) == 8) {
+            // Check if str is in hexadecimal format and has 8, 6, 4 or 3 characters and get values
+            // If str has 8 or 4 then set alpha using the value
+            $rgb = array_map('hexdec', array($str[0] . $str[1], $str[2] . $str[3], $str[4] . $str[5]));
+            $alpha = round(hexdec($str[6] . $str[7]) / 255, 2);
+        } elseif (strlen($str) == 6) {
+            $rgb = array_map('hexdec', array($str[0] . $str[1], $str[2] . $str[3], $str[4] . $str[5]));
+        } elseif (strlen($str) == 4) {
+            $rgb = array_map('hexdec', array($str[0] . $str[0], $str[1] . $str[1], $str[2] . $str[2]));
+            $alpha = round(hexdec($str[4] . $str[4]) / 255, 2);
+        } elseif (strlen($str) == 3) {
+            $rgb = array_map('hexdec', array($str[0] . $str[0], $str[1] . $str[1], $str[2] . $str[2]));
         } else {
             throw new \InvalidArgumentException('Unrecognized color.');
         }
 
-        return new Color($r, $g, $b);
+        // Normalise rgb values if necessary
+        foreach ($rgb as $color) {
+            $color = $color > 255 ? 255 : $color;
+            $color = $color < 0 ? 0 : $color;
+        }
+
+        //Normalise alpha value if necessary
+        $alpha = $alpha > 1 ? 1 : $alpha;
+        $alpha = $alpha < 0 ? 0 : $alpha;
+
+        // Flip from CSS opacity to GD alpha form
+        $alpha = (1 - $alpha) * 127;
+
+        // Expand $rgb
+        list($r, $g, $b) = $rgb;
+
+        return new Color($r, $g, $b, $alpha);
     }
 
     /**
@@ -91,8 +138,8 @@ public static function fromHsl($h, $s, $l)
         // Check http://en.wikipedia.org/wiki/HSL_and_HSV#From_HSL for details
         $chroma = (1 - abs(2 * $l - 1)) * $s;
         $h_     = $h * 6;
-        $x      = $chroma * (1 - abs((fmod($h_,2)) - 1)); // Note: fmod because % (modulo) returns int value!!
-        $m = $l - round($chroma/2, 10); // Bugfix for strange float behaviour (e.g. $l=0.17 and $s=1)
+        $x      = $chroma * (1 - abs((fmod($h_, 2)) - 1)); // Note: fmod because % (modulo) returns int value!!
+        $m = $l - round($chroma / 2, 10); // Bugfix for strange float behaviour (e.g. $l=0.17 and $s=1)
 
         if ($h_ >= 0 && $h_ < 1) $rgb = array(($chroma + $m), ($x + $m), $m);
         elseif ($h_ >= 1 && $h_ < 2) $rgb = array(($x + $m), ($chroma + $m), $m);
@@ -106,7 +153,7 @@ public static function fromHsl($h, $s, $l)
     }
 
     /**
-     * @param resource $image GD image resource
+     * @param resource|\GdImage $image GD image resource
      * @return int Returns the index of the specified color+alpha in the palette of the image,
      *             or index of allocated color if the color does not exist in the image's palette.
      */
@@ -114,9 +161,18 @@ public function getIndex($image)
     {
         $index = $this->hasAlphaChannel()
             ? imagecolorexactalpha(
-                $image, $this->red, $this->green, $this->blue, $this->alpha)
+                $image,
+                round($this->red,0),
+                round($this->green,0),
+                round($this->blue,0),
+                round($this->alpha,0)
+            )
             : imagecolorexact(
-                $image, $this->red, $this->green, $this->blue);
+                $image,
+                round($this->red,0),
+                round($this->green,0),
+                round($this->blue,0)
+            );
 
         if ($index !== -1) {
             return $index;
@@ -124,9 +180,18 @@ public function getIndex($image)
 
         return $this->hasAlphaChannel()
             ? imagecolorallocatealpha(
-                $image, $this->red, $this->green, $this->blue, $this->alpha)
+                $image,
+                round($this->red,0),
+                round($this->green,0),
+                round($this->blue,0),
+                round($this->alpha,0)
+            )
             : imagecolorallocate(
-                $image, $this->red, $this->green, $this->blue);
+                $image,
+                round($this->red,0),
+                round($this->green,0),
+                round($this->blue,0),
+            );
     }
 
     /**
@@ -144,4 +209,4 @@ public function toArray()
     {
         return array($this->red, $this->green, $this->blue);
     }
-}
\ No newline at end of file
+}