Merge "Eliminate uses of Skia's SkDELETE macro" (9b9da704) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/BitmapRegionDecoder.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,7 @@ public:
	fHeight = height;		fHeight = height;
	}		}
	~SkBitmapRegionDecoder() {		~SkBitmapRegionDecoder() {
	SkDELETE(fDecoder);		delete fDecoder;
	}		}

	bool decodeRegion(SkBitmap* bitmap, const SkIRect& rect,		bool decodeRegion(SkBitmap* bitmap, const SkIRect& rect,
	@@ -72,7 +72,7 @@ static jobject createBitmapRegionDecoder(JNIEnv* env, SkStreamRewindable* stream
	SkImageDecoder* decoder = SkImageDecoder::Factory(stream);		SkImageDecoder* decoder = SkImageDecoder::Factory(stream);
	int width, height;		int width, height;
	if (NULL == decoder) {		if (NULL == decoder) {
	SkDELETE(stream);		delete stream;
	doThrowIOE(env, "Image format not supported");		doThrowIOE(env, "Image format not supported");
	return nullObjectReturn("SkImageDecoder::Factory returned null");		return nullObjectReturn("SkImageDecoder::Factory returned null");
	}		}
	@@ -87,7 +87,7 @@ static jobject createBitmapRegionDecoder(JNIEnv* env, SkStreamRewindable* stream
	snprintf(msg, sizeof(msg), "Image failed to decode using %s decoder",		snprintf(msg, sizeof(msg), "Image failed to decode using %s decoder",
	decoder->getFormatName());		decoder->getFormatName());
	doThrowIOE(env, msg);		doThrowIOE(env, msg);
	SkDELETE(decoder);		delete decoder;
	return nullObjectReturn("decoder->buildTileIndex returned false");		return nullObjectReturn("decoder->buildTileIndex returned false");
	}		}