diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:23:48 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:23:48 +0000 |
| commit | e6e3c45e3f2c2177a8e73aa9c0ecfd4e50763c1c (patch) | |
| tree | 4a0d76eb782939be5e403c3547d84e44cb5a7375 /image/SkImage_Raster.cpp | |
| parent | 4dce5b5be3da04bb8651d7fe54e08dcc5bec22e5 (diff) | |
| download | src-e6e3c45e3f2c2177a8e73aa9c0ecfd4e50763c1c.tar.gz | |
Revert of https://codereview.chromium.org/129423002/
Reason for revert: broke tests (compile)
R=scroggo@google.com, halcanary@google.com
TBR=halcanary@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=
Author: reed@google.com
Review URL: https://codereview.chromium.org/137133003
git-svn-id: http://skia.googlecode.com/svn/trunk/src@13056 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'image/SkImage_Raster.cpp')
| -rw-r--r-- | image/SkImage_Raster.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/image/SkImage_Raster.cpp b/image/SkImage_Raster.cpp index b80fbb3a..32d53fc5 100644 --- a/image/SkImage_Raster.cpp +++ b/image/SkImage_Raster.cpp @@ -58,7 +58,7 @@ public: virtual bool getROPixels(SkBitmap*) const SK_OVERRIDE; // exposed for SkSurface_Raster via SkNewImageFromPixelRef - SkImage_Raster(SkPixelRef*); + SkImage_Raster(const SkImageInfo&, SkPixelRef*, size_t rowBytes); SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); } @@ -84,16 +84,18 @@ 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); SkAutoTUnref<SkPixelRef> ref( SkMallocPixelRef::NewWithData(info, rowBytes, NULL, data, 0)); - fBitmap.installPixelRef(ref); + fBitmap.setPixelRef(ref); fBitmap.setImmutable(); } -SkImage_Raster::SkImage_Raster(SkPixelRef* pr) - : INHERITED(pr->info()) +SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, size_t rowBytes) + : INHERITED(info.fWidth, info.fHeight) { - fBitmap.installPixelRef(pr); + fBitmap.setConfig(info, rowBytes); + fBitmap.setPixelRef(pr); } SkImage_Raster::~SkImage_Raster() {} @@ -153,8 +155,9 @@ SkImage* SkImage::NewRasterData(const SkImageInfo& info, SkData* pixelData, size return SkNEW_ARGS(SkImage_Raster, (info, data, rowBytes)); } -SkImage* SkNewImageFromPixelRef(SkPixelRef* pr) { - return SkNEW_ARGS(SkImage_Raster, (pr)); +SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr, + size_t rowBytes) { + return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes)); } SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) { |