diff options
| author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:17:58 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 20:17:58 +0000 |
| commit | 4dce5b5be3da04bb8651d7fe54e08dcc5bec22e5 (patch) | |
| tree | 2f4c5d9ac4c2cd3a3005dbfd393fb0cad765247b /image/SkImage_Raster.cpp | |
| parent | 7d4810d6a920a679bfbbe460643fb11e7272eaa0 (diff) | |
| download | src-4dce5b5be3da04bb8651d7fe54e08dcc5bec22e5.tar.gz | |
add SkBitmap::installPixelRef()
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/129423002
git-svn-id: http://skia.googlecode.com/svn/trunk/src@13055 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'image/SkImage_Raster.cpp')
| -rw-r--r-- | image/SkImage_Raster.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/image/SkImage_Raster.cpp b/image/SkImage_Raster.cpp index 32d53fc5..b80fbb3a 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(const SkImageInfo&, SkPixelRef*, size_t rowBytes); + SkImage_Raster(SkPixelRef*); SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); } @@ -84,18 +84,16 @@ 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.setPixelRef(ref); + fBitmap.installPixelRef(ref); fBitmap.setImmutable(); } -SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, size_t rowBytes) - : INHERITED(info.fWidth, info.fHeight) +SkImage_Raster::SkImage_Raster(SkPixelRef* pr) + : INHERITED(pr->info()) { - fBitmap.setConfig(info, rowBytes); - fBitmap.setPixelRef(pr); + fBitmap.installPixelRef(pr); } SkImage_Raster::~SkImage_Raster() {} @@ -155,9 +153,8 @@ SkImage* SkImage::NewRasterData(const SkImageInfo& info, SkData* pixelData, size return SkNEW_ARGS(SkImage_Raster, (info, data, rowBytes)); } -SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr, - size_t rowBytes) { - return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes)); +SkImage* SkNewImageFromPixelRef(SkPixelRef* pr) { + return SkNEW_ARGS(SkImage_Raster, (pr)); } SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) { |