ave-cms-team/ave-cms
2
0
Fork 0
mirror of https://github.com/avecms/AVE.cms.git synced 2025-08-12 21:46:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added make progressive JPEG thumbnails

Browse Source
This commit is contained in:
M@d D3n
2020-05-25 19:20:22 +03:00
parent ee6fd31eed
commit 691f502d58
2 changed files with 16 additions and 2 deletions

9
class/class.thumbnail.php

@ -754,7 +754,7 @@
* @param bool $dither use dither * @param bool $dither use dither
* @return bool true on success, otherwise false * @return bool true on success, otherwise false
*/ */
function save($filename, $output_type = false, $output_quality = false, $dither = false) function save ($filename, $output_type = false, $output_quality = false, $dither = false)
{ {
if ($output_type === false) if ($output_type === false)
$output_type = $this->_img['main']['output_type']; $output_type = $this->_img['main']['output_type'];
@ -762,6 +762,7 @@
switch ($output_type) switch ($output_type)
{ {
case 1: case 1:
case '1':
case 'gif': case 'gif':
case 'GIF': case 'GIF':
if ($this->_types[1]['supported'] < 2) if ($this->_types[1]['supported'] < 2)
@ -807,7 +808,11 @@
if ($output_quality === false) if ($output_quality === false)
$output_quality = IMAGE_TOOLBOX_DEFAULT_JPEG_QUALITY; $output_quality = IMAGE_TOOLBOX_DEFAULT_JPEG_QUALITY;
if (defined('JPG_PROGRESSIVE') && JPG_PROGRESSIVE == true)
imageinterlace($this->_img['main']['resource'], 1);
imagejpeg($this->_img['main']['resource'], $filename, $output_quality); imagejpeg($this->_img['main']['resource'], $filename, $output_quality);
break; break;
case 3: case 3:
@ -1155,7 +1160,7 @@
} }
else else
{ {
trigger_error($this->_error_prefix . 'Outputwidth and -height must be integers greater zero.', E_USER_ERROR); trigger_error($this->_error_prefix . ' Output width and height must be integers greater zero.', E_USER_ERROR);
return null; return null;
} }

9
inc/config.php

@ -212,6 +212,15 @@
'VARIANT' => '' 'VARIANT' => ''
]; ];
//-- Создавать progressive JPG
$GLOBALS['CMS_CONFIG']['_CONST_THUMBS']['JPG_PROGRESSIVE'] = [
'DESCR' => 'Создавать progressive JPG',
'DEFAULT' => true,
'TYPE' => 'bool',
'VARIANT' => ''
];
//-- Генерировать миниатюрам IPTC //-- Генерировать миниатюрам IPTC
$GLOBALS['CMS_CONFIG']['_CONST_THUMBS']['THUMBNAIL_IPTC'] = [ $GLOBALS['CMS_CONFIG']['_CONST_THUMBS']['THUMBNAIL_IPTC'] = [
'DESCR' => 'Генерировать миниатюрам IPTC', 'DESCR' => 'Генерировать миниатюрам IPTC',