Removed some denug statements and an exception thrown.

remotes/origin/stable
Thomas Tanghus 14 years ago
parent 6207c0444b
commit c500c1e930
  1. 5
      lib/image.php

@ -189,7 +189,7 @@ class OC_Image {
public function resize($maxsize) { public function resize($maxsize) {
if(!self::$resource) { if(!self::$resource) {
OC_Log::write('core','OC_Image::resize, No image loaded', OC_Log::ERROR); OC_Log::write('core','OC_Image::resize, No image loaded', OC_Log::ERROR);
throw new Exception('OC_Image::resize, No image loaded!', self::ERR_NO_IMAGE); return false;
} }
$width_orig=imageSX(self::$resource); $width_orig=imageSX(self::$resource);
$height_orig=imageSY(self::$resource); $height_orig=imageSY(self::$resource);
@ -231,14 +231,11 @@ class OC_Image {
} }
$width_orig=imageSX(self::$resource); $width_orig=imageSX(self::$resource);
$height_orig=imageSY(self::$resource); $height_orig=imageSY(self::$resource);
OC_Log::write('core','OC_Image::centerCrop. Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
if($width_orig === $height_orig) { if($width_orig === $height_orig) {
return true; return true;
} }
$ratio_orig = $width_orig/$height_orig; $ratio_orig = $width_orig/$height_orig;
OC_Log::write('core','OC_Image::centerCrop. Ratio: '.$ratio_orig, OC_Log::DEBUG);
$width = $height = min($width_orig, $height_orig); $width = $height = min($width_orig, $height_orig);
OC_Log::write('core','OC_Image::centerCrop. New size: '.$width.'x'.$height, OC_Log::DEBUG);
if ($ratio_orig > 1) { if ($ratio_orig > 1) {
$x = ($width_orig/2) - ($width/2); $x = ($width_orig/2) - ($width/2);

Loading…
Cancel
Save