diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
| commit | 2716398bd2f2ae36d7420c591fc759e0951ba0e2 (patch) | |
| tree | 3845d6bacc5660559740a8eddd43210bbb14fefd /system/libraries/Image_lib.php | |
| parent | eeb6a480a4a25b7fe96e9ba0cf3aef273fd13c67 (diff) | |
| parent | e8bc5f4450381b4f978f274f3e93604301115b64 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
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 |