CB-11714: (windows) added check for encoding in savePhoto() without height/width#242
Merged
brody2consult merged 4 commits intoapache:masterfrom Oct 3, 2018
Merged
Conversation
… without options.targetWidth/Height
Member
|
Hey @DisruptiveMind , there seems to be a merge conflict now. Could you maybe fix this? Thanks. |
Member
|
Thanks @DisruptiveMind. Tests are now failing because of This doesn't make too much sense to me, especially as line 790 contains no quotes at all. Can you maybe rebase on |
Member
|
Closing and re-opening to trigger a new CI/test run with new PR merge. |
|
Looks OK to me, merging |
This file contains hidden or 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
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.
Platforms affected
Windows 10
What does this PR do?
Adds extra content-type check when capturing photos without specifying targetWidth and/or targetHeight in options to preserve JPEG file extension.
What testing has been done on this change?
ditto
Checklist