SkJpegCodec

dm/DMSrcSink.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 "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCommonFlags.h"
@@ skipping 62 matching lines @@
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
     if (NULL == codec.get()) {
         return SkStringPrintf("Couldn't create codec for %s.", fPath.c_str());
     }
 
     // Choose the color type to decode to
     SkImageInfo decodeInfo = codec->getInfo();
     SkColorType canvasColorType = canvasInfo.colorType();
     switch (fDstColorType) {
         case kIndex8_Always_DstColorType:
-        case kGrayscale_Always_DstColorType:
+            if (kIndex_8_SkColorType != decodeInfo.colorType()) {

[scroggo, 2015/04/10 17:19:05]

I'd prefer just setting decodeInfo to use kIndex8, and then returning
Error::Nonfatal when we get a kInvalidConversion.

Alternatively, it seems like kIndex8_Always_DstColorType and
kGrayscale_Always_DstColorType could be merged into kGetFromInfo_DstColorType.
(These Nonfatal cases should never happen, since we'll only ever use an Always
if the color type is gray or index 8, right?)

[msarett, 2015/04/13 20:54:04]

Completely agree.  See my comment in DM.cpp.

+                return Error::Nonfatal("Cannot decode to kIndex8.");
+            }
             if (kRGB_565_SkColorType == canvasColorType) {
                 return Error::Nonfatal("Testing non-565 to 565 is uninteresting.");
             }
+            break;
+        case kGrayscale_Always_DstColorType:
+            if (kGray_8_SkColorType != decodeInfo.colorType()) {
+                return Error::Nonfatal("Cannot decode to kGray8.");
+            }
+            if (kRGB_565_SkColorType == canvasColorType) {
+                return Error::Nonfatal("Testing non-565 to 565 is uninteresting.");
+            }
             break;
         default:
             decodeInfo = decodeInfo.makeColorType(canvasColorType);
             break;
     }
 
     // Construct a color table for the decode if necessary
     SkAutoTUnref<SkColorTable> colorTable(NULL);
     SkPMColor* colorPtr = NULL;
     int* colorCountPtr = NULL;
@@ skipping 598 matching lines @@
             canvas->drawPicture(pic);
             return "";
         }
         SkISize size() const override { return fSrc.size(); }
         Name name() const override { sk_throw(); return ""; }  // No one should be calling this.
     } proxy(src);
     return fSink->draw(proxy, bitmap, stream, log);
 }
 
 }  // namespace DM