Skip to content

Added support for WebP #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Added support for WebP #85

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a2c463c
Added support for WebP
rakshazi Jul 6, 2017
f2f178e
Updated minimal PHP requirements in composer json
rakshazi Jul 6, 2017
c5d5b65
Added definiton of IMAGETYPE_WEBP if not exists
rakshazi Jul 6, 2017
032d9db
Improved file validation and error handling.
Jun 19, 2017
d5482be
better quality support
emiliodeg Jun 27, 2017
4d21000
Update ImageResize.php
emiliodeg Jun 28, 2017
9a2e050
Added exception if WebP tried on PHP < 5.5.0
Jul 31, 2017
6a67dc6
Merge branch 'master' into patch-1
rakshazi Jul 31, 2017
cd5d24c
Bugfix after resolved conflicts
Jul 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
],
"require": {
"php": ">=5.3.0",
"php": ">=5.5.0",
"ext-gd": "*"
},
"suggest": {
Expand Down
24 changes: 24 additions & 0 deletions lib/ImageResize.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class ImageResize
const CROPTOPCENTER = 6;

public $quality_jpg = 85;
public $quality_webp = 85;
public $quality_png = 6;
public $quality_truecolor = TRUE;

Expand Down Expand Up @@ -62,6 +63,10 @@ public static function createFromString($image_data)
*/
public function __construct($filename)
{
if(!defined('IMAGETYPE_WEBP')) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More info: https://bugs.php.net/bug.php?id=65038 and php/php-src#2157

define('IMAGETYPE_WEBP', 18);
}

$image_info = @getimagesize($filename);

if (!$image_info) {
Expand All @@ -87,6 +92,10 @@ public function __construct($filename)
$this->original_h = ImageSY($this->source_image);

break;

case IMAGETYPE_WEBP:
$this->source_image = imagecreatefromwebp($filename);
break;

case IMAGETYPE_PNG:
$this->source_image = imagecreatefrompng($filename);
Expand Down Expand Up @@ -164,6 +173,13 @@ public function save($filename, $image_type = null, $quality = null, $permission
$background = imagecolorallocate($dest_image, 255, 255, 255);
imagefilledrectangle($dest_image, 0, 0, $this->getDestWidth(), $this->getDestHeight(), $background);
break;

case IMAGETYPE_WEBP:
$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;

case IMAGETYPE_PNG:
if (!$this->quality_truecolor && !imageistruecolor($this->source_image)) {
Expand Down Expand Up @@ -208,6 +224,14 @@ public function save($filename, $image_type = null, $quality = null, $permission

imagejpeg($dest_image, $filename, $quality);
break;

case IMAGETYPE_WEBP:
if ($quality === null) {
$quality = $this->quality_webp;
}

imagewebp($dest_image, $filename, $quality);
break;

case IMAGETYPE_PNG:
if ($quality === null) {
Expand Down