imagick && gd support webp format，solve php warning bug，imagick handle gif resize size bug

src/Grafika/Gd/Editor.php

@@ -575,7 +575,7 @@ public function resizeExactHeight(&$image, $newHeight)
         $resizeHeight = $newHeight;
         $resizeWidth  = $newHeight * $ratio;
 
-        $this->_resize($image, $resizeWidth, $resizeHeight);
+        $this->_resize($image, intval(round($resizeWidth)), $resizeHeight);
 
         return $this;
     }
@@ -596,7 +596,7 @@ public function resizeExactWidth(&$image, $newWidth)
         $ratio  = $width / $height;
 
         $resizeWidth  = $newWidth;
-        $resizeHeight = round($newWidth / $ratio);
+        $resizeHeight = intval(round($newWidth / $ratio));
 
         $this->_resize($image, $resizeWidth, $resizeHeight);
 
@@ -628,7 +628,7 @@ public function resizeFill(&$image, $newWidth, $newHeight)
             $optimumHeight = $newHeight;
         }
 
-        $this->_resize($image, $optimumWidth, $optimumHeight);
+        $this->_resize($image, intval(round($optimumWidth)), intval(round($optimumHeight)));
         $this->crop($image, $newWidth, $newHeight); // Trim excess parts
 
         return $this;
@@ -748,6 +748,14 @@ public function save($image, $file, $type = null, $quality = null, $interlace =
                 imagepng($image->getCore(), $file);
                 break;
 
+            case ImageType::BMP :
+                imagebmp($image->getCore(), $file);
+                break;
+
+            case ImageType::WEBP :
+                imagewebp($image->getCore(), $file, $quality);
+                break;
+
             default: // Defaults to jpeg
                 $quality = ($quality === null) ? 75 : $quality; // Default to 75 (GDs default) if null.
                 $quality = ($quality > 100) ? 100 : $quality;
@@ -1058,6 +1066,10 @@ private function _getImageTypeFromFileName($imageFile)
             return ImageType::PNG;
         } else if ('wbm' === $ext or 'wbmp' === $ext) {
             return ImageType::WBMP;
+        } else if ('bmp' == $ext) {
+            return ImageType::BMP;
+        } else if ('webp' == $ext) {
+            return ImageType::WEBP;
         } else {
             return ImageType::UNKNOWN;
         }
@@ -1176,4 +1188,4 @@ private function _smartCrop($oldImage, $cropW, $cropH){
 
         return array($x,$y);
     }
-}
+}

src/Grafika/Gd/Helper/GifHelper.php

@@ -504,8 +504,8 @@ public function resize($blocks, $newW, $newH){
                 $dY * $cY, // dy
                 0,
                 0,
-                $image['frames'][0]['imageWidth'] * $cX,
-                $image['frames'][0]['imageHeight'] * $cY,
+                intval(round($image['frames'][0]['imageWidth'] * $cX)),
+                intval(round($image['frames'][0]['imageHeight'] * $cY)),
                 $width,
                 $height
             );
@@ -602,4 +602,4 @@ private function _fixSize($string, $size, $char='0'){
     private function _switchEndian($hexString) {
         return implode('', array_reverse(str_split($hexString, 2)));
     }
-}
+}

src/Grafika/Gd/Image.php

@@ -106,6 +106,10 @@ public function blob( $type = 'PNG' ) {
 
             imagewbmp( $this->gd );
 
+        } else if ( ImageType::WEBP == $type ) {
+
+            imagewebp( $this->gd );
+
         } else {
             throw new \Exception( sprintf( 'File type "%s" not supported.', $type ) );
         }
@@ -141,6 +145,10 @@ public static function createFromFile( $imageFile ) {
 
             return self::_createWbmp( $imageFile );
 
+        } else if ( ImageType::WEBP == $type ) {
+
+            return self::_createWebp( $imageFile );
+
         } else {
             throw new \Exception( sprintf( 'Could not open "%s". File type not supported.', $imageFile ) );
         }
@@ -418,6 +426,16 @@ private static function _createWbmp( $imageFile ){
         return new self( $gd, $imageFile, imagesx( $gd ), imagesy( $gd ), ImageType::WBMP );
     }
 
+    private static function _createWebp( $imageFile ){
+        $gd = @imagecreatefromwebp( $imageFile );
+
+        if(!$gd){
+            throw new \Exception( sprintf('Could not open "%s". Not a valid %s file.', $imageFile, ImageType::WBMP) );
+        }
+
+        return new self( $gd, $imageFile, imagesx( $gd ), imagesy( $gd ), ImageType::WEBP );
+    }
+
     /**
      * @param $imageFile
      *
@@ -450,8 +468,10 @@ private static function _guessType( $imageFile ){
 
             return ImageType::WBMP;
 
+        } else if ( IMG_WEBP == $type ) {
+            return ImageType::WEBP;
         }
 
         return ImageType::UNKNOWN;
     }
-}
+}

src/Grafika/ImageType.php

@@ -18,4 +18,8 @@ class ImageType {
     const PNG = 'PNG';
 
     const WBMP = 'WBMP';
-}
+
+    const BMP = 'BMP';
+
+    const WEBP = 'WEBP';
+}

src/Grafika/Imagick/Editor.php

@@ -471,7 +471,7 @@ public function resizeExactHeight(&$image, $newHeight)
         $ratio  = $width / $height;
 
         $resizeHeight = $newHeight;
-        $resizeWidth  = $newHeight * $ratio;
+        $resizeWidth  = intval(round($newHeight * $ratio));
 
         $this->_resize($image, $resizeWidth, $resizeHeight);
 
@@ -494,7 +494,7 @@ public function resizeExactWidth(&$image, $newWidth)
         $ratio  = $width / $height;
 
         $resizeWidth  = $newWidth;
-        $resizeHeight = round($newWidth / $ratio);
+        $resizeHeight = intval(round($newWidth / $ratio));
 
         $this->_resize($image, $resizeWidth, $resizeHeight);
 
@@ -526,7 +526,7 @@ public function resizeFill(&$image, $newWidth, $newHeight)
             $optimumHeight = $newHeight;
         }
 
-        $this->_resize($image, $optimumWidth, $optimumHeight);
+        $this->_resize($image, intval(round($optimumWidth)), intval(round($optimumHeight)));
         $this->crop($image, $newWidth, $newHeight); // Trim excess parts
 
         return $this;
@@ -624,6 +624,12 @@ public function save( $image, $file, $type = null, $quality = null, $interlace =
                 $image->getCore()->writeImages($file, true); // Support animated image. Eg. GIF
                 break;
 
+            case ImageType::BMP :
+            case ImageType::WEBP :
+                $image->getCore()->setFormat($type);
+                $image->getCore()->setImageCompressionQuality($quality);
+                $image->getCore()->writeImages($file, true);
+                break;
             case ImageType::PNG :
                 // PNG is lossless and does not need compression. Although GD allow values 0-9 (0 = no compression), we leave it alone.
                 $image->getCore()->setImageFormat($type);
@@ -791,7 +797,7 @@ private function _resize(&$image, $newWidth, $newHeight)
 
             // Assign new image with frames
             $image = new Image($imagick->deconstructImages(), $image->getImageFile(), $newWidth, $newHeight,
-                $image->getType());
+                $image->getType(), $image->isAnimated());
         } else { // Single frame image. Eg. JPEG, PNG
 
             $image->getCore()->resizeImage($newWidth, $newHeight, \Imagick::FILTER_LANCZOS, 1, false);
@@ -819,9 +825,13 @@ private function _getImageTypeFromFileName($imageFile)
             return ImageType::GIF;
         } else if ('png' == $ext) {
             return ImageType::PNG;
+        } else if ('bmp' == $ext) {
+            return ImageType::BMP;
+        } else if ('webp' == $ext) {
+            return ImageType::WEBP;
         } else {
             return ImageType::UNKNOWN;
         }
     }
 
-}
+}

src/Grafika/Imagick/Image.php

@@ -94,7 +94,7 @@ public static function createFromFile( $imageFile ){
 
         $imagick = new \Imagick( realpath($imageFile) );
         $animated = false;
-        if ($imagick->getImageIterations() > 0) {
+        if ($imagick->getNumberImages() > 0) {
             $animated = true;
         }
 
@@ -266,4 +266,4 @@ public function isAnimated() {
         return $this->animated;
     }
 
-}
+}