diff options
Diffstat (limited to 'src/image')
-rw-r--r-- | src/image/SkImagePriv.cpp | 2 | ||||
-rw-r--r-- | src/image/SkImagePriv.h | 3 | ||||
-rw-r--r-- | src/image/SkImage_Base.h | 1 | ||||
-rw-r--r-- | src/image/SkImage_Raster.cpp | 17 | ||||
-rw-r--r-- | src/image/SkSurface_Raster.cpp | 9 |
5 files changed, 19 insertions, 13 deletions
diff --git a/src/image/SkImagePriv.cpp b/src/image/SkImagePriv.cpp index af15a7599b..43cc44b2fa 100644 --- a/src/image/SkImagePriv.cpp +++ b/src/image/SkImagePriv.cpp @@ -74,7 +74,7 @@ SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) { SkImage* image = NULL; if (canSharePixelRef || bm.isImmutable()) { - image = SkNewImageFromPixelRef(bm.pixelRef()); + image = SkNewImageFromPixelRef(info, bm.pixelRef(), bm.rowBytes()); } else { bm.lockPixels(); if (bm.getPixels()) { diff --git a/src/image/SkImagePriv.h b/src/image/SkImagePriv.h index 2812a8f72d..7c19c734c2 100644 --- a/src/image/SkImagePriv.h +++ b/src/image/SkImagePriv.h @@ -18,7 +18,8 @@ extern SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType); extern bool SkBitmapConfigToColorType(SkBitmap::Config, SkColorType* ctOut); // Call this if you explicitly want to use/share this pixelRef in the image -extern SkImage* SkNewImageFromPixelRef(SkPixelRef*); +extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*, + size_t rowBytes); /** * Examines the bitmap to decide if it can share the existing pixelRef, or diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h index 5574f451fe..7bd1f7e6c9 100644 --- a/src/image/SkImage_Base.h +++ b/src/image/SkImage_Base.h @@ -13,7 +13,6 @@ class SkImage_Base : public SkImage { public: SkImage_Base(int width, int height) : INHERITED(width, height) {} - SkImage_Base(const SkImageInfo& info) : INHERITED(info.fWidth, info.fHeight) {} virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) = 0; virtual void onDrawRectToRect(SkCanvas*, const SkRect* src, diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp index b80fbb3a54..32d53fc52e 100644 --- a/src/image/SkImage_Raster.cpp +++ b/src/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) { diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index 7010b5fb2a..1b218eb446 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -85,12 +85,15 @@ SkSurface_Raster::SkSurface_Raster(const SkImageInfo& info, void* pixels, size_t } SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr) - : INHERITED(pr->info()) + : INHERITED(pr->info().fWidth, pr->info().fHeight) { - fBitmap.installPixelRef(pr); + const SkImageInfo& info = pr->info(); + + fBitmap.setConfig(info, info.minRowBytes()); + fBitmap.setPixelRef(pr); fWeOwnThePixels = true; - if (!pr->info().isOpaque()) { + if (!info.isOpaque()) { fBitmap.eraseColor(SK_ColorTRANSPARENT); } } |