Remove uses of SkImageDecoder from skdiff

tools/skdiff_utils.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "skdiff.h"
 #include "skdiff_utils.h"
 #include "SkBitmap.h"
+#include "SkCodec.h"
 #include "SkData.h"
-#include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkStream.h"
 #include "SkTypes.h"
 
 #include <memory>
 
 bool are_buffers_equal(SkData* skdata1, SkData* skdata2) {
     if ((nullptr == skdata1) || (nullptr == skdata2)) {
         return false;
     }
     if (skdata1->size() != skdata2->size()) {
         return false;
     }
     return (0 == memcmp(skdata1->data(), skdata2->data(), skdata1->size()));
 }
 
 SkData* read_file(const char* file_path) {
     SkData* data = SkData::NewFromFileName(file_path);
     if (!data) {
         SkDebugf("WARNING: could not open file <%s> for reading\n", file_path);
     }
     return data;
 }
 
-bool get_bitmap(SkData* fileBits, DiffResource& resource, SkImageDecoder::Mode mode) {
-    SkMemoryStream stream(fileBits->data(), fileBits->size());
-
-    // In debug, the DLL will automatically be unloaded when this is deleted,
-    // but that shouldn't be a problem in release mode.
-    std::unique_ptr<SkImageDecoder> codec(SkImageDecoder::Factory(&stream));
-    if (nullptr == codec) {
-        SkDebugf("ERROR: no codec found for <%s>\n", resource.fFullPath.c_str());
+bool get_bitmap(SkData* fileBits, DiffResource& resource, bool sizeOnly) {
+    SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fileBits));
+    if (!codec) {
+        SkDebugf("ERROR: could not create codec for <%s>\n", resource.fFullPath.c_str());
         resource.fStatus = DiffResource::kCouldNotDecode_Status;
         return false;
     }
 
-    stream.rewind();
-    if (!codec->decode(&stream, &resource.fBitmap, kN32_SkColorType, mode)) {
+    if (!resource.fBitmap.setInfo(codec->getInfo().makeColorType(kN32_SkColorType))) {
+        SkDebugf("ERROR: could not set bitmap info for <%s>\n", resource.fFullPath.c_str());
+        resource.fStatus = DiffResource::kCouldNotDecode_Status;
+        return false;
+    }
+
+    if (sizeOnly) {
+        return true;
+    }
+
+    if (!resource.fBitmap.tryAllocPixels()) {
+        SkDebugf("ERROR: could not allocate pixels for <%s>\n", resource.fFullPath.c_str());
+        resource.fStatus = DiffResource::kCouldNotDecode_Status;
+        return false;
+    }
+
+    if (SkCodec::kSuccess != codec->getPixels(resource.fBitmap.info(),
+            resource.fBitmap.getPixels(), resource.fBitmap.rowBytes())) {
         SkDebugf("ERROR: codec failed for basePath <%s>\n", resource.fFullPath.c_str());
         resource.fStatus = DiffResource::kCouldNotDecode_Status;
         return false;
     }
 
     resource.fStatus = DiffResource::kDecoded_Status;
     return true;
 }
 
 /** Thanks to PNG, we need to force all pixels 100% opaque. */
@@ skipping 98 matching lines @@
                 drp->fDifference.fStatus = DiffResource::kDoesNotExist_Status;
             }
             if (write_bitmap(drp->fWhite.fFullPath, drp->fWhite.fBitmap)) {
                 drp->fWhite.fStatus = DiffResource::kExists_Status;
             } else {
                 drp->fWhite.fStatus = DiffResource::kDoesNotExist_Status;
             }
         }
     }
 }