Move SkPngEncoder into public API

Bug: 713862
Change-Id: I45068ed39affe41ffe0f29bf42c5ea1d9b0247ba
Reviewed-on: https://skia-review.googlesource.com/15897
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

diff --git a/BUILD.gn b/BUILD.gn
index 443b4e3..e35fc96 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -81,6 +81,7 @@ skia_public_includes = [
   "include/config",
   "include/core",
   "include/effects",
+  "include/encode",
   "include/gpu",
   "include/gpu/gl",
   "include/pathops",

diff --git a/src/images/SkEncoder.h b/include/encode/SkEncoder.h
similarity index 96%
rename from src/images/SkEncoder.h
rename to include/encode/SkEncoder.h
index e2686ad..d1b99fd 100644 (file)
--- a/src/images/SkEncoder.h
+++ b/include/encode/SkEncoder.h
@@ -9,7 +9,7 @@
 #define SkEncoder_DEFINED
 
 #include "SkPixmap.h"
-#include "SkTemplates.h"
+#include "../private/SkTemplates.h"
 
 class SkEncoder : SkNoncopyable {
 public:

diff --git a/src/images/SkPngEncoder.h b/include/encode/SkPngEncoder.h
similarity index 98%
rename from src/images/SkPngEncoder.h
rename to include/encode/SkPngEncoder.h
index 0664c06..adcc061 100644 (file)
--- a/src/images/SkPngEncoder.h
+++ b/include/encode/SkPngEncoder.h
@@ -13,7 +13,7 @@
 class SkPngEncoderMgr;
 class SkWStream;
 
-class SkPngEncoder : public SkEncoder {
+class SK_API SkPngEncoder : public SkEncoder {
 public:
 
     enum class FilterFlag : int {