fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-25 13:22:16 +09:00
Code Issues Projects Releases Packages Wiki Activity

Allow customization of resize and conversion quality

Browse source
This commit is contained in:
Kijin Sung 2019-08-01 14:28:29 +09:00
parent 2b67798cab
commit b9208a682b
6 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/file/file.controller.php
View file

@ -1045,11 +1045,11 @@ class fileController extends file
// Check image type
if($config->image_autoconv['bmp2jpg'] && function_exists('imagebmp') && $image_type === 6)
{
$convert = array($image_width, $image_height, 'jpg');
$convert = array($image_width, $image_height, 'jpg', $config->image_autoconv_quality ?: 75);
}
if($config->image_autoconv['webp2jpg'] && function_exists('imagewebp') && $image_type === 18)
{
$convert = array($image_width, $image_height, 'jpg');
$convert = array($image_width, $image_height, 'jpg', $config->image_autoconv_quality ?: 75);
}
// Check image size
@ -1102,7 +1102,7 @@ class fileController extends file
$resize_height = $config->max_image_height;
}
$target_type = in_array($image_type, array(6, 8, 18)) ? 'jpg' : $file_info['extension'];
$convert = array(intval($resize_width), intval($resize_height), $target_type);
$convert = array(intval($resize_width), intval($resize_height), $target_type, $config->max_image_size_quality ?: 75);
}
}
}
@ -1110,8 +1110,7 @@ class fileController extends file
// Convert image if necessary
if ($convert)
{
$quality = 75;
$result = FileHandler::createImageFile($file_info['tmp_name'], $file_info['tmp_name'] . '.conv', $convert[0], $convert[1], $convert[2], 'crop', $quality);
$result = FileHandler::createImageFile($file_info['tmp_name'], $file_info['tmp_name'] . '.conv', $convert[0], $convert[1], $convert[2], 'crop', $convert[3]);
if ($result)
{
$file_info['name'] = preg_replace('/\.' . preg_quote($file_info['extension'], '/') . '$/i', '.' . $convert[2], $file_info['name']);