diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/network.php | 6 | ||||
| -rw-r--r-- | include/photos.php | 42 |
2 files changed, 24 insertions, 24 deletions
diff --git a/include/network.php b/include/network.php index 41e1ff37c..e1793b405 100644 --- a/include/network.php +++ b/include/network.php @@ -586,7 +586,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) if(substr($mtch[1],0,1) == '=') { $owidth = intval(substr($mtch[2],1)); - if(intval($owidth) > 0 && intval($owidth) < 640) + if(intval($owidth) > 0 && intval($owidth) < 1024) continue; } @@ -624,9 +624,9 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) $orig_width = $ph->getWidth(); $orig_height = $ph->getHeight(); - if($orig_width > 640 || $orig_height > 640) { + if($orig_width > 1024 || $orig_height > 1024) { $tag = (($match[1] == 'z') ? 'zmg' : 'img'); - $ph->scaleImage(640); + $ph->scaleImage(1024); $new_width = $ph->getWidth(); $new_height = $ph->getHeight(); logger('scale_external_images: ' . $orig_width . '->' . $new_width . 'w ' . $orig_height . '->' . $new_height . 'h' . ' match: ' . $mtch[0], LOGGER_DEBUG); diff --git a/include/photos.php b/include/photos.php index 2fc25b4bf..618f36fb1 100644 --- a/include/photos.php +++ b/include/photos.php @@ -193,32 +193,32 @@ function photo_upload($channel, $observer, $args) { unset($p['os_storage']); unset($p['os_path']); - if(($width > 1024 || $height > 1024) && (! $errors)) { + if(($width > 1024 || $height > 1024) && (! $errors)) $ph->scaleImage(1024); - $p['scale'] = 1; - $r2 = $ph->save($p); - $smallest = 1; - if(! $r2) - $errors = true; - } - if(($width > 640 || $height > 640) && (! $errors)) { + $p['scale'] = 1; + $r2 = $ph->save($p); + $smallest = 1; + if(! $r2) + $errors = true; + + if(($width > 640 || $height > 640) && (! $errors)) $ph->scaleImage(640); - $p['scale'] = 2; - $r3 = $ph->save($p); - $smallest = 2; - if(! $r3) - $errors = true; - } - if(($width > 320 || $height > 320) && (! $errors)) { + $p['scale'] = 2; + $r3 = $ph->save($p); + $smallest = 2; + if(! $r3) + $errors = true; + + if(($width > 320 || $height > 320) && (! $errors)) $ph->scaleImage(320); - $p['scale'] = 3; - $r3 = $ph->save($p); - $smallest = 3; - if(! $r3) - $errors = true; - } + + $p['scale'] = 3; + $r3 = $ph->save($p); + $smallest = 3; + if(! $r3) + $errors = true; if($errors) { q("delete from photo where resource_id = '%s' and uid = %d", |