Support more swizzles to 565 in SkCodec

src/codec/SkCodec_wbmp.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 55 matching lines @@
     }
     return true;
 }
 
 bool SkWbmpCodec::onRewind() {
     return read_header(this->stream(), NULL);
 }
 
 SkSwizzler* SkWbmpCodec::initializeSwizzler(const SkImageInfo& info,
         const SkPMColor* ctable, const Options& opts) {
-    // TODO (msarett): Reenable support for 565 if it is desired
-    //                 skbug.com/3683
-
     // Create the swizzler based on the desired color type
     switch (info.colorType()) {
         case kIndex_8_SkColorType:
         case kN32_SkColorType:
+        case kRGB_565_SkColorType:
         case kGray_8_SkColorType:
             return SkSwizzler::CreateSwizzler(SkSwizzler::kBit, ctable, info, opts.fZeroInitialized, 
                                               this->getInfo());
         default:
             return NULL;
     }
 }
 
 SkCodec::Result SkWbmpCodec::readRow(uint8_t* row) {
     if (this->stream()->read(row, fSrcRowBytes) != fSrcRowBytes) {
@@ skipping 152 matching lines @@
 SkScanlineDecoder* SkWbmpCodec::NewSDFromStream(SkStream* stream) {
     SkAutoTDelete<SkWbmpCodec> codec(static_cast<SkWbmpCodec*>(
             SkWbmpCodec::NewFromStream(stream)));
     if (!codec) {
         return NULL;
     }
 
     // Return the new scanline decoder
     return SkNEW_ARGS(SkWbmpScanlineDecoder, (codec.detach()));
 }