mirror/php-cimage
1
0
Fork 0
mirror of https://github.com/mosbth/cimage.git synced 2025-07-23 17:51:34 +02:00
Code Issues Releases Wiki Activity

support jpeg file extension

Browse Source
This commit is contained in:
Mikael Roos
2013-10-15 01:01:15 +02:00
parent 7117ac2a4c
commit 7849f69801
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CImage.php
View File

@@ -109,11 +109,11 @@ class CImage {
foreach($this->log as $val) {
if(is_array($val)) {
foreach($val as $val1) {
$log .= $val1 . '<br/>';
$log .= htmlentities($val1) . '<br/>';
}
}
else {
$log .= $val . '<br/>';
$log .= htmlentities($val) . '<br/>';
}
}
@@ -561,6 +561,13 @@ EOD;
// Use newWidth and newHeigh as defined width/height, image should fit the area.
if($this->cropToFit) {
/*
if($cropToFit && $newWidth && $newHeight) {
$targetRatio = $newWidth / $newHeight;
$cropWidth = $targetRatio > $aspectRatio ? $width : round($height * $targetRatio);
$cropHeight = $targetRatio > $aspectRatio ? round($width / $targetRatio) : $height;
}
*/
$ratioWidth = $width / $this->newWidth;
$ratioHeight = $height / $this->newHeight;
$ratio = ($ratioWidth < $ratioHeight) ? $ratioWidth : $ratioHeight;
@@ -924,6 +931,15 @@ EOD;
// Resize by crop to fit
if($this->cropToFit) {
/*
$cropX = round(($width - $cropWidth) / 2);
$cropY = round(($height - $cropHeight) / 2);
$imageResized = createImageKeepTransparency($newWidth, $newHeight);
imagecopyresampled($imageResized, $image, 0, 0, $cropX, $cropY, $newWidth, $newHeight, $cropWidth, $cropHeight);
$image = $imageResized;
$width = $newWidth;
$height = $newHeight;
*/
$this->Log("Crop to fit");
$cropX = round(($this->cropWidth/2) - ($this->newWidth/2));
$cropY = round(($this->cropHeight/2) - ($this->newHeight/2));
@@ -996,6 +1012,7 @@ EOD;
*/
protected function SaveToCache() {
switch($this->extension) {
case 'jpeg':
case 'jpg':
if($this->saveFolder) {
$this->Log("Saving image as JPEG to cache using quality = {$this->quality}.");

2
README.md
View File

@@ -87,6 +87,8 @@ v0.4.x (latest)
* Changed => to == on Modified-Since.
* Always send Last-Modified-Header.
* Added `htmlentities()` to verbose output.
* Fixed support for jpeg, not only jpg.
v0.4 (2013-10-08)