guarded change to SkImageGenerator to make getInfo() const

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 "SkPictureData.h"
@@ skipping 37 matching lines @@
     }
     const SkColorType dstColorType = canvas->imageInfo().colorType();
     if (fDivisor == 0) {
         // Decode the full image.
         SkBitmap bitmap;
         if (FLAGS_codec) {
             SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
             if (!codec) {
                 return SkStringPrintf("Couldn't decode %s.", fPath.c_str());
             }
-            SkImageInfo info;
-            if (!codec->getInfo(&info)) {
-                return SkStringPrintf("Couldn't getInfo %s.", fPath.c_str());
-            }
+            SkImageInfo info = codec->getInfo();

[scroggo, 2015/03/19 13:27:46]

Yay! FYI: this (and the code in ImageSrc::size()) has moved to CodecSrc.

[reed1, 2015/03/19 15:20:45]

Acknowledged.

             info = info.makeColorType(dstColorType);
             if (info.alphaType() == kUnpremul_SkAlphaType) {
                 // 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);
@@ skipping 67 matching lines @@
     return "";
 }
 
 SkISize ImageSrc::size() const {
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
     if (FLAGS_codec) {
         SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
         if (!codec) {
             return SkISize::Make(0,0);
         }
-        SkImageInfo info;
-        if (!codec->getInfo(&info)) {
-            return SkISize::Make(0,0);
-        }
-        return info.dimensions();
+        return codec->getInfo().dimensions();
     } else {
         SkBitmap bitmap;
         if (!encoded || !SkImageDecoder::DecodeMemory(encoded->data(),
                                                       encoded->size(),
                                                       &bitmap,
                                                       kUnknown_SkColorType,
                                                       SkImageDecoder::kDecodeBounds_Mode)) {
             return SkISize::Make(0,0);
         }
         return bitmap.dimensions();
@@ skipping 393 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