Remove uses of SkImageDecoder from skdiff

tools/skdiff_image.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 "SkData.h"
-#include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkTDArray.h"
 #include "SkTemplates.h"
 #include "SkTypes.h"
 
 #include <stdio.h>
 
 /// If outputDir.isEmpty(), don't write out diff files.
 static void create_diff_images (DiffMetricProc dmp,
@@ skipping 31 matching lines @@
         }
         drp->fResult = DiffRecord::kCouldNotCompare_Result;
         return;
     }
 
     if (are_buffers_equal(baseFileBits, comparisonFileBits)) {
         drp->fResult = DiffRecord::kEqualBits_Result;
         return;
     }
 
-    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);
     if (DiffResource::kDecoded_Status != drp->fBase.fStatus ||
         DiffResource::kDecoded_Status != drp->fComparison.fStatus)
     {
         drp->fResult = DiffRecord::kCouldNotCompare_Result;
         return;
     }
 
     create_and_write_diff_image(drp, dmp, colorThreshold, outputDir, outputFilename);
     //TODO: copy fBase.fFilename and fComparison.fFilename to outputDir
     //      svn and git often present tmp files to diff tools which are promptly deleted
@@ skipping 293 matching lines @@
     }
 
     return num_failing_results;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif