Bmp Image Decoding

src/codec/SkCodec.cpp

Index: src/codec/SkCodec.cpp
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp
index 69d95a41da24be0231cdd32b8719d2b1d6ea3747..9cd719b02771e11ec4ecb1be4bb2c53ab4813270 100644
--- a/src/codec/SkCodec.cpp
+++ b/src/codec/SkCodec.cpp
@@ -7,7 +7,7 @@
 
 #include "SkCodec.h"
 #include "SkData.h"
-#include "SkCodec_libpng.h"
+#include "SkCodec_libbmp.h"

[scroggo, 2015/03/04 17:10:30]

nit on the file name: SkCodec_libpng was named that because it uses a library
called libpng. Here, you are not using libbmp, so this name seems like a
misnomer. (To be fair, I actually wrote SkImageDecoder_libico.cpp, which is
similarly misnamed.)

Maybe I shouldn't have followed the old convention; it might be better to put
these classes in files whose names match the classes (SkPngCodec.h, SkBmpCodec.h
etc).

FWIW, I don't think you should change it right now (it'll make it hard to follow
the diff from version to version), but maybe add a TODO.

 #include "SkStream.h"
 
 SkCodec* SkCodec::NewFromStream(SkStream* stream) {
@@ -15,13 +15,13 @@ SkCodec* SkCodec::NewFromStream(SkStream* stream) {
         return NULL;
     }
     SkAutoTDelete<SkStream> streamDeleter(stream);
-    const bool isPng = SkPngCodec::IsPng(stream);
+    const bool isBmp = SkBmpCodec::IsBmp(stream);
     if (!stream->rewind()) {
         return NULL;
     }
-    if (isPng) {
+    if (isBmp) {
         streamDeleter.detach();
-        return SkPngCodec::NewFromStream(stream);
+        return SkBmpCodec::NewFromStream(stream);
     }
     // TODO: Check other image types.
     return NULL;