mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-09-03 02:42:45 +02:00
Code Issues Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Oliver Vogel
2013-02-01 19:03:43 +01:00
parent e471063c37
commit 963ea3d5ed
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Intervention/Image/Image.php
View File

@@ -51,7 +51,7 @@ class Image
/** /**
* Combined filename (basename and extension) * Combined filename (basename and extension)
* @var [type] * @var string
*/ */
public $filename; public $filename;
@@ -121,6 +121,7 @@ class Image
throw new Exception("Wrong image type ({$this->type}) only use JPG, PNG or GIF images."); throw new Exception("Wrong image type ({$this->type}) only use JPG, PNG or GIF images.");
break; break;
} }
} else { } else {
$this->width = 1; $this->width = 1;
@@ -196,7 +197,7 @@ class Image
} }
if (is_null($width) OR is_null($height)) { if (is_null($width) OR is_null($height)) {
throw new Exception('width or height needs to be defined'); throw new Exception('width or height needs to be defined');
} }
// create new image in new dimensions // create new image in new dimensions
@@ -242,21 +243,18 @@ class Image
} }
if (is_null($width) OR is_null($height)) { if (is_null($width) OR is_null($height)) {
throw new Exception('width or height needs to be defined'); throw new Exception('width or height needs to be defined');
} }
// ausschnitt berechnen // ausschnitt berechnen
$grab_width = $this->width; $grab_width = $this->width;
$ratio = $grab_width / $width; $ratio = $grab_width / $width;
if($height * $ratio <= $this->height) if($height * $ratio <= $this->height) {
{
$grab_height = round($height * $ratio); $grab_height = round($height * $ratio);
$src_x = 0; $src_x = 0;
$src_y = round(($this->height - $grab_height) / 2); $src_y = round(($this->height - $grab_height) / 2);
} } else {
else
{
$grab_height = $this->height; $grab_height = $this->height;
$ratio = $grab_height / $height; $ratio = $grab_height / $height;
$grab_width = round($width * $ratio); $grab_width = round($width * $ratio);