Move SkImage::encode to SkImageEncoder

tools/skhello.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 "SkCanvas.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
 #include "SkDocument.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkSurface.h"
 #include "SkImage.h"
+#include "SkImageEncoder.h"
 #include "SkStream.h"
 #include "SkString.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 DEFINE_string2(outFile, o, "skhello", "The filename to write the image.");
 DEFINE_string2(text, t, "Hello", "The string to write.");
 
 static void doDraw(SkCanvas* canvas, const SkPaint& paint, const char text[]) {
     SkRect bounds;
     canvas->getClipBounds(&bounds);
 
     canvas->drawColor(SK_ColorWHITE);
     canvas->drawText(text, strlen(text),
                      bounds.centerX(), bounds.centerY(),
                      paint);
 }
 
 static bool do_surface(int w, int h, const char path[], const char text[],
                        const SkPaint& paint) {
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(w, h));
     doDraw(surface->getCanvas(), paint, text);
 
     SkAutoTUnref<SkImage> image(surface->newImageSnapshot());
-    SkAutoDataUnref data(image->encode());
+    SkAutoDataUnref data(SkImageEncoder::EncodeData(*image,
+                                                    SkImageEncoder::kPNG_Type,
+                                                    SkImageEncoder::kDefaultQuality));
     if (NULL == data.get()) {
         return false;
     }
     SkFILEWStream stream(path);
     return stream.write(data->data(), data->size());
 }
 
 static bool do_document(int w, int h, const char path[], const char text[],
                         const SkPaint& paint) {
     SkAutoTUnref<SkDocument> doc(SkDocument::CreatePDF(path));
@@ skipping 50 matching lines @@
         }
     }
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif