Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c9fef5a authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Make reference to data within SkAutoTUnref unambiguous. 

Change-Id: I9a9754f1c7d759ae0393d672474050a63846566b
parent d52e4a28

core/jni/android/graphics/FontFamily.cpp

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static jboolean FontFamily_addFontWeightStyle(JNIEnv* env, jobject clazz, jlong 
    jobject fontRef = MakeGlobalRefOrDie(env, font);

    SkAutoTUnref<SkData> data(SkData::NewWithProc(fontPtr, fontSize,

            release_global_ref, reinterpret_cast<void*>(fontRef)));

    std::unique_ptr<SkStreamAsset> fontData(new SkMemoryStream(data));

    std::unique_ptr<SkStreamAsset> fontData(new SkMemoryStream(data.get()));



    SkFontMgr::FontParameters params;

    params.setCollectionIndex(ttcIndex);
@@ -192,7 +192,7 @@ static jboolean FontFamily_addFontFromAsset(JNIEnv* env, jobject, jlong familyPt 
    }



    SkAutoTUnref<SkData> data(SkData::NewWithProc(buf, asset->getLength(), releaseAsset, asset));

    SkMemoryStream* stream = new SkMemoryStream(data);

    SkMemoryStream* stream = new SkMemoryStream(data.get());

    // CreateFromStream takes ownership of stream.

    SkTypeface* face = SkTypeface::CreateFromStream(stream);

    if (face == NULL) {