summaryrefslogtreecommitdiffstats
path: root/system/libraries/Image_lib.php
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2010-11-10 22:07:13 +0100
committerGreg Aker <greg.aker@ellislab.com>2010-11-10 22:07:13 +0100
commit579fde36e4f8cc294edec4fd4eefe06f4df09dda (patch)
tree4d3e9c8d65afb065eab738783b8361004754729d /system/libraries/Image_lib.php
parent58fdee85181b05c7303b1d2a5a26cb2f4e00f03f (diff)
parentc0af6c044570e0561afdea109f4101dba04e2510 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniterNoPhp4/
Diffstat (limited to 'system/libraries/Image_lib.php')
-rw-r--r--system/libraries/Image_lib.php13
1 files changed, 0 insertions, 13 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index c9c8ced0f..dec5f34f6 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -712,14 +712,6 @@ class CI_Image_lib {
*/
function image_rotate_gd()
{
- // Is Image Rotation Supported?
- // this function is only supported as of PHP 4.3
- if ( ! function_exists('imagerotate'))
- {
- $this->set_error('imglib_rotate_unsupported');
- return FALSE;
- }
-
// Create the image handle
if ( ! ($src_img = $this->image_create_gd()))
{
@@ -1215,11 +1207,6 @@ class CI_Image_lib {
return FALSE;
}
- if (phpversion() == '4.4.1')
- {
- @touch($this->full_dst_path); // PHP 4.4.1 bug #35060 - workaround
- }
-
if ( ! @imagejpeg($resource, $this->full_dst_path, $this->quality))
{
$this->set_error('imglib_save_failed');