change old picture serialization to really handle images

gm/image.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 "gm.h"
 #include "SkData.h"
 #include "SkCanvas.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 #include "SkSurface.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #endif
 
 static void drawJpeg(SkCanvas* canvas, const SkISize& size) {
     // TODO: Make this draw a file that is checked in, so it can
     // be exercised on machines other than mike's. Will require a
     // rebaseline.
     SkAutoDataUnref data(SkData::NewFromFileName("/Users/mike/Downloads/skia.google.jpeg"));
     if (NULL == data.get()) {
         return;
     }
-    SkImage* image = SkImage::NewFromData(data);
+    SkImage* image = SkImage::NewFromEncoded(data);
     if (image) {
         SkAutoCanvasRestore acr(canvas, true);
         canvas->scale(size.width() * 1.0f / image->width(),
                       size.height() * 1.0f / image->height());
         canvas->drawImage(image, 0, 0, NULL);
         image->unref();
     }
 }
 
 static void drawContents(SkSurface* surface, SkColor fillC) {
@@ skipping 240 matching lines @@
             }
             canvas->translate(0, image->height() + 20.0f);
         }
     }
     
 private:
     typedef skiagm::GM INHERITED;
 };
 DEF_GM( return new ImageResizeGM; )