AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove an assert that assumes too much.

Browse Source 
The resulting bitmap may look funny, but it may not be our bug, and
the assert is making it difficult to use SKP files.

TBR=robertphillips@google.com, rmistry@google.com, bensong@google.com

BUG=skia:1905

Review URL: https://codereview.chromium.org/111463006

git-svn-id: http://skia.googlecode.com/svn/trunk@12696 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
scroggo@google.com 2013-12-16 20:02:03 +00:00
parent 4ad1e97b85
commit 0207683157
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/SkOrderedReadBuffer.cpp
View File

@ -226,9 +226,13 @@ void SkOrderedReadBuffer::readBitmap(SkBitmap* bitmap) {
} }
// This case can only be reached if extractSubset was called, so // This case can only be reached if extractSubset was called, so
// the recorded width and height must be smaller than (or equal to // the recorded width and height must be smaller than or equal to
// the encoded width and height. // the encoded width and height.
SkASSERT(width <= bitmap->width() && height <= bitmap->height()); // FIXME (scroggo): This assert assumes that our decoder and the
// sources encoder agree on the width and height which may not
// always be the case. Removing until it can be investigated
// further.
//SkASSERT(width <= bitmap->width() && height <= bitmap->height());
SkBitmap subsetBm; SkBitmap subsetBm;
SkIRect subset = SkIRect::MakeXYWH(xOffset, yOffset, width, height); SkIRect subset = SkIRect::MakeXYWH(xOffset, yOffset, width, height);