Skip to content

Commit db037db

Browse files
committed
[ci skip] Polish changes from PR bcit-ci#3278
1 parent 010c33f commit db037db

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

system/libraries/Image_lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ public function overlay_watermark()
12121212
imagecopymerge($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height, $this->wm_opacity);
12131213
}
12141214

1215-
// We can preserve transparency for PNG images
1215+
// We can preserve transparency for PNG images
12161216
if ($this->image_type === 3)
12171217
{
12181218
imagealphablending($src_img, FALSE);
@@ -1803,4 +1803,4 @@ public function display_errors($open = '<p>', $close = '</p>')
18031803
}
18041804

18051805
/* End of file Image_lib.php */
1806-
/* Location: ./system/libraries/Image_lib.php */
1806+
/* Location: ./system/libraries/Image_lib.php */

user_guide_src/source/changelog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ Release Date: Not Released
336336
- 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.
337337
- If property *maintain_ratio* is set to TRUE, ``image_reproportion()`` now doesn't need both width and height to be specified.
338338
- Property *maintain_ratio* is now taken into account when resizing images using ImageMagick library.
339-
- Added support for maintaining transparency for PNG images in method ``text_watermark()``.
339+
- Added support for maintaining transparency for PNG images when watermarking.
340340
- Added a **file_permissions** setting.
341341

342342
- :doc:`Form Validation Library <libraries/form_validation>` changes include:

0 commit comments

Comments
 (0)