Another iOS fix for SampleApp.

src/utils/ios/SkImageDecoder_iOS.mm

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
 #include <CoreGraphics/CGColorSpace.h>
 #import <UIKit/UIKit.h>
@@ skipping 11 matching lines @@
 #define BITMAP_INFO (kCGBitmapByteOrder32Big | kCGImageAlphaPremultipliedLast)
 
 bool SkImageDecoder_iOS::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
 
     NSData* data = NSData_dataWithStream(stream);
 
     UIImage* uimage = [UIImage imageWithData:data];
     
     const int width = uimage.size.width;
     const int height = uimage.size.height;
-    SkColorType ct = SkBitmapConfigToColorType(SkBitmap::kARGB_8888_Config);
-    bm->setInfo(SkImageInfo::Make(width, height, ct, kPremul_SkAlphaType), 0);
+    bm->setInfo(SkImageInfo::MakeN32(width, height, kPremul_SkAlphaType), 0);
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
         return true;
     }
     
     if (!this->allocPixelRef(bm, NULL)) {
         return false;
     }
     
     bm->lockPixels();
     bm->eraseColor(0);
@@ skipping 16 matching lines @@
 }
 
 SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
     return NULL;
 }
 
 SkImageEncoder* SkImageEncoder::Create(Type t) {
     return NULL;
 }