From a647b7f897abaf758b41eb321f6541352d4d1d84 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 26 Apr 2013 00:19:40 -0400 Subject: [PATCH] Go back to using Image_GD:: for consistency with the rest of the file. -- Revert "Image_GD:: -> static::" This reverts commit 357410627f9b27e5f77b1f2ade1a57a4a0601de9. --- classes/Kohana/Image/GD.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/classes/Kohana/Image/GD.php b/classes/Kohana/Image/GD.php index 6c8e41f..e9c7988 100644 --- a/classes/Kohana/Image/GD.php +++ b/classes/Kohana/Image/GD.php @@ -31,10 +31,10 @@ class Kohana_Image_GD extends Image { throw new Kohana_Exception('GD is either not installed or not enabled, check your configuration'); } $functions = array( - static::IMAGEROTATE, - static::IMAGECONVOLUTION, - static::IMAGEFILTER, - static::IMAGELAYEREFFECT + Image_GD::IMAGEROTATE, + Image_GD::IMAGECONVOLUTION, + Image_GD::IMAGEFILTER, + Image_GD::IMAGELAYEREFFECT ); foreach ($functions as $function) { @@ -246,7 +246,7 @@ class Kohana_Image_GD extends Image { */ protected function _do_rotate($degrees) { - if (empty(Image_GD::$_available_functions[static::IMAGEROTATE])) + if (empty(Image_GD::$_available_functions[Image_GD::IMAGEROTATE])) { throw new Kohana_Exception('This method requires :function, which is only available in the bundled version of GD', array(':function' => 'imagerotate')); @@ -328,7 +328,7 @@ class Kohana_Image_GD extends Image { */ protected function _do_sharpen($amount) { - if (empty(Image_GD::$_available_functions[static::IMAGECONVOLUTION])) + if (empty(Image_GD::$_available_functions[Image_GD::IMAGECONVOLUTION])) { throw new Kohana_Exception('This method requires :function, which is only available in the bundled version of GD', array(':function' => 'imageconvolution')); @@ -367,7 +367,7 @@ class Kohana_Image_GD extends Image { */ protected function _do_reflection($height, $opacity, $fade_in) { - if (empty(Image_GD::$_available_functions[static::IMAGEFILTER])) + if (empty(Image_GD::$_available_functions[Image_GD::IMAGEFILTER])) { throw new Kohana_Exception('This method requires :function, which is only available in the bundled version of GD', array(':function' => 'imagefilter')); @@ -448,7 +448,7 @@ class Kohana_Image_GD extends Image { */ protected function _do_watermark(Image $watermark, $offset_x, $offset_y, $opacity) { - if (empty(Image_GD::$_available_functions[static::IMAGELAYEREFFECT])) + if (empty(Image_GD::$_available_functions[Image_GD::IMAGELAYEREFFECT])) { throw new Kohana_Exception('This method requires :function, which is only available in the bundled version of GD', array(':function' => 'imagelayereffect')); -- 2.11.4.GIT