Changeset 1852

Timestamp:

01/28/2008 03:29:53 PM (12 months ago)

Author:

Shadowhand

Message:

Proper testing for GD2, without testing for imageconvolution(), which is not present in non-bundled GD. Fixes #343, thanks nrm.

Files:

• trunk/system/libraries/drivers/Image/GD.php (modified) (2 diffs)

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

@@ -11 +11 @@
         {
                 // Make sure that GD2 is available
-                if ( ! function_exists('imageconvolution'))
+                if ( ! function_exists('gd_info'))
+                        throw new Kohana_Exception('image.gd.requires_v2');
+
+                // Get the GD information
+                $info = gd_info();
+
+                // Make sure that the GD2 is installed
+                if (strpos($info['GD Version'], '2.') === FALSE)
                         throw new Kohana_Exception('image.gd.requires_v2');
         }
@@ -241 +248 @@
         public function sharpen($amount)
         {
+                // Make sure that the sharpening function is available
+                if ( ! function_exists('imageconvolution'))
+                        throw new Kohana_Exception('image.unsupported_method', __FUNCTION__);
+
                 // Amount should be in the range of 18-10
                 $amount = round(abs(-18 + ($amount * 0.08)), 2);