projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
240c57d
)
DataObjects/Images.php
author
Edward
<edward@roojs.com>
Fri, 12 Oct 2018 03:03:52 +0000
(11:03 +0800)
committer
Edward
<edward@roojs.com>
Fri, 12 Oct 2018 03:03:52 +0000
(11:03 +0800)
DataObjects/Images.php
patch
|
blob
|
history
diff --git
a/DataObjects/Images.php
b/DataObjects/Images.php
index
8d9a7ac
..
22e4e79
100644
(file)
--- a/
DataObjects/Images.php
+++ b/
DataObjects/Images.php
@@
-866,12
+866,11
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
//
// }
//
// }
-
//
if(!empty($scaleWidth) || !empty($scaleHeight)){
-
//
$data = $this->scale($scaleWidth, $scaleHeight);
-
//
}
+ if(!empty($scaleWidth) || !empty($scaleHeight)){
+ $data = $this->scale($scaleWidth, $scaleHeight);
+ }
if($rotate){
if($rotate){
- $data = $this->rotate();
$data = $this->rotate($data);
}
$data = $this->rotate($data);
}
@@
-938,7
+937,7
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
return $imagick->getImageBlob();
}
return $imagick->getImageBlob();
}
- function scale($width, $height)
+ function scale($width, $height
, $imageBlob = false
)
{
}
{
}