[ci skip] Merge pull request #5883 from adevesa/image_lib-webp

image/webp for Image lib 

2 files changed, 27 insertions, 0 deletions

diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php
index c34b087c7..9a26b8a9b 100644
--- a/system/language/english/imglib_lang.php
+++ b/system/language/english/imglib_lang.php
@@ -44,6 +44,7 @@ $lang['imglib_unsupported_imagecreate'] = 'Your server does not support the GD f
 $lang['imglib_gif_not_supported'] = 'GIF images are often not supported due to licensing restrictions. You may have to use JPG or PNG images instead.';
 $lang['imglib_jpg_not_supported'] = 'JPG images are not supported.';
 $lang['imglib_png_not_supported'] = 'PNG images are not supported.';
+$lang['imglib_webp_not_supported'] = 'WEBP images are not supported.';
 $lang['imglib_jpg_or_png_required'] = 'The image resize protocol specified in your preferences only works with JPEG or PNG image types.';
 $lang['imglib_copy_error'] = 'An error was encountered while attempting to replace the file. Please make sure your file directory is writable.';
 $lang['imglib_rotate_unsupported'] = 'Image rotation does not appear to be supported by your server.';
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 9cd0d1dfa..0d9fa4420 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -946,6 +946,10 @@ class CI_Image_lib {
 				$cmd_in		= 'pngtopnm';
 				$cmd_out	= 'ppmtopng';
 				break;
+			case 18 :
+				$cmd_in		= 'webptopnm';
+				$cmd_out	= 'ppmtowebp';
+				break;
 		}
 
 		if ($action === 'crop')
@@ -1470,6 +1474,13 @@ class CI_Image_lib {
 					$this->set_error(array('imglib_unsupported_imagecreate', 'imglib_png_not_supported'));
 					return FALSE;
 				}
+			case 18:
+				if ( ! function_exists('imagecreatefromwebp'))
+				{
+					$this->set_error(array('imglib_unsupported_imagecreate', 'imglib_webp_not_supported'));
+					return FALSE;
+				}
+				return imagecreatefromwebp($path);
 
 				return imagecreatefrompng($path);
 			default:
@@ -1532,6 +1543,19 @@ class CI_Image_lib {
 					return FALSE;
 				}
 			break;
+			case 18:
+				if ( ! function_exists('imagewebp'))
+				{
+					$this->set_error(array('imglib_unsupported_imagecreate', 'imglib_webp_not_supported'));
+					return FALSE;
+				}
+
+				if ( ! @imagewebp($resource, $this->full_dst_path))
+				{
+					$this->set_error('imglib_save_failed');
+					return FALSE;
+				}
+			break;
 			default:
 				$this->set_error(array('imglib_unsupported_imagecreate'));
 				return FALSE;
@@ -1573,6 +1597,8 @@ class CI_Image_lib {
 				break;
 			case 3	:	imagepng($resource);
 				break;
+			case 18	:	imagewebp($resource);
+				break;
 			default:	echo 'Unable to display the image';
 				break;
 		}