Adding transparent png support to text watermarks #1317
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…not removed from the original file.
| @@ -1313,6 +1313,13 @@ public function text_watermark() | |||
| imagestring($src_img, $this->wm_font_size, $x_axis, $y_axis, $this->wm_text, $txt_color); | |||
| } | |||
| } | |||
|
|
|||
| // png we can actually preserve transparency | |||
| if ($this->image_type == 3) | |||
There was a problem hiding this comment.
== -> === , add a changelog entry and it's all good!
|
Ok I added a line into there, I assume that was the right place? |
|
Yes, but at the same time you've somehow gone out of sync with the repository. Try this: |
|
hmm im using github for mac and I don't know how to do that from there lol |
|
Open a terminal window (not sure how it's called on Macs, might be console as well), type |
|
@jakemac53 would you be able to pull in the latest changes and update line 1318 to read if ($this->image_type === 3) please and we can pull in this change |
nonchip
pushed a commit
to nonchip/CodeIgniter
that referenced
this pull request
Jun 29, 2013
…nally from pull bcit-ci#1317, partially fixes bcit-ci#1139)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When performing a text watermark previously on a transparent png it would lose its transparency. Now it checks the image type and adds transparency support, following the same practice that is used when resizing images.