From 3cf42826c87e4d7f0d182b1019609517fb26da3c Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Thu, 12 Dec 2019 11:59:49 -0500 Subject: [PATCH] use real std::make_unique Test: make Change-Id: I0e6e20deee05e91e53fbb9f0f245f319a8b33c9f --- core/jni/android/graphics/BitmapFactory.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index 3f05c3b57c699..fa64fd10d6dbc 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -7,7 +7,6 @@ #include "SkAndroidCodec.h" #include "SkBRDAllocator.h" #include "SkFrontBufferedStream.h" -#include "SkMakeUnique.h" #include "SkMath.h" #include "SkPixelRef.h" #include "SkStream.h" @@ -586,7 +585,7 @@ static jobject nativeDecodeAsset(JNIEnv* env, jobject clazz, jlong native_asset, Asset* asset = reinterpret_cast(native_asset); // since we know we'll be done with the asset when we return, we can // just use a simple wrapper - return doDecode(env, skstd::make_unique(asset), padding, options, + return doDecode(env, std::make_unique(asset), padding, options, inBitmapHandle, colorSpaceHandle); } @@ -594,7 +593,7 @@ static jobject nativeDecodeByteArray(JNIEnv* env, jobject, jbyteArray byteArray, jint offset, jint length, jobject options, jlong inBitmapHandle, jlong colorSpaceHandle) { AutoJavaByteArray ar(env, byteArray); - return doDecode(env, skstd::make_unique(ar.ptr() + offset, length, false), + return doDecode(env, std::make_unique(ar.ptr() + offset, length, false), nullptr, options, inBitmapHandle, colorSpaceHandle); }