src/codec/SkAndroidCodec.cpp - Issue 1956573002: Compile SkForceLinking on CMake

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/codec/SkAndroidCodec.cpp

Issue 1956573002: Compile SkForceLinking on CMake (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Refactoring Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/codec/SkAndroidCodec.cpp

diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp

index 6db0991c0d6ca7e611aa7e763ce09564355f766b..db365642327cc1041f1dbda911ed2d87c9c57da1 100644

--- a/src/codec/SkAndroidCodec.cpp

+++ b/src/codec/SkAndroidCodec.cpp

@@ -29,20 +29,20 @@ SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader

}

switch (codec->getEncodedFormat()) {

-#ifdef SK_CODEC_DECODES_PNG

+#ifdef SK_HAS_PNG_LIBRARY

case kPNG_SkEncodedFormat:

case kICO_SkEncodedFormat:

#endif

-#ifdef SK_CODEC_DECODES_JPEG

+#ifdef SK_HAS_JPEG_LIBRARY

case kJPEG_SkEncodedFormat:

#endif

-#ifdef SK_CODEC_DECODES_GIF

+#ifdef SK_HAS_GIF_LIBRARY

case kGIF_SkEncodedFormat:

#endif

case kBMP_SkEncodedFormat:

case kWBMP_SkEncodedFormat:

return new SkSampledCodec(codec.release());

-#ifdef SK_CODEC_DECODES_WEBP

+#ifdef SK_HAS_WEBP_LIBRARY

case kWEBP_SkEncodedFormat:

return new SkWebpAdapterCodec((SkWebpCodec*) codec.release());

#endif

« no previous file with comments | « public.bzl ('k') | src/codec/SkCodec.cpp » ('j') | no next file with comments »