diff options
| author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-11 21:22:39 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-11 21:22:39 +0000 |
| commit | a040d0e00417f765cd9d25b9c70694e4b818d77c (patch) | |
| tree | 30a293e4715323cbfc79a42f2e1474955d81e1d6 /image/SkImage_Raster.cpp | |
| parent | fa1a20a258c88c85d66999774675fb14a4cfb1f3 (diff) | |
| download | src-a040d0e00417f765cd9d25b9c70694e4b818d77c.tar.gz | |
Revert "remvoe duplicate impl for SkImageInfo flattening"
Reason: breaks chrome_mac_tests which still have non-imageinfo constructors
This reverts commit a06b8cf60b39bda93e9ef1a73579007b2b930d29.
BUG=
Review URL: https://codereview.chromium.org/103033005
git-svn-id: http://skia.googlecode.com/svn/trunk/src@12631 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'image/SkImage_Raster.cpp')
| -rw-r--r-- | image/SkImage_Raster.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/image/SkImage_Raster.cpp b/image/SkImage_Raster.cpp index 93de5ea3..a872ae36 100644 --- a/image/SkImage_Raster.cpp +++ b/image/SkImage_Raster.cpp @@ -84,8 +84,10 @@ SkImage* SkImage_Raster::NewEmpty() { SkImage_Raster::SkImage_Raster(const Info& info, SkData* data, size_t rowBytes) : INHERITED(info.fWidth, info.fHeight) { - fBitmap.setConfig(info, rowBytes); - fBitmap.setPixelRef(SkNEW_ARGS(SkDataPixelRef, (info, data, rowBytes)))->unref(); + SkBitmap::Config config = SkImageInfoToBitmapConfig(info); + + fBitmap.setConfig(config, info.fWidth, info.fHeight, rowBytes, info.fAlphaType); + fBitmap.setPixelRef(SkNEW_ARGS(SkDataPixelRef, (data)))->unref(); fBitmap.setImmutable(); } |