diff options
| author | Robin Millette <millette@plantard.controlezvous.ca> | 2009-01-23 05:57:15 +0000 |
|---|---|---|
| committer | Robin Millette <millette@plantard.controlezvous.ca> | 2009-01-23 05:57:15 +0000 |
| commit | 171d89aab79207f08b3c84d76a4b2bb50185490d (patch) | |
| tree | 34efcec8e274ec33cb1af215a6b1c4490fda0cb0 /lib/imagefile.php | |
| parent | fbd1cf4dfa452166a5985d9a9177d57e8554f09f (diff) | |
| parent | 277a6e984c6778865a62b5a1b99219327460be6d (diff) | |
Merge branch 'master' of /var/www/trunk
Diffstat (limited to 'lib/imagefile.php')
| -rw-r--r-- | lib/imagefile.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/imagefile.php b/lib/imagefile.php index f15a72c76..7f1db892c 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -48,12 +48,17 @@ if (!defined('LACONICA')) { class ImageFile { var $filename = null; + var $barename = null; var $type = null; + var $height = null; + var $width = null; - function __construct($filename=null, $type=null) + function __construct($filename=null, $type=null, $width=null, $height=null) { $this->filename = $filename; $this->type = $type; + $this->width = $type; + $this->height = $type; } static function fromUpload($param='upload') @@ -83,6 +88,9 @@ class ImageFile return; } + $imagefile->width = $info[0]; + $imagefile->height = $info[1]; + switch ($info[2]) { case IMAGETYPE_GIF: case IMAGETYPE_JPEG: |