summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-12 12:45:12 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-12 12:45:12 +0100
commitdb037dbd023aeeae6d8643707945882f962b2a44 (patch)
tree40b065615daa899634b0310f50ca3e40230fd849
parent010c33fb6b6734fddb7143eee14153080a2b8799 (diff)
[ci skip] Polish changes from PR #3278
-rw-r--r--system/libraries/Image_lib.php4
-rw-r--r--user_guide_src/source/changelog.rst2
2 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index d653b1640..529532e60 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -1212,7 +1212,7 @@ class CI_Image_lib {
imagecopymerge($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height, $this->wm_opacity);
}
- // We can preserve transparency for PNG images
+ // We can preserve transparency for PNG images
if ($this->image_type === 3)
{
imagealphablending($src_img, FALSE);
@@ -1803,4 +1803,4 @@ class CI_Image_lib {
}
/* End of file Image_lib.php */
-/* Location: ./system/libraries/Image_lib.php */
+/* Location: ./system/libraries/Image_lib.php */ \ No newline at end of file
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 42ef52c52..8b4f4039e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -336,7 +336,7 @@ Release Date: Not Released
- Class properties *wm_font_color*, *wm_shadow_color* and *wm_use_drop_shadow* are now protected, to avoid breaking the ``text_watermark()`` method if they are set manually after initialization.
- If property *maintain_ratio* is set to TRUE, ``image_reproportion()`` now doesn't need both width and height to be specified.
- Property *maintain_ratio* is now taken into account when resizing images using ImageMagick library.
- - Added support for maintaining transparency for PNG images in method ``text_watermark()``.
+ - Added support for maintaining transparency for PNG images when watermarking.
- Added a **file_permissions** setting.
- :doc:`Form Validation Library <libraries/form_validation>` changes include: