Fixed GD compatibility issue while using the imagescale function

tooleks · Jul 7, 2017 · 64e2042 · 64e2042
1 parent a7f8d05
commit 64e2042
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "tooleks/php-avg-color-picker",
   "type": "library",
   "description": "The PHP Average Color Picker Library",
-  "version": "1.0.2",
+  "version": "1.1.2",
   "keywords": [
     "php",
     "average",

diff --git a/phpunit.xml b/phpunit.xml
diff --git a/resources/input.jpg b/resources/input.jpg
diff --git a/resources/output.jpg b/resources/output.jpg
diff --git a/src/Contracts/AvgColorPickerException.php b/src/Contracts/AvgColorPickerException.php
diff --git a/src/Exceptions/InvalidArgumentException.php b/src/Exceptions/InvalidArgumentException.php
diff --git a/src/Exceptions/InvalidImageDimensionException.php b/src/Exceptions/InvalidImageDimensionException.php
diff --git a/src/Exceptions/InvalidMimeTypeException.php b/src/Exceptions/InvalidMimeTypeException.php
diff --git a/src/Gd/Image.php b/src/Gd/Image.php
@@ -134,7 +134,7 @@ public function getHeight(): int
      */
     public function getAvgRgb(): array
     {
-        $resource = imagescale($this->resource, 1, 1, IMG_BICUBIC);
+        $resource = imagescale($this->resource, 1, 1);
 
         $rgba = imagecolorsforindex($resource, imagecolorat($resource, 0, 0));
 

diff --git a/tests/samples/invalid_image.jpg b/tests/samples/invalid_image.jpg
diff --git a/tests/samples/valid_image.gif b/tests/samples/valid_image.gif
diff --git a/tests/samples/valid_image.jpg b/tests/samples/valid_image.jpg
diff --git a/tests/samples/valid_image.png b/tests/samples/valid_image.png
diff --git a/tests/unit/ColorConverterUnitTest.php b/tests/unit/ColorConverterUnitTest.php
diff --git a/tests/unit/UnitTestCase.php b/tests/unit/UnitTestCase.php
@@ -41,24 +41,24 @@ public function testValidImageProvider()
                 'path' => __DIR__ . '/../samples/valid_image.gif',
                 'width' => 400,
                 'height' => 225,
-                'avg_hex' => '#734534',
-                'avg_rgb' => [115, 69, 52],
+                'avg_hex' => '#754635',
+                'avg_rgb' => [117, 70, 53],
             ],
             [
                 'resource' => imagecreatefromjpeg(__DIR__ . '/../samples/valid_image.jpg'),
                 'path' => __DIR__ . '/../samples/valid_image.jpg',
                 'width' => 400,
                 'height' => 225,
-                'avg_hex' => '#6b4534',
-                'avg_rgb' => [107, 69, 52],
+                'avg_hex' => '#6d4635',
+                'avg_rgb' => [109, 70, 53],
             ],
             [
                 'resource' => imagecreatefrompng(__DIR__ . '/../samples/valid_image.png'),
                 'path' => __DIR__ . '/../samples/valid_image.png',
                 'width' => 400,
                 'height' => 225,
-                'avg_hex' => '#6b4534',
-                'avg_rgb' => [107, 69, 52],
+                'avg_hex' => '#6d4635',
+                'avg_rgb' => [109, 70, 53],
             ],
         ];
     }

diff --git a/tests/unit/gd/GdImage.php → tests/unit/gd/GdImageUnitTest.php b/tests/unit/gd/GdImage.php → tests/unit/gd/GdImageUnitTest.php
@@ -5,9 +5,9 @@
 use Tooleks\Php\AvgColorPicker\Gd\Image;
 
 /**
- * Class GdImage.
+ * Class GdImageUnitTest.
  */
-class GdImage extends UnitTestCase
+class GdImageUnitTest extends UnitTestCase
 {
     /**
      * @dataProvider testInvalidMimeTypeImagePathProvider