diff options
| -rw-r--r-- | BUILD.gn | 1 | ||||
| -rw-r--r-- | gyp/images.gyp | 11 | ||||
| -rw-r--r-- | src/images/SkImageEncoder.cpp | 1 | ||||
| -rw-r--r-- | src/images/SkImageEncoderPriv.h | 6 | ||||
| -rw-r--r-- | src/images/SkKTXImageEncoder.cpp | 35 |
5 files changed, 0 insertions, 54 deletions
@@ -578,7 +578,6 @@ component("skia") { "src/codec/SkSwizzler.cpp", "src/codec/SkWbmpCodec.cpp", "src/images/SkImageEncoder.cpp", - "src/images/SkKTXImageEncoder.cpp", "src/ports/SkDiscardableMemory_none.cpp", "src/ports/SkGlobalInitialization_default.cpp", "src/ports/SkImageGenerator_skia.cpp", diff --git a/gyp/images.gyp b/gyp/images.gyp index efeb3d2335..da03e6f562 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -15,7 +15,6 @@ 'core.gyp:*', 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', 'etc1.gyp:libetc1', - 'ktx.gyp:libSkKTX', 'libpng.gyp:libpng', 'libwebp.gyp:libwebp', 'utils.gyp:utils', @@ -30,7 +29,6 @@ '../src/image/', ], 'sources': [ - '../src/images/SkKTXImageEncoder.cpp', '../src/images/SkWEBPImageEncoder.cpp', '../src/images/SkJPEGImageEncoder.cpp', '../src/images/SkPNGImageEncoder.cpp', @@ -66,15 +64,6 @@ 'dependencies': [ 'libpng.gyp:libpng', ], - 'conditions': [ - [ 'skia_android_framework == 1', { - # The android framework disables these decoders as they are of little use to - # Java applications that can't take advantage of the compressed formats. - 'sources!': [ - '../src/images/SkKTXImageEncoder.cpp', - ], - }], - ], }], [ 'skia_os == "ios"', { 'include_dirs': [ 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); -} |