Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Unified Diff: src/core/SkOrderedReadBuffer.cpp

Issue 111463006: Remove an assert that assumes too much. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkOrderedReadBuffer.cpp
diff --git a/src/core/SkOrderedReadBuffer.cpp b/src/core/SkOrderedReadBuffer.cpp
index 31841182b9c47edbce0e0f85b1b9bef466620fe8..69c60cbe097ed1040c41dd7fa97a6f8ed11afa34 100644
--- a/src/core/SkOrderedReadBuffer.cpp
+++ b/src/core/SkOrderedReadBuffer.cpp
@@ -226,9 +226,13 @@ void SkOrderedReadBuffer::readBitmap(SkBitmap* bitmap) {
}
// 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.
- 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;
SkIRect subset = SkIRect::MakeXYWH(xOffset, yOffset, width, height);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698