From 18ef37258d897928c68b89535a93b99d8a817d3c Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Thu, 19 Aug 2010 15:10:54 -0700 Subject: [PATCH] DO NOT MERGE. Fix the build. Change-Id: I3322faa948af015f7d8df31b9a4c281f5311f067 --- core/jni/android/graphics/BitmapFactory.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index f572477ce9794..254d9a4f8bde2 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -465,7 +465,8 @@ static jobject nativeDecodeAsset(JNIEnv* env, jobject clazz, jobject options) { // BitmapFactory$Options SkStream* stream; Asset* asset = reinterpret_cast(native_asset); - if (optionsPurgeable(env, options)) { + bool forcePurgeable = optionsPurgeable(env, options); + if (forcePurgeable) { // if we could "ref/reopen" the asset, we may not need to copy it here // and we could assume optionsShareable, since assets are always RO stream = copyAssetToStream(asset);