projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Images.php
[Pman.Core]
/
DataObjects
/
Images.php
diff --git
a/DataObjects/Images.php
b/DataObjects/Images.php
index
87f1889
..
451e1f0
100644
(file)
--- a/
DataObjects/Images.php
+++ b/
DataObjects/Images.php
@@
-816,7
+816,7
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
}
}
- function toBase64()
+ function toBase64(
$rotate = false, $scale = false
)
{
if(!preg_match('/^image\//', $this->mimetype)){
return false;
{
if(!preg_match('/^image\//', $this->mimetype)){
return false;
@@
-830,6
+830,10
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
$data = file_get_contents($file);
$data = file_get_contents($file);
+ if($rotate){
+ $data = $this->rotate();
+ }
+
$base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
return $base64;
$base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
return $base64;
@@
-865,10
+869,9
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
return $page;
}
return $page;
}
- function rotate(
$blob
)
+ function rotate()
{
{
- $imagick = new Imagick();
- $imagick->readImageBlob($blob);
+ $imagick = new Imagick($this->getStoreName());
$orientation = $imagick->getImageOrientation();
$orientation = $imagick->getImageOrientation();