Skip to content

Fix create BitmapDecoder with async file stream. #4966

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 12, 2022
Merged

Fix create BitmapDecoder with async file stream. #4966

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94ba24a
Fix create BitmapDecoder with async file stream.
lindexi Aug 1, 2021
580095a
Add comment
lindexi Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDecoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,14 +1138,22 @@ out SafeFileHandle safeFilehandle
if (stream is System.IO.FileStream)
{
System.IO.FileStream filestream = stream as System.IO.FileStream;

try
{
safeFilehandle = filestream.SafeFileHandle;
if (filestream.IsAsync is false)
{
safeFilehandle = filestream.SafeFileHandle;
}
else
{
// The IWICImagingFactory_CreateDecoderFromFileHandle_Proxy do not support async Filestream, so we revert to old code path.
safeFilehandle = null;
}
}
catch
{
// If Filestream doesn't support SafeHandle then revert to old code path.
// See https://github.com/dotnet/wpf/issues/4355
safeFilehandle = null;
}
}
Expand Down