tests/PictureTest.cpp - Issue 18904003: Increase safety of PictureTest

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

Issue 18904003: Increase safety of PictureTest (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: use if() instead of lots of && in asserts Created 7 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: tests/PictureTest.cpp

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

index 49bc57b1af29960e5cafa0cc709440d2171f0559..1827fdcb5a28ceb0a33541825c58a0fe57914790 100644

--- a/tests/PictureTest.cpp

+++ b/tests/PictureTest.cpp

@@ -189,9 +189,11 @@ static void test_gatherpixelrefs(skiatest::Reporter* reporter) {

r.offset(pos[i].fX, pos[i].fY);

SkAutoDataUnref data(SkPictureUtils::GatherPixelRefs(pic, r));

REPORTER_ASSERT(reporter, data);

- int count = data->size() / sizeof(SkPixelRef*);

- REPORTER_ASSERT(reporter, 1 == count);

- REPORTER_ASSERT(reporter, *(SkPixelRef**)data->data() == refs[i]);

+ if (data) {

+ int count = data->size() / sizeof(SkPixelRef*);

+ REPORTER_ASSERT(reporter, 1 == count);

+ REPORTER_ASSERT(reporter, *(SkPixelRef**)data->data() == refs[i]);

+ }

}

// Test a bunch of random (mostly) rects, and compare the gather results

« no previous file with comments | « no previous file | no next file » | no next file with comments »