Thanks to visit codestin.com
Credit goes to github.com

Skip to content

BitmapImage::imageForDefaultFrame() doesn't check, whether frame can be decoded #8

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

Closed
ondra-novak wants to merge 2 commits into from
Closed

BitmapImage::imageForDefaultFrame() doesn't check, whether frame can be decoded #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3895fc
BitmapImage::imageForDefaultFrame() doesn't check, whether frame can …
Nov 20, 2014
e59a9d8
fix of stupid mistake
Nov 20, 2014
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
14 changes: 10 additions & 4 deletions Source/platform/graphics/BitmapImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,12 @@ bool BitmapImage::ensureFrameIsCached(size_t index)
if (index >= frameCount())
return false;

if (index >= m_frames.size() || !m_frames[index].m_frame)
cacheFrame(index);
if (index >= m_frames.size() || !m_frames[index].m_frame) {
cacheFrame(index);
if (index >= m_frames.size() || !m_frames[index].m_frame) {
return false;
}
}
return true;
}

Expand Down Expand Up @@ -368,8 +372,10 @@ PassRefPtr<NativeImageSkia> BitmapImage::nativeImageForCurrentFrame()

PassRefPtr<Image> BitmapImage::imageForDefaultFrame()
{
if (isBitmapImage() && maybeAnimated())
return BitmapImage::create(frameAtIndex(0));
if (isBitmapImage() && maybeAnimated()) {
RefPtr<NativeImageSkia> fr = frameAtIndex(0);
if (fr) return BitmapImage::create(fr);
}

return Image::imageForDefaultFrame();
}
Expand Down