AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lockPixels before calling getColorTable.

Browse Source 
Fixes a bug where we try to dereference a NULL pointer.

Update the comment for SkBitmap::getColorTable, telling
the client that pixels must be locked for it to return
non-NULL.

R=edisonn@google.com

Review URL: https://codereview.chromium.org/15002002

git-svn-id: http://skia.googlecode.com/svn/trunk@9018 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
scroggo@google.com 2013-05-06 18:08:05 +00:00
parent 1335264fce
commit 665b2cca88
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/core/SkBitmap.h
View File

@ -371,7 +371,9 @@ public:
*/
SkGpuTexture* getTexture() const;
/** Return the bitmap's colortable (if any). Does not affect the colortable's
/** Return the bitmap's colortable, if it uses one (i.e. fConfig is
kIndex8_Config or kRLE_Index8_Config) and the pixels are locked.
Otherwise returns NULL. Does not affect the colortable's
reference count.
*/
SkColorTable* getColorTable() const { return fColorTable; }

1
src/pdf/SkPDFImage.cpp
View File

@ -321,6 +321,7 @@ SkPDFImage::SkPDFImage(SkStream* imageData,
insertName("ColorSpace", "DeviceGray");
} else if (config == SkBitmap::kIndex8_Config ||
config == SkBitmap::kRLE_Index8_Config) {
SkAutoLockPixels alp(bitmap);
insert("ColorSpace",
makeIndexedColorSpace(bitmap.getColorTable()))->unref();
} else {