Skip to content

Jpeg use imagick #16158

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
nachoparker wants to merge 3 commits into from
Closed

Jpeg use imagick #16158

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20ac35e
option to use imagick in preview generation with extended opts
nachoparker Jun 16, 2019
9e29455
allow a config item to test imagecopyresized
nachoparker Jun 28, 2019
a8b5187
just add a new author
nachoparker Jul 1, 2019
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
Prev Previous commit
Next Next commit
allow a config item to test imagecopyresized 
Signed-off-by: nachoparker <[email protected]>
  • Loading branch information
@nachoparker
nachoparker committed Jun 28, 2019
commit 9e29455ccebed2e74b5b13716a1ee42e3d5a8172
14 changes: 12 additions & 2 deletions lib/private/legacy/image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,12 @@ public function preciseResize(int $width, int $height): bool {
imagesavealpha($process, true);
}

imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
$interpolate = (bool)$this->config->getSystemValue('preview_interpolate', false);
if ($interpolate) {
imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
} else {
imagecopyresized($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
}
if ($process == false) {
$this->logger->error(__METHOD__ . '(): Error re-sampling process image', array('app' => 'core'));
imagedestroy($process);
Expand Down Expand Up @@ -950,7 +955,12 @@ public function centerCrop($size = 0) {
imagesavealpha($process, true);
}

imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
$interpolate = (bool)$this->config->getSystemValue('preview_interpolate', false);
if ($interpolate) {
imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
} else {
imagecopyresized($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
}
if ($process == false) {
$this->logger->error('OC_Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, array('app' => 'core'));
imagedestroy($process);
Expand Down