Separate core and images project.

include/core/SkImage.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImage_DEFINED
 #define SkImage_DEFINED
 
+#include "SkImageEncoder.h"
 #include "SkRefCnt.h"
 #include "SkScalar.h"
 
 class SkData;
 class SkCanvas;
 class SkPaint;
 class SkShader;
 class GrContext;
 class GrTexture;
 
@@ skipping 54 matching lines @@
      * does not affect the reference count of the GrTexture object.
      * Will return NULL if the image does not use a texture.
      */
     GrTexture* getTexture();
 
     SkShader*   newShaderClamp() const;
     SkShader*   newShader(SkShader::TileMode, SkShader::TileMode) const;
 
     void draw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*);
 
-    enum EncodeType {
-        kBMP_EncodeType,
-        kGIF_EncodeType,
-        kICO_EncodeType,
-        kJPEG_EncodeType,
-        kPNG_EncodeType,
-        kWBMP_EncodeType,
-        kWEBP_EncodeType,
-    };
     /**
      *  Encode the image's pixels and return the result as a new SkData, which
      *  the caller must manage (i.e. call unref() when they are done).
      *
      *  If the image type cannot be encoded, or the requested encoder type is
      *  not supported, this will return NULL.
      */
-    SkData* encode(EncodeType t = kPNG_EncodeType, int quality = 80) const;
+    SkData* encode(SkImageEncoder::Type t = SkImageEncoder::kPNG_Type,
+                   int quality = 80) const;
 
 protected:
     SkImage(int width, int height) :
         fWidth(width),
         fHeight(height),
         fUniqueID(NextUniqueID()) {
 
         SkASSERT(width >= 0);
         SkASSERT(height >= 0);
     }
 
 private:
     const int       fWidth;
     const int       fHeight;
     const uint32_t  fUniqueID;
 
     static uint32_t NextUniqueID();
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif