Changeset 1848

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
  

Location:

trunk/system/libraries

Files:

• Image.php (modified) (3 diffs)
• drivers/Image/GD.php (modified) (6 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;

trunk/system/libraries/drivers/Image/GD.php

@@ -70 +70 @@
                         {
                                 case 'imagejpeg':
-                                        // Make sure the quality is in range (defaults to 95%)
-                                        $quality = ($quality === NULL) ? 95 : max(1, min($quality, 100));
+                                        // Default the quality to 95
+                                        ($quality === NULL) and $quality = 95;
                                 break;
                                 case 'imagegif':
@@ -96 +96 @@
         public function flip($direction)
         {
-                echo Kohana::debug($direction);
+                // Get the current width and height
+                $width = imagesx($this->tmp_image);
+                $height = imagesy($this->tmp_image);
+
+                // Create the flipped image
+                $flipped = $this->imagecreatetransparent($width, $height);
+
+                if ($direction === Image::HORIZONTAL)
+                {
+                        for ($x = 0; $x < $width; $x++)
+                        {
+                                $status = imagecopy($flipped, $this->tmp_image, $x, 0, $width - $x - 1, 0, 1, $height);
+                        }
+                }
+                elseif ($direction === Image::VERTICAL)
+                {
+                        for ($y = 0; $y < $height; $y++)
+                        {
+                                $status = imagecopy($flipped, $this->tmp_image, 0, $y, 0, $height - $y - 1, $width, 1);
+                        }
+                }
+                else
+                {
+                        // Do nothing
+                        return TRUE;
+                }
+
+                if ($status === TRUE)
+                {
+                        // Swap the new image for the old one
+                        imagedestroy($this->tmp_image);
+                        $this->tmp_image = $flipped;
+                }
+
+                return $status;
         }
 
@@ -105 +139 @@
 
                 // Get the current width and height
-                list($width, $height) = $this->properties();
+                $width = imagesx($this->tmp_image);
+                $height = imagesy($this->tmp_image);
 
                 // Create the temporary image to copy to
@@ -124 +159 @@
         {
                 // Get the current width and height
-                list($width, $height) = $this->properties();
+                $width = imagesx($this->tmp_image);
+                $height = imagesy($this->tmp_image);
 
                 if (substr($properties['width'], -1) === '%')
@@ -138 +174 @@
                 }
 
-                if (empty($properties['width']))
-                {
-                        /**
-                         * @todo Determine the width difference and calculate, don't forget $properties['master']!
-                         */
-                }
-
-                if (empty($properties['height']))
-                {
-                        /**
-                         * @todo Determine the height difference and calculate, don't forget $properties['master']!
-                         */
+                if ($properties['master'] === Image::AUTO)
+                {
+                        // Change an automatic master dim to the correct type
+                        $properties['master'] = ($width > $height) ? Image::WIDTH : Image::HEIGHT;
+                }
+
+                if (empty($properties['height']) OR $properties['master'] === Image::WIDTH)
+                {
+                        // Recalculate the height
+                        $properties['height'] = round($height * $properties['width'] / $width);
+                }
+
+                if (empty($properties['width']) OR $properties['master'] === Image::HEIGHT)
+                {
+                        // Recalculate the width
+                        $properties['width'] = round($width * $properties['height'] / $height);
                 }
 
@@ -223 +263 @@
          * @param   integer  image width
          * @param   integer  image height
-         * @return  GD resource
+         * @return  resource
          */
         protected function imagecreatetransparent($width, $height)