tools/viewer/sk_app/GLWindowContext.cpp - Issue 2072813002: Revert of Lots of progress switching to SkColorSpace rather than SkColorProfileType

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: tools/viewer/sk_app/GLWindowContext.cpp

Issue 2072813002: Revert of Lots of progress switching to SkColorSpace rather than SkColorProfileType (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 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:

View side-by-side diff with in-line comments

Download patch

Index: tools/viewer/sk_app/GLWindowContext.cpp

diff --git a/tools/viewer/sk_app/GLWindowContext.cpp b/tools/viewer/sk_app/GLWindowContext.cpp

index b960da4824d06eb3f3309f8907948ed40bceaaaf..a491321a2ac97f980c08680ef791badb6fba0091 100644

--- a/tools/viewer/sk_app/GLWindowContext.cpp

+++ b/tools/viewer/sk_app/GLWindowContext.cpp

@@ -47,8 +47,8 @@

// ... and, if we're using a 10-bit/channel FB0, it doesn't do sRGB conversion on write,

// so pretend that it's non-sRGB 8888:

fPixelConfig = fContext->caps()->srgbSupport() &&

- SkColorAndColorSpaceAreGammaCorrect(fDisplayParams.fColorType,

- fDisplayParams.fColorSpace.get()) &&

+ SkColorAndProfileAreGammaCorrect(fDisplayParams.fColorType,

+ fDisplayParams.fProfileType) &&

(fColorBits != 30) ? kSkiaGamma8888_GrPixelConfig : kSkia8888_GrPixelConfig;

}

« no previous file with comments | « tools/viewer/sk_app/DisplayParams.h ('k') | tools/viewer/sk_app/VulkanWindowContext.cpp » ('j') | no next file with comments »