Skip to content

Vendi fixing image resize dimensions bug #93

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

Open
cjhaas wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Vendi fixing image resize dimensions bug #93

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
448979a
Add better support when image_resize_dimensions returns false
cjhaas Jul 17, 2020
c95817e
Whitespace
cjhaas Jul 17, 2020
e63f563
Whitespace
cjhaas Jul 17, 2020
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
16 changes: 12 additions & 4 deletions includes/resizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,26 +98,34 @@ public function process( $url, $width = null, $height = null, $crop = null, $sin

// Get image size after cropping.
$dims = image_resize_dimensions( $orig_w, $orig_h, $width, $height, $crop );
$dst_w = $dims[4];
$dst_h = $dims[5];

// Return the original image only if it exactly fits the needed measures.
if ( ! $dims && ( ( ( null === $height && $orig_w == $width ) xor ( null === $width && $orig_h == $height ) ) xor ( $height == $orig_h && $width == $orig_w ) ) ) {
$img_url = $url;
$dst_w = $orig_w;
$dst_h = $orig_h;
} else {

if ( ! $dims ) {
// Can't resize, so return false saying that the action to do could not be processed as planned.
return false;
}

$dst_w = $dims[4];
$dst_h = $dims[5];

// Use this to check if cropped image already exists, so we can return that instead.
$suffix = "{$dst_w}x{$dst_h}";
$dst_rel_path = str_replace( '.' . $ext, '', $rel_path );
$destfilename = "{$upload_dir}{$dst_rel_path}-{$suffix}.{$ext}";

if ( ! $dims || ( true == $crop && false == $upscale && ( $dst_w < $width || $dst_h < $height ) ) ) {
if ( ( true == $crop && false == $upscale && ( $dst_w < $width || $dst_h < $height ) ) ) {
// Can't resize, so return false saying that the action to do could not be processed as planned.
return false;
}

// Else check if cache exists.
elseif ( file_exists( $destfilename ) && getimagesize( $destfilename ) ) {
if ( file_exists( $destfilename ) && getimagesize( $destfilename ) ) {
$img_url = "{$upload_url}{$dst_rel_path}-{$suffix}.{$ext}";
}
// Else, we resize the image and return the new resized image url.
Expand Down