Merge pull request #177 from romanzaycev/master

Author: peter279k

lib/ImageResize.php

@@ -105,6 +105,11 @@ public function __construct($filename)
         if (!defined('IMAGETYPE_WEBP')) {
             define('IMAGETYPE_WEBP', 18);
         }
+
+        if (!defined('IMAGETYPE_BMP')) {
+            define('IMAGETYPE_BMP', 6);
+        }
+
         if ($filename === null || empty($filename) || (substr($filename, 0, 5) !== 'data:' && !is_file($filename))) {
             throw new ImageResizeException('File does not exist');
         }
@@ -129,6 +134,10 @@ public function __construct($filename)
 
         if (!$checkWebp) {
             if (!$image_info) {
+                if (strstr(finfo_file($finfo, $filename), 'image') !== false) {
+                    throw new ImageResizeException('Unsupported image type');
+                }
+
                 throw new ImageResizeException('Could not read file');
             }
 
@@ -162,6 +171,13 @@ public function __construct($filename)
 
             break;
 
+        case IMAGETYPE_BMP:
+            if (version_compare(PHP_VERSION, '7.2.0', '<')) {
+                throw new ImageResizeException('For bmp support PHP >= 7.2.0 is required');
+            }
+            $this->source_image = imagecreatefrombmp($filename);
+            break;
+
         default:
             throw new ImageResizeException('Unsupported image type');
         }
@@ -170,6 +186,8 @@ public function __construct($filename)
             throw new ImageResizeException('Could not load image');
         }
 
+        finfo_close($finfo);
+
         return $this->resize($this->getSourceWidth(), $this->getSourceHeight());
     }
 
@@ -291,6 +309,22 @@ public function save($filename, $image_type = null, $quality = null, $permission
             imagecolortransparent($dest_image, $background);
             imagefill($dest_image, 0, 0, $background);
             break;
+
+        case IMAGETYPE_BMP:
+            if (version_compare(PHP_VERSION, '7.2.0', '<')) {
+                throw new ImageResizeException('For WebP support PHP >= 7.2.0 is required');
+            }
+
+            if(!empty($exact_size) && is_array($exact_size)) {
+                $dest_image = imagecreatetruecolor($exact_size[0], $exact_size[1]);
+                $background = imagecolorallocate($dest_image, 255, 255, 255);
+                imagefilledrectangle($dest_image, 0, 0, $exact_size[0], $exact_size[1], $background);
+            } else {
+                $dest_image = imagecreatetruecolor($this->getDestWidth(), $this->getDestHeight());
+                $background = imagecolorallocate($dest_image, 255, 255, 255);
+                imagefilledrectangle($dest_image, 0, 0, $this->getDestWidth(), $this->getDestHeight(), $background);
+            }
+            break;
         }
 
         imageinterlace($dest_image, $this->interlace);
@@ -361,6 +395,10 @@ public function save($filename, $image_type = null, $quality = null, $permission
 
             imagepng($dest_image, $filename, $quality);
             break;
+
+        case IMAGETYPE_BMP:
+            imagebmp($dest_image, $filename, $quality);
+            break;
         }
 
         if ($permissions) {

test/ImageResizeTest.php

@@ -10,10 +10,11 @@ class ImageResizeTest extends TestCase
     private $image_types = array(
         'gif',
         'jpeg',
-        'png'
+        'png',
+        'bmp',
     );
 
-    private $unsupported_image = 'Qk08AAAAAAAAADYAAAAoAAAAAQAAAAEAAAABABAAAAAAAAYAAAASCwAAEgsAAAAAAAAAAAAA/38AAAAA';
+    private $unsupported_image = 'AAAKAAAAAAAAAAAAAQABABgAAF9SlQAAAAAAAAAAVFJVRVZJU0lPTi1YRklMRS4A';
     private $image_string = 'R0lGODlhAQABAIAAAAQCBP///yH5BAEAAAEALAAAAAABAAEAAAICRAEAOw==';
     private $data_url = 'data:image/gif;base64,R0lGODlhAQABAIAAAAQCBP///yH5BAEAAAEALAAAAAABAAEAAAICRAEAOw==';
 
@@ -67,6 +68,15 @@ public function testLoadWebp()
         $this->assertInstanceOf('\Gumlet\ImageResize', $resize);
     }
 
+    public function testLoadBmp()
+    {
+        $image = __DIR__ . '/ressources/test_bmp.bmp';
+        $resize = new ImageResize($image);
+
+        $this->assertEquals(IMAGETYPE_BMP, $resize->source_type);
+        $this->assertInstanceOf('\Gumlet\ImageResize', $resize);
+    }
+
     public function testLoadString()
     {
         $resize = ImageResize::createFromString(base64_decode($this->image_string));
@@ -394,6 +404,15 @@ public function testSavePng()
         $this->assertEquals(IMAGETYPE_PNG, exif_imagetype($filename));
     }
 
+    public function testSaveBmp()
+    {
+        $image = $this->createImage(200, 100, 'png');
+        $resize = new ImageResize($image);
+        $filename = $this->getTempFile();
+        $resize->save($filename, IMAGETYPE_BMP);
+        $this->assertEquals(IMAGETYPE_BMP, exif_imagetype($filename));
+    }
+
     public function testSaveChmod()
     {
         $image = $this->createImage(200, 100, 'png');