3 files changed, 36 insertions, 38 deletions
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h
index 04f1987738..b8c91b2ad6 100644
--- a/include/core/SkPreConfig.h
+++ b/include/core/SkPreConfig.h
@@ -96,12 +96,6 @@
 //////////////////////////////////////////////////////////////////////
 // Conditional features based on build target
 
-#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX)
-    #ifndef SK_BUILD_NO_IMAGE_ENCODE
-        #define SK_SUPPORT_IMAGE_ENCODE
-    #endif
-#endif
-
 #ifdef SK_BUILD_FOR_SYMBIAN
     #define SK_USE_RUNTIME_GLOBALS
 #endif
diff --git a/include/images/SkImageDecoder.h b/include/images/SkImageDecoder.h
index 4a18cab594..5b91c51fdd 100644
--- a/include/images/SkImageDecoder.h
+++ b/include/images/SkImageDecoder.h
@@ -266,36 +266,4 @@ private:
     SkImageDecoder& operator=(const SkImageDecoder&);
 };
 
-#ifdef SK_SUPPORT_IMAGE_ENCODE
-
-class SkWStream;
-
-class SkImageEncoder {
-public:
-    enum Type {
-        kJPEG_Type,
-        kPNG_Type
-    };
-    static SkImageEncoder* Create(Type);
-
-    virtual ~SkImageEncoder();
-    
-    /*  Quality ranges from 0..100 */
-
-    bool encodeFile(const char file[], const SkBitmap&, int quality = 80);
-    bool encodeStream(SkWStream*, const SkBitmap&, int quality = 80);
-
-    static bool EncodeFile(const char file[], const SkBitmap&, Type,
-                           int quality = 80);
-    static bool EncodeStream(SkWStream*, const SkBitmap&, Type,
-                           int quality = 80);
-
-protected:
-    virtual bool onEncode(SkWStream*, const SkBitmap&, int quality) = 0;
-};
-
-#endif /* SK_SUPPORT_IMAGE_ENCODE */
-
-///////////////////////////////////////////////////////////////////////
-
 #endif
diff --git a/include/images/SkImageEncoder.h b/include/images/SkImageEncoder.h
new file mode 100644
index 0000000000..94989c0843
--- /dev/null
+++ b/include/images/SkImageEncoder.h
@@ -0,0 +1,36 @@
+#ifndef SkImageEncoder_DEFINED
+#define SkImageEncoder_DEFINED
+
+#include "SkTypes.h"
+
+class SkBitmap;
+class SkWStream;
+
+class SkImageEncoder {
+public:
+    enum Type {
+        kJPEG_Type,
+        kPNG_Type
+    };
+    static SkImageEncoder* Create(Type);
+
+    virtual ~SkImageEncoder();
+    
+    /*  Quality ranges from 0..100 */
+    enum {
+        kDefaultQuality = 80
+    };
+
+    bool encodeFile(const char file[], const SkBitmap&, int quality);
+    bool encodeStream(SkWStream*, const SkBitmap&, int quality);
+
+    static bool EncodeFile(const char file[], const SkBitmap&, Type,
+                           int quality);
+    static bool EncodeStream(SkWStream*, const SkBitmap&, Type,
+                           int quality);
+
+protected:
+    virtual bool onEncode(SkWStream*, const SkBitmap&, int quality) = 0;
+};
+
+#endif