Changeset 1827 for trunk/system/libraries/drivers/Image_ImageMagick.php

Timestamp:

01/27/2008 02:50:37 AM (12 months ago)

Author:

Shadowhand

Message:

Updates to Image:

• Moved sanitize_geometry to Image_Driver
  
• Made properties() an abstract method
  
• Updated language files with new and missing messages
  
• Removed exif_imagetype() usage in favor of getimagesize(), which is more common and provides more information
  

Files:

• trunk/system/libraries/drivers/Image_ImageMagick.php (modified) (4 diffs)

trunk/system/libraries/drivers/Image_ImageMagick.php

@@ -11 +11 @@
         // Temporary image filename
         protected $tmp_image;
-
-        // Processing errors
-        protected $errors = array();
 
         /**
@@ -38 +35 @@
                 // Check to make sure the provided path is correct
                 if ( ! file_exists(realpath($config['directory']).'/convert'.$this->ext))
-                        throw new Kohana_Exception('image.imagemagick.not_found');
+                        throw new Kohana_Exception('image.imagemagick.not_found', 'convert'.$this->ext);
 
                 // Set the installation directory
@@ -50 +47 @@
         public function process($image, $actions, $dir, $file)
         {
+                // We only need the filename
+                $image = $image['file'];
+
                 // Unique temporary filename
                 $this->tmp_image = $dir.'k2img--'.sha1($dir.$file).substr($file, strrpos($file, '.'));
@@ -173 +173 @@
         }
 
-        /**
-         * Return the current width and height of the temporary image. This is mainly
-         * needed for sanitizing the geometry.
-         *
-         * @return  array  width, height
-         */
         protected function properties()
         {
-                // Return the width and height as an array. Use with list()
                 return explode(',', exec(escapeshellcmd($this->dir.'identify'.$this->ext).' -format '.escapeshellarg('%w,%h').' '.$this->cmd_image));
         }
 
-        /**
-         * Sanitize and normalize a geometry array based on the temporary image
-         * width and height. Valid properties are: width, height, top, left.
-         *
-         * @param   array  geometry properties
-         * @return  void
-         */
-        protected function sanitize_geometry( & $geometry)
-        {
-                list($width, $height) = $this->properties();
-
-                // Turn off error reporting
-                $reporting = error_reporting(0);
-
-                // Width and height cannot exceed current image size
-                $geometry['width']  = min($geometry['width'], $width);
-                $geometry['height'] = min($geometry['height'], $height);
-
-                switch($geometry['top'])
-                {
-                        case 'center':
-                                $geometry['top'] = floor(($height / 2) - ($geometry['height'] / 2));
-                        break;
-                        case 'top':
-                                $geometry['top'] = 0;
-                        break;
-                        case 'bottom':
-                                $geometry['top'] = $height - $geometry['height'];
-                        break;
-                }
-
-                switch($geometry['left'])
-                {
-                        case 'center':
-                                $geometry['left'] = floor(($width / 2) - ($geometry['width'] / 2));
-                        break;
-                        case 'left':
-                                $geometry['left'] = 0;
-                        break;
-                        case 'right':
-                                $geometry['left'] = $width - $geometry['height'];
-                        break;
-                }
-
-                // Restore error reporting
-                error_reporting($reporting);
-        }
-
 } // End Image ImageMagick Driver