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

Unified Diff: src/images/SkImageDecoder_libbmp.cpp

Issue 22877020: Make BMP decoder not depend on call to getLength. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 4 months 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/images/SkImageDecoder_libbmp.cpp
diff --git a/src/images/SkImageDecoder_libbmp.cpp b/src/images/SkImageDecoder_libbmp.cpp
index 14b9090f9bb5bfd13562fd5bafb8ad93df4bbbdb..6c5ae27c478a22e13b3b62d77e59f0776ad45b23 100644
--- a/src/images/SkImageDecoder_libbmp.cpp
+++ b/src/images/SkImageDecoder_libbmp.cpp
@@ -93,12 +93,34 @@ private:
};
bool SkBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
-
- size_t length = stream->getLength();
- SkAutoMalloc storage(length);
-
- if (stream->read(storage.get(), length) != length) {
- return false;
+ // First read the entire stream, so that all of the data can be passed to
+ // the BmpDecoderHelper.
+
+ // Byte length of all of the data.
+ size_t length;
+ // Allocated space used to hold the data.
+ SkAutoMalloc storage;
+
+ if (stream->hasLength()) {
+ length = stream->getLength();
+ void* dst = storage.reset(length);
+ if (stream->read(dst, length) != length) {
+ return false;
+ }
+ } else {
+ SkDynamicMemoryWStream tempStream;
+ // Arbitrary buffer size.
+ const size_t bufferSize = 256 * 1024; // 256 KB
+ char buffer[bufferSize];
+ length = 0;
+ do {
+ size_t bytesRead = stream->read(buffer, bufferSize);
+ tempStream.write(buffer, bytesRead);
+ length += bytesRead;
+ SkASSERT(tempStream.bytesWritten() == length);
+ } while (!stream->isAtEnd());
+ void* dst = storage.reset(length);
+ tempStream.copyTo(dst);
}
const bool justBounds = SkImageDecoder::kDecodeBounds_Mode == mode;
« 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