Add SkJpegEncoder and SkWebpEncoder to public API

Bug: 713862
Change-Id: I05d8b3a506f817d63b0bc3ab3f9233e24bbe3be0
Reviewed-on: https://skia-review.googlesource.com/16233
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Reed <reed@google.com>

5 files changed, 10 insertions, 10 deletions

diff --git a/src/images/SkJpegEncoder.h b/include/encode/SkJpegEncoder.h
index a8b9dfb540..fd7c204161 100644
--- a/src/images/SkJpegEncoder.h
+++ b/include/encode/SkJpegEncoder.h
@@ -13,7 +13,7 @@
 class SkJpegEncoderMgr;
 class SkWStream;
 
-class SkJpegEncoder : public SkEncoder {
+class SK_API SkJpegEncoder : public SkEncoder {
 public:
 
     enum class AlphaOption {
@@ -80,8 +80,8 @@ public:
      *
      *  This returns nullptr on an invalid or unsupported |src|.
      */
-    static std::unique_ptr<SkJpegEncoder> Make(SkWStream* dst, const SkPixmap& src,
-                                               const Options& options);
+    static std::unique_ptr<SkEncoder> Make(SkWStream* dst, const SkPixmap& src,
+                                           const Options& options);
 
     ~SkJpegEncoder() override;
 
diff --git a/include/encode/SkPngEncoder.h b/include/encode/SkPngEncoder.h
index adcc061113..6de800f367 100644
--- a/include/encode/SkPngEncoder.h
+++ b/include/encode/SkPngEncoder.h
@@ -76,8 +76,8 @@ public:
      *
      *  This returns nullptr on an invalid or unsupported |src|.
      */
-    static std::unique_ptr<SkPngEncoder> Make(SkWStream* dst, const SkPixmap& src,
-                                               const Options& options);
+    static std::unique_ptr<SkEncoder> Make(SkWStream* dst, const SkPixmap& src,
+                                           const Options& options);
 
     ~SkPngEncoder() override;
 
diff --git a/src/images/SkWebpEncoder.h b/include/encode/SkWebpEncoder.h
index 07fcdd7de7..58ee06d1c6 100644
--- a/src/images/SkWebpEncoder.h
+++ b/include/encode/SkWebpEncoder.h
@@ -12,7 +12,7 @@
 
 class SkWStream;
 
-namespace SkWebpEncoder {
+namespace SK_API SkWebpEncoder {
 
     struct Options {
         /**
diff --git a/src/images/SkJpegEncoder.cpp b/src/images/SkJpegEncoder.cpp
index 4b37cd3be3..8b1dd960e2 100644
--- a/src/images/SkJpegEncoder.cpp
+++ b/src/images/SkJpegEncoder.cpp
@@ -188,8 +188,8 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& srcInfo, const SkJpegEncoder
     return true;
 }
 
-std::unique_ptr<SkJpegEncoder> SkJpegEncoder::Make(SkWStream* dst, const SkPixmap& src,
-                                                   const Options& options) {
+std::unique_ptr<SkEncoder> SkJpegEncoder::Make(SkWStream* dst, const SkPixmap& src,
+                                               const Options& options) {
     if (!SkPixmapIsValid(src, options.fBlendBehavior)) {
         return nullptr;
     }
diff --git a/src/images/SkPngEncoder.cpp b/src/images/SkPngEncoder.cpp
index 6c14f50930..d28657f008 100644
--- a/src/images/SkPngEncoder.cpp
+++ b/src/images/SkPngEncoder.cpp
@@ -382,8 +382,8 @@ void SkPngEncoderMgr::chooseProc(const SkImageInfo& srcInfo,
     fProc = choose_proc(srcInfo, unpremulBehavior);
 }
 
-std::unique_ptr<SkPngEncoder> SkPngEncoder::Make(SkWStream* dst, const SkPixmap& src,
-                                                 const Options& options) {
+std::unique_ptr<SkEncoder> SkPngEncoder::Make(SkWStream* dst, const SkPixmap& src,
+                                              const Options& options) {
     if (!SkPixmapIsValid(src, options.fUnpremulBehavior)) {
         return nullptr;
     }