src/images/SkImageDecoder_libpng.cpp - Issue 331433003: hide SkImageDecoder::Chooser

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_libpng.cpp

Issue 331433003: hide SkImageDecoder::Chooser (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 6 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_libpng.cpp

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

index 70cc1b9f759ea59d8947c910d8bbf54b21f6805e..9c911e29fcf2fc0692586006063c8828f05813c7 100644

--- a/src/images/SkImageDecoder_libpng.cpp

+++ b/src/images/SkImageDecoder_libpng.cpp

@@ -607,9 +607,11 @@ bool SkPNGImageDecoder::getBitmapConfig(png_structp png_ptr, png_infop info_ptr,

}

+#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER

if (!this->chooseFromOneChoice(*colorTypep, origWidth, origHeight)) {

return false;

}

+#endif

// If the image has alpha and the decoder wants unpremultiplied

// colors, the only supported config is 8888.