diff options
author | Leon Scroggins III <scroggo@google.com> | 2016-12-14 10:33:10 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-14 18:57:58 +0000 |
commit | 95ada6ee732f9b3a335d6acb3cdba0bc97b5e979 (patch) | |
tree | f04cd142e3e431eedc82c2f23e8ba20afae03372 /src/images | |
parent | 78c212a7190c0965b5e401b00199fecbce1f6ada (diff) |
Remove SkKTXImageEncoder
It escaped the chopping block when we deleted the decoder, but it is
currently untested and unused as far as we know. In addition to
removing effectively unsupported code, this simplifies build file
changes (i.e. don't build it on Android framework, but build it
elsewhere) as we narrow our build systems down to one.
Change-Id: I3b960fdcc369fb947be282933ddba48e407ab3ad
Reviewed-on: https://skia-review.googlesource.com/6031
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/images')
-rw-r--r-- | src/images/SkImageEncoder.cpp | 1 | ||||
-rw-r--r-- | src/images/SkImageEncoderPriv.h | 6 | ||||
-rw-r--r-- | src/images/SkKTXImageEncoder.cpp | 35 |
3 files changed, 0 insertions, 42 deletions
diff --git a/src/images/SkImageEncoder.cpp b/src/images/SkImageEncoder.cpp index c5fff08f61..f135a02063 100644 --- a/src/images/SkImageEncoder.cpp +++ b/src/images/SkImageEncoder.cpp @@ -19,7 +19,6 @@ bool SkEncodeImage(SkWStream* dst, const SkPixmap& src, case SkEncodedImageFormat::kJPEG: return SkEncodeImageAsJPEG(dst, src, quality); case SkEncodedImageFormat::kPNG: return SkEncodeImageAsPNG(dst, src); case SkEncodedImageFormat::kWEBP: return SkEncodeImageAsWEBP(dst, src, quality); - case SkEncodedImageFormat::kKTX: return SkEncodeImageAsKTX(dst, src); default: return false; } #endif diff --git a/src/images/SkImageEncoderPriv.h b/src/images/SkImageEncoderPriv.h index 36519704b2..22f8f4b0ef 100644 --- a/src/images/SkImageEncoderPriv.h +++ b/src/images/SkImageEncoderPriv.h @@ -28,12 +28,6 @@ #define SkEncodeImageAsWEBP(...) false #endif -#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK - bool SkEncodeImageAsKTX(SkWStream*, const SkPixmap&); -#else - #define SkEncodeImageAsKTX(...) false -#endif - #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) bool SkEncodeImageWithCG(SkWStream*, const SkPixmap&, SkEncodedImageFormat); #else diff --git a/src/images/SkKTXImageEncoder.cpp b/src/images/SkKTXImageEncoder.cpp deleted file mode 100644 index fb3eb7947d..0000000000 --- a/src/images/SkKTXImageEncoder.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2014 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkImageEncoderPriv.h" - -#include "SkColorPriv.h" -#include "SkImageGenerator.h" -#include "SkPixelRef.h" -#include "SkStream.h" -#include "SkStreamPriv.h" - -#include "ktx.h" -#include "etc1.h" - -/////////////////////////////////////////////////////////////////////////////// - -// KTX Image Encoder -// -// KTX is a general texture data storage file format ratified by the Khronos Group. As an -// overview, a KTX file contains all of the appropriate values needed to fully specify a -// texture in an OpenGL application, including the use of compressed data. -// -// This encoder takes a best guess at how to encode the bitmap passed to it. -// The KTX library tries to do its best to encode the appropriate -// data specified by the bitmap based on the config. (i.e. kAlpha8_Config will -// be represented as a full resolution 8-bit image dump with the appropriate -// OpenGL defines in the header). - -bool SkEncodeImageAsKTX(SkWStream* stream, const SkPixmap& pixmap) { - return SkKTXFile::WritePixmapToKTX(stream, pixmap); -} |