Remove uses of SkImageDecoder from skdiff

tools/skdiff_main.cpp

 /*
  * Copyright 2011 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_html.h"
 #include "skdiff_utils.h"
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkForceLinking.h"

[scroggo, 2016/03/11 19:56:13]

I assume this is no longer necessary

[msarett, 2016/03/11 19:58:08]

I recently realized that force linking is also used by SkImageEncoder.

I'm not 100% sure, but this could potentially be required for uses of
SkImageEncoder in this file.

[scroggo, 2016/03/11 20:00:34]

Really? I added force linking because we auto-register our image decoders. For
encoding, we call them directly, so the linker shouldn't be stripping them.

[msarett, 2016/03/11 20:05:47]

Maybe I'm wrong...  I'm certainly not an expert in force linking.

I'm basing this on:
https://codereview.chromium.org/1777753002/

Before Patch Set 2, the encode step would fail without even trying to create a
PNG encoder.
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/skia/s...

-#include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
 #include "../private/SkTDArray.h"
 #include "../private/SkTSearch.h"
 
 #include <stdlib.h>
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
@@ skipping 318 matching lines @@
     DiffRecord* fDrp;
 };
 
 static void get_bounds(DiffResource& resource, const char* name) {
     if (resource.fBitmap.empty() && !DiffResource::isStatusFailed(resource.fStatus)) {
         SkAutoDataUnref fileBits(read_file(resource.fFullPath.c_str()));
         if (nullptr == fileBits) {
             SkDebugf("WARNING: couldn't read %s file <%s>\n", name, resource.fFullPath.c_str());
             resource.fStatus = DiffResource::kCouldNotRead_Status;
         } else {
-            get_bitmap(fileBits, resource, SkImageDecoder::kDecodeBounds_Mode);
+            get_bitmap(fileBits, resource, true);
         }
     }
 }
 
 static void get_bounds(DiffRecord& drp) {
     get_bounds(drp.fBase, "base");
     get_bounds(drp.fComparison, "comparison");
 }
 
 #ifdef SK_OS_WIN
@@ skipping 123 matching lines @@
                     drp->fComparison.fStatus = DiffResource::kCouldNotRead_Status;
                     VERBOSE_STATUS("READ FAIL", ANSI_COLOR_RED, comparisonFiles[j]);
                 }
                 drp->fResult = DiffRecord::kCouldNotCompare_Result;
 
             } else if (are_buffers_equal(baseFileBits, comparisonFileBits)) {
                 drp->fResult = DiffRecord::kEqualBits_Result;
                 VERBOSE_STATUS("MATCH", ANSI_COLOR_GREEN, baseFiles[i]);
             } else {
                 AutoReleasePixels arp(drp);
-                get_bitmap(baseFileBits, drp->fBase, SkImageDecoder::kDecodePixels_Mode);
-                get_bitmap(comparisonFileBits, drp->fComparison,
-                           SkImageDecoder::kDecodePixels_Mode);
+                get_bitmap(baseFileBits, drp->fBase, false);
+                get_bitmap(comparisonFileBits, drp->fComparison, false);
                 VERBOSE_STATUS("DIFFERENT", ANSI_COLOR_RED, baseFiles[i]);
                 if (DiffResource::kDecoded_Status == drp->fBase.fStatus &&
                     DiffResource::kDecoded_Status == drp->fComparison.fStatus) {
                     create_and_write_diff_image(drp, dmp, colorThreshold,
                                                 outputDir, drp->fBase.fFilename);
                 } else {
                     drp->fResult = DiffRecord::kCouldNotCompare_Result;
                 }
             }
 
@@ skipping 342 matching lines @@
     // range [0...255] are wrapped (mod 256).  Do the conversion ourselves, to
     // make sure that we only return 0 when there were no failures.
     return (num_failing_results > 255) ? 255 : num_failing_results;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif