guard references to SkColorTable

Bug: skia:6828
Change-Id: I0c8c78e70b118f51cb59dc45675e4ddcd4776108
Reviewed-on: https://skia-review.googlesource.com/24260
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

1 files changed, 1 insertions, 14 deletions

diff --git a/src/images/SkPngEncoder.cpp b/src/images/SkPngEncoder.cpp
index 0b9ef03a1b..748953fb4d 100644
--- a/src/images/SkPngEncoder.cpp
+++ b/src/images/SkPngEncoder.cpp
@@ -9,6 +9,7 @@
 
 #ifdef SK_HAS_PNG_LIBRARY
 
+#include "SkColorTable.h"
 #include "SkImageEncoderFns.h"
 #include "SkImageInfoPriv.h"
 #include "SkStream.h"
@@ -51,8 +52,6 @@ public:
     static std::unique_ptr<SkPngEncoderMgr> Make(SkWStream* stream);
 
     bool setHeader(const SkImageInfo& srcInfo, const SkPngEncoder::Options& options);
-    bool setPalette(const SkImageInfo& srcInfo, SkColorTable* colorTable,
-                    SkTransferFunctionBehavior);
     bool setColorSpace(const SkImageInfo& info);
     bool writeInfo(const SkImageInfo& srcInfo);
     void chooseProc(const SkImageInfo& srcInfo, SkTransferFunctionBehavior unpremulBehavior);
@@ -261,14 +260,6 @@ static transform_scanline_proc choose_proc(const SkImageInfo& info,
     }
 }
 
-bool SkPngEncoderMgr::setPalette(const SkImageInfo& srcInfo, SkColorTable* colorTable,
-                                 SkTransferFunctionBehavior unpremulBehavior) {
-    if (setjmp(png_jmpbuf(fPngPtr))) {
-        return false;
-    }
-    return true;
-}
-
 static void set_icc(png_structp png_ptr, png_infop info_ptr, const SkImageInfo& info) {
     sk_sp<SkData> icc = icc_from_color_space(info);
     if (!icc) {
@@ -337,10 +328,6 @@ std::unique_ptr<SkEncoder> SkPngEncoder::Make(SkWStream* dst, const SkPixmap& sr
         return nullptr;
     }
 
-    if (!encoderMgr->setPalette(src.info(), src.ctable(), options.fUnpremulBehavior)) {
-        return nullptr;
-    }
-
     if (!encoderMgr->setColorSpace(src.info())) {
         return nullptr;
     }