commit e6c210ae01137b283ba7c55b3b197771f425eb74
author Matt Sarett <msarett@google.com> Thu May 11 17:39:04 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 11 22:08:22 2017 +0000
tree d826697fdecb126af742a2ad5fe695bef9222977
parent abde50dacdc3f2f43b008edb6838e5796d461360

Fix Ubuntu-Clang-x86_64-Release-Mini

Bug: skia:
Change-Id: Iab3dbb007ae67b5d82a727cb1fd5ced6b10b325a
Reviewed-on: https://skia-review.googlesource.com/16605
Reviewed-by: Matt Sarett <msarett@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Matt Sarett <msarett@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

src/images/SkImageEncoder.cpp

diff --git a/src/images/SkImageEncoder.cpp b/src/images/SkImageEncoder.cpp
index b2360d0..30493cf 100644
--- a/src/images/SkImageEncoder.cpp
+++ b/src/images/SkImageEncoder.cpp
@@ -12,14 +12,14 @@
 
 #ifndef SK_HAS_JPEG_LIBRARY
 bool SkJpegEncoder::Encode(SkWStream*, const SkPixmap&, const Options&) { return false; }
-std::unique_ptr<SkJpegEncoder> SkJpegEncoder::Make(SkWStream*, const SkPixmap&, const Options&) {
+std::unique_ptr<SkEncoder> SkJpegEncoder::Make(SkWStream*, const SkPixmap&, const Options&) {
     return nullptr;
 }
 #endif
 
 #ifndef SK_HAS_PNG_LIBRARY
 bool SkPngEncoder::Encode(SkWStream*, const SkPixmap&, const Options&) { return false; }
-std::unique_ptr<SkPngEncoder> SkPngEncoder::Make(SkWStream*, const SkPixmap&, const Options&) {
+std::unique_ptr<SkEncoder> SkPngEncoder::Make(SkWStream*, const SkPixmap&, const Options&) {
     return nullptr;
 }
 #endif