friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

only constrain horizontal image dimension for scaling very tall photos

This commit is contained in:
friendica 2012-09-29 05:20:29 -07:00
parent c884e82776
commit 0693afd6b7
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/Photo.php
View File

@ -227,7 +227,18 @@ class Photo {
return FALSE; return FALSE;
if($width > $max && $height > $max) { if($width > $max && $height > $max) {
if($width > $height) {
// very tall image (greater than 16:9)
// constrain the width - let the height float.
if((($height * 9) / 16) > $width) {
$dest_width = $max;
$dest_height = intval(( $height * $max ) / $width);
}
// else constrain both dimensions
elseif($width > $height) {
$dest_width = $max; $dest_width = $max;
$dest_height = intval(( $height * $max ) / $width); $dest_height = intval(( $height * $max ) / $width);
} }
@ -243,8 +254,18 @@ class Photo {
} }
else { else {
if( $height > $max ) { if( $height > $max ) {
$dest_width = intval(( $width * $max ) / $height);
$dest_height = $max; // very tall image (greater than 16:9)
// constrain the width - let the height float.
if((($height * 9) / 16) > $width) {
$dest_width = $max;
$dest_height = intval(( $height * $max ) / $width);
}
else {
$dest_width = intval(( $width * $max ) / $height);
$dest_height = $max;
}
} }
else { else {
$dest_width = $width; $dest_width = $width;