diff options
author | Bruno Barão <brunobarao@gmail.com> | 2012-10-08 17:21:36 +0200 |
---|---|---|
committer | Bruno Barão <brunobarao@gmail.com> | 2012-10-08 17:21:36 +0200 |
commit | 02561acf13f19881f4e3f95cf2fb423665d5ce8b (patch) | |
tree | fb88af9da77e37447d9e1513146aad870e65ea5d /system/libraries/Image_lib.php | |
parent | b453e16668c70b0eb02b5ae69cd3196d735421f8 (diff) | |
parent | 960e616d18c77f463e7c53f666d98b09f5ca9057 (diff) |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/libraries/Image_lib.php')
-rw-r--r-- | system/libraries/Image_lib.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 899b995d4..ef4187847 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -1320,6 +1320,13 @@ class CI_Image_lib { imagestring($src_img, $this->wm_font_size, $x_shad, $y_shad, $this->wm_text, $drp_color); imagestring($src_img, $this->wm_font_size, $x_axis, $y_axis, $this->wm_text, $txt_color); } + + // We can preserve transparency for PNG images + if ($this->image_type === 3) + { + imagealphablending($src_img, FALSE); + imagesavealpha($src_img, TRUE); + } } // Output the final image |