Changeset 1848 for trunk/system/libraries/Image.php

Timestamp:

01/28/2008 02:31:27 PM (12 months ago)

Author:

Shadowhand

Message:

Fixes to Image and the GD Driver:

• Working on recalculating the width/height, but not complete
  
• Image now normalizes the quality setting itself, rather than using the driver
  

Files:

• trunk/system/libraries/Image.php (modified) (3 diffs)

trunk/system/libraries/Image.php

@@ -128 +128 @@
                         throw new Kohana_Exception('image.invalid_height', $height);
 
+                if (empty($width) AND empty($height))
+                        throw new Kohana_Exception('image.invalid_dimensions', __FUNCTION__);
+
                 if ($master === NULL)
                 {
@@ -171 +174 @@
                 if ( ! $this->valid_size('left', $left))
                         throw new Kohana_Exception('image.invalid_left', $left);
+
+                if (empty($width) AND empty($height))
+                        throw new Kohana_Exception('image.invalid_dimensions', __FUNCTION__);
 
                 $this->actions['crop'] = array
@@ -243 +249 @@
         public function quality($value)
         {
-                $this->actions['quality'] = $value;
+                $this->actions['quality'] = max(1, min($amount, 100));
 
                 return $this;