|
@@ -72,8 +72,8 @@ discard block |
|
|
block discarded – undo |
|
72
|
72
|
$this->imagePath = $imagePath; |
|
73
|
73
|
$this->imageMime = mime_content_type($this->imagePath); |
|
74
|
74
|
$this->imageInfo = pathinfo($this->imagePath); |
|
75
|
|
- $this->imageName = hash("crc32", $this->imageInfo['basename']) . hash("crc32", |
|
76
|
|
- "{$width}{$height}") . ($this->imageMime == "image/jpeg" ? ".jpg" : ".png"); |
|
|
75
|
+ $this->imageName = hash("crc32", $this->imageInfo['basename']).hash("crc32", |
|
|
76
|
+ "{$width}{$height}").($this->imageMime == "image/jpeg" ? ".jpg" : ".png"); |
|
77
|
77
|
|
|
78
|
78
|
if (!in_array($this->imageMime, self::$allowedExt)) { |
|
79
|
79
|
return "Not a valid JPG or PNG image"; |
|
@@ -100,8 +100,8 @@ discard block |
|
|
block discarded – undo |
|
100
|
100
|
$src_y = round(($src_h - ($src_h / $cmp_y * $cmp_x))); //2 |
|
101
|
101
|
} |
|
102
|
102
|
|
|
103
|
|
- $src_h = (int)$src_h; |
|
104
|
|
- $src_y = (int)$src_y; |
|
|
103
|
+ $src_h = (int) $src_h; |
|
|
104
|
+ $src_y = (int) $src_y; |
|
105
|
105
|
|
|
106
|
106
|
if ($this->imageMime == "image/jpeg") { |
|
107
|
107
|
return $this->fromJpg($width, $height, $src_x, $src_y, $src_w, $src_h); |
Please login to merge, or discard this patch.