move SkImage::ColorType into SkColorType

src/ports/SkImageDecoder_empty.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkBitmapFactory.h"
@@ skipping 66 matching lines @@
 SkImageDecoder::Chooser* SkImageDecoder::setChooser(Chooser*) {
     return NULL;
 }
 
 SkBitmap::Allocator* SkImageDecoder::setAllocator(SkBitmap::Allocator*) {
     return NULL;
 }
 
 void SkImageDecoder::setSampleSize(int) {}
 
-bool SkImageDecoder::DecodeMemoryToTarget(const void*, size_t, SkImage::Info*,
+bool SkImageDecoder::DecodeMemoryToTarget(const void*, size_t, SkImageInfo*,
                                           const SkBitmapFactory::Target*) {
     return false;
 }
 
 SkBitmap::Config SkImageDecoder::GetDeviceConfig() {
     return SkBitmap::kNo_Config;
 }
 
 void SkImageDecoder::SetDeviceConfig(SkBitmap::Config) {}
 
@@ skipping 54 matching lines @@
 bool SkImageEncoder::encodeFile(const char file[], const SkBitmap& bm, int quality) {
     return false;
 }
 /////////////////////////////////////////////////////////////////////////
 
 // Empty implementation for SkImages.
 
 #include "SkImages.h"
 
 void SkImages::InitializeFlattenables() {}