DM: Use the new non-fatal errors for invalid color conversions.

dm/DMSrcSink.cpp

 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCommonFlags.h"
 #include "SkCodec.h"
 #include "SkDocument.h"
 #include "SkError.h"
 #include "SkMultiPictureDraw.h"
 #include "SkNullCanvas.h"
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
@@ skipping 52 matching lines @@
                 // FIXME: Currently we cannot draw unpremultiplied sources.
                 info = info.makeAlphaType(kPremul_SkAlphaType);
             }
             if (!bitmap.tryAllocPixels(info)) {
                 return SkStringPrintf("Image(%s) is too large (%d x %d)\n", fPath.c_str(),
                                       info.width(), info.height());
             }
             SkAutoLockPixels alp(bitmap);
             const SkImageGenerator::Result result = codec->getPixels(info, bitmap.getPixels(),
                                                                      bitmap.rowBytes());
-            if (result != SkImageGenerator::kSuccess) {
-                return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str());
+            switch (result) {
+                case SkImageGenerator::kSuccess:
+                // We consider incomplete to be valid, since we should still decode what is
+                // available.
+                case SkImageGenerator::kIncompleteInput:
+                    break;
+                case SkImageGenerator::kInvalidConversion:
+                    return Error::Nonfatal("Incompatible colortype conversion");
+                default:
+                    // Everything else is considered a failure.
+                    return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str());
             }
         } else {
             if (!SkImageDecoder::DecodeMemory(encoded->data(), encoded->size(), &bitmap,
                                               dstColorType, SkImageDecoder::kDecodePixels_Mode)) {
                 return SkStringPrintf("Couldn't decode %s.", fPath.c_str());
             }
+            if (kRGB_565_SkColorType == dstColorType && !bitmap.isOpaque()) {
+                // Do not draw a bitmap with alpha to a destination without alpha.
+                return Error::Nonfatal("Uninteresting to decode image with alpha into 565.");
+            }
         }
         encoded.reset((SkData*)NULL);  // Might as well drop this when we're done with it.
         canvas->drawBitmap(bitmap, 0,0);
         return "";
     }
     // Decode subsets.  This is a little involved.
     SkAutoTDelete<SkMemoryStream> stream(new SkMemoryStream(encoded));
     SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(stream.get()));
     if (!decoder) {
         return SkStringPrintf("Can't find a good decoder for %s.", fPath.c_str());
@@ skipping 12 matching lines @@
     const int subsetWidth  = w / fDivisor,
               subsetHeight = h / fDivisor;
     for (int y = 0; y < h; y += subsetHeight) {
         for (int x = 0; x < w; x += subsetWidth) {
             SkBitmap subset;
             SkIRect rect = SkIRect::MakeXYWH(x, y, subsetWidth, subsetHeight);
             if (!decoder->decodeSubset(&subset, rect, dstColorType)) {
                 return SkStringPrintf("Could not decode subset (%d, %d, %d, %d).",
                                       x, y, x+subsetWidth, y+subsetHeight);
             }
+            if (kRGB_565_SkColorType == dstColorType && !subset.isOpaque()) {
+                // Do not draw a bitmap with alpha to a destination without alpha.
+                // This is not an error, but there is nothing interesting to show.
+
+                // This should only happen on the first iteration through the loop.
+                SkASSERT(0 == x && 0 == y);
+
+                return Error::Nonfatal("Uninteresting to decode image with alpha into 565.");
+            }
             canvas->drawBitmap(subset, SkIntToScalar(x), SkIntToScalar(y));
         }
     }
     return "";
 }
 
 SkISize ImageSrc::size() const {
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
     SkBitmap bitmap;
     if (!encoded || !SkImageDecoder::DecodeMemory(encoded->data(),
@@ skipping 388 matching lines @@
             surfaces.unrefAll();
             return "";
         }
         SkISize size() const SK_OVERRIDE { return fSize; }
         Name name() const SK_OVERRIDE { sk_throw(); return ""; }  // No one should be calling this.
     } proxy(fW, fH, pic, src.size());
     return fSink->draw(proxy, bitmap, stream, log);
 }
 
 }  // namespace DM