diff options
| author |  reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-09-10 17:26:24 +0000 |
|---|---|---|
| committer | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-09-10 17:26:24 +0000 |
| commit | 3ce77e4d13372be9fbf2601498be05b8cbd4e237 (patch) | |
| tree | 3a709e7048287f17e162805ec543b98237852c2e /src/core | |
| parent | 8b17ac3a433db5609e3f343f58a2436fc0bcc651 (diff) | |
call readyToDraw() instead of just checking for null pixels, since we could
have a bitmap with pixels, but no (required) colortable. readyToDraw() knows
to check for this.
git-svn-id: http://skia.googlecode.com/svn/trunk@599 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkBitmapProcShader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp index c3fd7d0270..3c7be4c8b8 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -82,7 +82,7 @@ bool SkBitmapProcShader::setContext(const SkBitmap& device, fState.fOrigBitmap = fRawBitmap; fState.fOrigBitmap.lockPixels(); - if (fState.fOrigBitmap.getPixels() == NULL) { + if (!fState.fOrigBitmap.readyToDraw()) { fState.fOrigBitmap.unlockPixels(); return false; } |