From 1337a7b14c84d2d0bbc077bd0ac521eff05045b9 Mon Sep 17 00:00:00 2001 From: "reed@android.com" Date: Mon, 16 Mar 2009 13:56:10 +0000 Subject: see prev. checkin (missed these files). Change ownership rule for streams to the skia std. of receiver calls ref() if it needs to, but regardless, the caller always manages/balances its own ownership. git-svn-id: http://skia.googlecode.com/svn/trunk@121 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/images/SkImageRef.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/images/SkImageRef.cpp b/src/images/SkImageRef.cpp index 90c37b65e1..8b14375582 100644 --- a/src/images/SkImageRef.cpp +++ b/src/images/SkImageRef.cpp @@ -15,8 +15,7 @@ SkImageRef::SkImageRef(SkStream* stream, SkBitmap::Config config, int sampleSize) : SkPixelRef(&gImageRefMutex), fErrorInDecoding(false) { SkASSERT(stream); - SkASSERT(1 == stream->getRefCnt()); - + stream->ref(); fStream = stream; fConfig = config; fSampleSize = sampleSize; @@ -36,7 +35,7 @@ SkImageRef::~SkImageRef() { this, fConfig, (int)fStream->getLength()); #endif - delete fStream; + fStream->unref(); } bool SkImageRef::getInfo(SkBitmap* bitmap) { -- cgit v1.2.3