tests/KtxTest.cpp - Issue 1018953003: Add SkEncodedFormat, used by SkCodec.

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: tests/KtxTest.cpp

Issue 1018953003: Add SkEncodedFormat, used by SkCodec. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Use a common enum for SkImageEncoder and SkImageDecoder and SkCodec Created 5 years, 9 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: tests/KtxTest.cpp

diff --git a/tests/KtxTest.cpp b/tests/KtxTest.cpp

index 53caabdd910719de086c0451c5c68ce16ac6405f..8f7592c58590f37c1e74fcabdb6579dbb80cc083 100644

--- a/tests/KtxTest.cpp

+++ b/tests/KtxTest.cpp

@@ -52,7 +52,7 @@ DEF_TEST(KtxReadWrite, reporter) {

}

REPORTER_ASSERT(reporter, !(bm8888.empty()));

- SkAutoDataUnref encodedData(SkImageEncoder::EncodeData(bm8888, SkImageEncoder::kKTX_Type, 0));

+ SkAutoDataUnref encodedData(SkImageEncoder::EncodeData(bm8888, kKTX_SkEncodedFormat, 0));

REPORTER_ASSERT(reporter, encodedData);

SkAutoTDelete<SkMemoryStream> stream(SkNEW_ARGS(SkMemoryStream, (encodedData)));

@@ -155,7 +155,7 @@ DEF_TEST(KtxReexportPKM, reporter) {

REPORTER_ASSERT(reporter, installDiscardablePixelRefSuccess);

// Write the bitmap out to a KTX file.

- SkData *ktxDataPtr = SkImageEncoder::EncodeData(etcBitmap, SkImageEncoder::kKTX_Type, 0);

+ SkData *ktxDataPtr = SkImageEncoder::EncodeData(etcBitmap, kKTX_SkEncodedFormat, 0);

SkAutoDataUnref newKtxData(ktxDataPtr);

REPORTER_ASSERT(reporter, ktxDataPtr);