Remove uses SkImageDecoder in imgblur and imgslice

tools/imgslice.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "SkBitmap.h"
 #include "SkCommandLineFlags.h"
-#include "SkImageDecoder.h"
+#include "SkData.h"
+#include "SkImage.h"
 #include "SkStream.h"
 
 DEFINE_bool(header, false, "Print an extra row of the min-max values");
 DEFINE_string2(label, l, "label", "Label printed as the first value");
 
 DEFINE_string2(image, i, "", "Input image");
 DEFINE_int32_2(row, r, -1, "Row to extract");
 DEFINE_int32_2(column, c, -1, "Column to extract");
 
 DEFINE_int32_2(min, n, 0, "Minimum row/column to extract - inclusive");
@@ skipping 30 matching lines @@
         return kError;       
     }
 
     if (FLAGS_row < 0 && FLAGS_column < 0) {
         if (!FLAGS_quiet) {
             SkDebugf("At least one of '-c' or '-r' need to be specified.\n");
         }
         return kError;       
     }
 
-    SkFILEStream inputStream(FLAGS_image[0]);
-    if (!inputStream.isValid()) {
+    SkAutoTUnref<SkData> data(SkData::NewFromFileName(FLAGS_image[0]));
+    if (nullptr == data) {
         if (!FLAGS_quiet) {
             SkDebugf("Couldn't open file: %s\n", FLAGS_image[0]);
         }
         return kError;
     }
 
-    SkAutoTDelete<SkImageDecoder> codec(SkImageDecoder::Factory(&inputStream));
-    if (!codec) {
+    SkAutoTDelete<SkImage> image(SkImage::NewFromEncoded(data));
+    if (!image) {
         if (!FLAGS_quiet) {
-            SkDebugf("Couldn't create codec for: %s.\n", FLAGS_image[0]);
+            SkDebugf("Couldn't create image for: %s.\n", FLAGS_image[0]);
         }
         return kError;
     }
 
     SkBitmap bitmap;
-
-    inputStream.rewind();
-    codec->decode(&inputStream, &bitmap, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
+    if (!image->asLegacyBitmap(&bitmap, SkImage::kRW_LegacyBitmapMode)) {
+        if (!FLAGS_quiet) {
+            SkDebugf("Couldn't create bitmap for: %s.\n", FLAGS_image[0]);
+        }
+        return kError;
+    }
 
     int top, bottom, left, right;
 
     if (-1 != FLAGS_row) {
         SkASSERT(-1 == FLAGS_column);
 
         top = bottom = SkTPin(FLAGS_row, 0, bitmap.height()-1);
         FLAGS_min = left = SkTPin(FLAGS_min, 0, bitmap.width()-1);
         FLAGS_max = right = SkTPin(FLAGS_max, left, bitmap.width()-1);
     } else {
@@ skipping 39 matching lines @@
     SkDebugf("\n");
 
     return kSuccess;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif