src/core/SkBitmapHeap.cpp - Issue 54603004: Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warn…

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

Issue 54603004: Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warn… (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 2 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: src/core/SkBitmapHeap.cpp

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

index f3428db64f13039bdf025d8bb5652c44bff7a229..a17113842f3f760843b020cf77ded6d385276d92 100644

--- a/src/core/SkBitmapHeap.cpp

+++ b/src/core/SkBitmapHeap.cpp

@@ -259,7 +259,7 @@ bool SkBitmapHeap::copyBitmap(const SkBitmap& originalBitmap, SkBitmap& copiedBi

// copiedBitmap.setPixelRef(sharedPixelRef, originalBitmap.pixelRefOffset());

} else if (originalBitmap.empty()) {

copiedBitmap.reset();

- } else if (!originalBitmap.deepCopyTo(&copiedBitmap, originalBitmap.getConfig())) {

+ } else if (!originalBitmap.deepCopyTo(&copiedBitmap, originalBitmap.config())) {

return false;

}

copiedBitmap.setImmutable();

« no previous file with comments | « src/core/SkBitmapDevice.cpp ('k') | src/core/SkBlitter.cpp » ('j') | no next file with comments »