src/core/SkBitmap.cpp - Issue 560653004: SkData can allocate room for its contents in the same block

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/core/SkBitmap.cpp

Issue 560653004: SkData can allocate room for its contents in the same block (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: update dox, change fPtr to non const Created 6 years, 3 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/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp

index e28c6fdc3488ff486d98a338828389d5d2e4f131..f0ad029bea9285b74f03bbb0700ad09d1255c797 100644

--- a/src/core/SkBitmap.cpp

+++ b/src/core/SkBitmap.cpp

@@ -1211,9 +1211,9 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) {

return false;

}

- char* dst = (char*)sk_malloc_throw(ramSize);

+ SkAutoDataUnref data(SkData::NewUninitialized(ramSize));

+ char* dst = (char*)data->writable_data();

buffer->readByteArray(dst, snugSize);

- SkAutoDataUnref data(SkData::NewFromMalloc(dst, ramSize));

if (snugSize != ramSize) {

const char* srcRow = dst + snugRB * (height - 1);

« no previous file with comments | « include/core/SkData.h ('k') | src/core/SkData.cpp » ('j') | no next file with comments »