src/images/SkImageDecoder_libjpeg.cpp - Issue 1406153015: Remove dependencies on Android's forked decoder libraries

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/images/SkImageDecoder_libjpeg.cpp

Issue 1406153015: Remove dependencies on Android's forked decoder libraries (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 2 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/images/SkImageDecoder_libjpeg.cpp

diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp

index 7216239e80b14b0f6e81dad66bdbfdcc4875a6d2..914bdea5c8b8a96f9e4b0117900831d3c797eec0 100644

--- a/src/images/SkImageDecoder_libjpeg.cpp

+++ b/src/images/SkImageDecoder_libjpeg.cpp

@@ -54,10 +54,6 @@ SK_CONF_DECLARE(bool, c_suppressJPEGImageDecoderErrors,

"Suppress most JPG error messages when decode "

"function fails.");

-#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_JPEG_NO_INDEX_SUPPORTED)

-#define SK_JPEG_INDEX_SUPPORTED

scroggo 2015/11/04 19:28:23 Should we go ahead and remove the code inside #if

msarett 2015/11/05 15:00:56 Yes, I'd like to do it later in the interest of ke

-#endif

//////////////////////////////////////////////////////////////////////////