diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:31:11 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:31:11 +0000 |
| commit | 6fcbfcead5dc1b61fa5b4c139a1a3714e8c58091 (patch) | |
| tree | c7bfb4b07deb28223c78af4de69e2440f34c3427 /src/core/SkBitmapHeap.cpp | |
| parent | 081560e3abe25c4821b79ca1465f4dbd371c4b5c (diff) | |
Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning"
This reverts commit 1d22c4aaf9d8f053f25194a1ed74b137bfb19497.
git-svn-id: http://skia.googlecode.com/svn/trunk@12056 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkBitmapHeap.cpp')
| -rw-r--r-- | src/core/SkBitmapHeap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkBitmapHeap.cpp b/src/core/SkBitmapHeap.cpp index a17113842f..f3428db64f 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.config())) { + } else if (!originalBitmap.deepCopyTo(&copiedBitmap, originalBitmap.getConfig())) { return false; } copiedBitmap.setImmutable(); |