Skip to content

Remove the not accessed local variable in BitmapDecoder.SetupDecoderFromUriOrStream #19

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Remove the not accessed local variable in BitmapDecoder.SetupDecoderFromUriOrStream #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
{
// If Filestream is async that doesn't support IWICImagingFactory_CreateDecoderFromFileHandle_Proxy, then 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