Scanline decoding for bmp

src/codec/SkScanlineDecoder.cpp

Index: src/codec/SkScanlineDecoder.cpp
diff --git a/src/codec/SkScanlineDecoder.cpp b/src/codec/SkScanlineDecoder.cpp
index 859956f5de5c1ce3f5e4bc4cdf9cc15a7ea47765..6a8ce30c9855edf325bd065acaaafc5ae887607f 100644
--- a/src/codec/SkScanlineDecoder.cpp
+++ b/src/codec/SkScanlineDecoder.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkScanlineDecoder.h"
+#include "SkBmpCodec.h"
 #include "SkCodec_libpng.h"
 #include "SkCodec_wbmp.h"
 #include "SkCodecPriv.h"
@@ -23,6 +24,7 @@ static const DecoderProc gDecoderProcs[] = {
 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
     { SkJpegCodec::IsJpeg, SkJpegCodec::NewSDFromStream },
 #endif
+    { SkBmpCodec::IsBmp, SkBmpCodec::NewSDFromStream },
     { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewSDFromStream },
 };
 
@@ -94,6 +96,7 @@ SkCodec::Result SkScanlineDecoder::start(const SkImageInfo& dstInfo,
 
     fCurrScanline = 0;
     fDstInfo = dstInfo;
+    fOptions = *options;
     return SkCodec::kSuccess;
 }