-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[iOS/Catalyst] Fix issue loading images from Stream #16162
Conversation
{ | ||
await InvokeOnMainThreadAsync(async () => | ||
{ | ||
var image = ImageSource.FromStream(() => new MemoryStream(Convert.FromBase64String(coffeeBase64))); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should the MemoryStream
be disposed? Oh, it might be the responsibility of ImageSource
. Hm, IDK :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems alright. Good to merge?
* Fix the issue * More changes * Added device test
@Eilon, any chance of a backport to .net7? |
@UkeHa I'm tagging @rmarinho and @jfversluis who can consider that. |
/backport to net7.0 |
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/6026855943 |
@mattleibow backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix the issue
.git/rebase-apply/patch:75: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/Core/src/Handlers/Image/ImageHandler.iOS.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Core/src/Handlers/Image/ImageHandler.iOS.cs
CONFLICT (content): Merge conflict in src/Core/src/Handlers/Image/ImageHandler.iOS.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix the issue
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@mattleibow an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
* Fix the issue * More changes * Added device test # Conflicts: # src/Core/src/Handlers/Image/ImageHandler.iOS.cs
Description of Change
Fix issue loading images from Stream at runtime on iOS.
Issues Fixed
Fixes #12020