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 72244dfcea9c23bbd0ddf11af7e6849b929af29a..d2cd1d2a50ac414c2ec670b2fd5eb45a3718d5fe 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"
 #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;