src/codec/SkJpegCodec.cpp - Issue 2196743002: Add SkColorSpace::Equals() API

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/SkJpegCodec.cpp

Issue 2196743002: Add SkColorSpace::Equals() API (Closed) Base URL: https://skia.googlesource.com/skia.git@cscleanup

Patch Set: Use malloc instead of stack for test Created 4 years, 5 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/SkJpegCodec.cpp

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

index d158b4215a0a632f9e5b8ad2a6b61777c98c3bd5..02599009d59c3d4f91b9ae158ab29aeda00be90d 100644

--- a/src/codec/SkJpegCodec.cpp

+++ b/src/codec/SkJpegCodec.cpp

@@ -475,10 +475,9 @@ bool SkJpegCodec::onDimensionsSupported(const SkISize& size) {

}

static bool needs_color_xform(const SkImageInfo& dstInfo, const SkImageInfo& srcInfo) {

- // FIXME (msarett):

- // Do a better check for color space equality.

return (kRGBA_F16_SkColorType == dstInfo.colorType()) ||

- (dstInfo.colorSpace() && (dstInfo.colorSpace() != srcInfo.colorSpace()));

+ (dstInfo.colorSpace() && SkColorSpace::Equals(srcInfo.colorSpace(),

+ dstInfo.colorSpace()));

}

int SkJpegCodec::readRows(const SkImageInfo& dstInfo, void* dst, size_t rowBytes, int count) {