Remove an assert that assumes too much.

src/core/SkOrderedReadBuffer.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkErrorInternals.h"
@@ skipping 208 matching lines @@
                                  fDecodedBitmapIndex, width, height, length, xOffset,
                                  yOffset);
                     }
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
                     // If the width and height match, there should be no offset.
                     SkASSERT(0 == xOffset && 0 == yOffset);
                     return;
                 }
 
                 // 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);
                 if (bitmap->extractSubset(&subsetBm, subset)) {
                     bitmap->swap(subsetBm);
                     return;
                 }
             }
             // This bitmap was encoded when written, but we are unable to decode, possibly due to
             // not having a decoder.
@@ skipping 66 matching lines @@
         if (sizeRecorded != sizeRead) {
             // we could try to fix up the offset...
             sk_throw();
         }
     } else {
         // we must skip the remaining data
         fReader.skip(sizeRecorded);
     }
     return obj;
 }