| Index: src/image/SkImage_Raster.cpp
|
| diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
|
| index 3be7d84b7f5ae5162c117a45ae3808585fee61b9..68fc1b32e6d269209b9815ac4d204b0e405097b0 100644
|
| --- a/src/image/SkImage_Raster.cpp
|
| +++ b/src/image/SkImage_Raster.cpp
|
| @@ -31,7 +31,7 @@ public:
|
| return false;
|
| }
|
|
|
| - if (SkImageInfoToBitmapConfig(info) == SkBitmap::kNo_Config) {
|
| + if (kUnknown_SkColorType == info.colorType()) {
|
| return false;
|
| }
|
|
|
| @@ -104,7 +104,7 @@ SkImage_Raster::SkImage_Raster(const Info& info, SkData* data, size_t rowBytes)
|
| SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, size_t rowBytes)
|
| : INHERITED(info.fWidth, info.fHeight)
|
| {
|
| - fBitmap.setConfig(info, rowBytes);
|
| + fBitmap.setInfo(info, rowBytes);
|
| fBitmap.setPixelRef(pr);
|
| fBitmap.lockPixels();
|
| }
|
|
|