Fixes problem with red border in ellipse, arc and roundedRectangle (#273

)
claviska · Apr 20, 2021 · 0fde9fe · 0fde9fe
1 parent 255d9e7
commit 0fde9fe
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/claviska/SimpleImage.php b/src/claviska/SimpleImage.php
@@ -1378,7 +1378,7 @@ public function arc($x, $y, $width, $height, $start, $end, $color, $thickness =
       imagefilledarc($tempImage->image, $x, $y, $width+$thickness, $height+$thickness, $start, $end, $tempColor, IMG_ARC_PIE);
 
       // Draw a smaller ellipse filled with red|blue (-$thickness pixels)
-      $tempColor = ($color == 'red') ? 'blue' : 'red';
+      $tempColor = (self::normalizeColor($color)['red'] == 255) ? 'blue' : 'red';
       $tempColor = $tempImage->allocateColor($tempColor);
       imagefilledarc($tempImage->image, $x, $y, $width-$thickness, $height-$thickness, $start, $end, $tempColor, IMG_ARC_PIE);
 
@@ -1460,7 +1460,7 @@ public function ellipse($x, $y, $width, $height, $color, $thickness = 1) {
       imagefilledellipse($tempImage->image, $x, $y, $width+$thickness, $height+$thickness, $tempColor);
 
       // Draw a smaller ellipse filled with red|blue (-$thickness pixels)
-      $tempColor = ($color == 'red') ? 'blue' : 'red';
+      $tempColor = (self::normalizeColor($color)['red'] == 255) ? 'blue' : 'red';
       $tempColor = $tempImage->allocateColor($tempColor);
       imagefilledellipse($tempImage->image, $x, $y, $width-$thickness, $height-$thickness, $tempColor);
 
@@ -1620,7 +1620,7 @@ public function roundedRectangle($x1, $y1, $x2, $y2, $radius, $color, $thickness
       $tempImage->roundedRectangle($x1, $y1, $x2, $y2, $radius, $color,'filled');
 
       // Draw a smaller rectangle filled with red|blue (-$thickness pixels on each side)
-      $tempColor = ($color == 'red') ? 'blue' : 'red';
+      $tempColor = (self::normalizeColor($color)['red'] == 255) ? 'blue' : 'red';
       $radius = $radius - $thickness;
       $radius = self::keepWithin($radius, 0, $radius);
       $tempImage->roundedRectangle(