Skip to content

WPF - Handle case where Bitmap in InteropBitmapInfo is null #1003

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 3 commits into from
May 6, 2015
Merged

WPF - Handle case where Bitmap in InteropBitmapInfo is null #1003

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
446eda3
WPF - Handle case where Bitmap is IntPtr.Zero
jamespearce2006 May 5, 2015
6c16aa2
switch to evaluate == first
jamespearce2006 May 5, 2015
6fa4b47
Return null immediately if file handle is not valid
jamespearce2006 May 5, 2015
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
16 changes: 14 additions & 2 deletions CefSharp.Wpf/Rendering/InteropBitmapInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
//
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

using System;
using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Media.Imaging;
Expand Down Expand Up @@ -31,14 +32,25 @@ public override void ClearBitmap()

public override void Invalidate()
{
Bitmap.Invalidate();
if (Bitmap != null)
{
Bitmap.Invalidate();
}
}

public override BitmapSource CreateBitmap()
{
var stride = Width * BytesPerPixel;

Bitmap = (InteropBitmap)Imaging.CreateBitmapSourceFromMemorySection(FileMappingHandle, Width, Height, PixelFormat, stride, 0);
// Unable to create bitmap without valid File Handle (Most likely control is being disposed)
if (FileMappingHandle == IntPtr.Zero)
{
return null;
}
else
{
Bitmap = (InteropBitmap)Imaging.CreateBitmapSourceFromMemorySection(FileMappingHandle, Width, Height, PixelFormat, stride, 0);
}

return Bitmap;
}
Expand Down