diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-19 16:57:29 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-19 16:57:29 +0000 |
| commit | cbad22b0de917d307ffbb0f82240d75157d86117 (patch) | |
| tree | 5d96d0100cc5c7a5bd25445f47138bf4f0315033 /src/core | |
| parent | 6e7ddee374fa011c637baca69caac97938e8406c (diff) | |
revert to previous behavior in installPixels, allowing for NULL address
BUG=skia:
Review URL: https://codereview.chromium.org/172603002
git-svn-id: http://skia.googlecode.com/svn/trunk@13501 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkBitmap.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 5b83b44a66..6c9e81f120 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -503,11 +503,6 @@ bool SkBitmap::installPixels(const SkImageInfo& info, void* pixels, size_t rb, return false; } - // No pixels means just behave like setConfig() - if (NULL == pixels) { - return true; - } - SkPixelRef* pr = SkMallocPixelRef::NewWithProc(info, rb, NULL, pixels, releaseProc, context); if (!pr) { @@ -519,7 +514,6 @@ bool SkBitmap::installPixels(const SkImageInfo& info, void* pixels, size_t rb, // since we're already allocated, we lockPixels right away this->lockPixels(); - SkASSERT(this->getPixels()); SkDEBUGCODE(this->validate();) return true; } |