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

Commit ce36021d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove use of SkGainmapInfo::Type" into main

parents 63877fa3 340f8b10

libs/hwui/jni/Gainmap.cpp

+0 −3
Original line number Diff line number Diff line
@@ -208,8 +208,6 @@ static void Gainmap_writeToParcel(JNIEnv* env, jobject, jlong nativeObject, jobj 
    p.writeFloat(info.fDisplayRatioHdr);

    // base image type

    p.writeInt32(static_cast<int32_t>(info.fBaseImageType));

    // type

    p.writeInt32(static_cast<int32_t>(info.fType));

#else

    doThrowRE(env, "Cannot use parcels outside of Android!");

#endif
@@ -232,7 +230,6 @@ static void Gainmap_readFromParcel(JNIEnv* env, jobject, jlong nativeObject, job 
    info.fDisplayRatioSdr = p.readFloat();

    info.fDisplayRatioHdr = p.readFloat();

    info.fBaseImageType = static_cast<SkGainmapInfo::BaseImageType>(p.readInt32());

    info.fType = static_cast<SkGainmapInfo::Type>(p.readInt32());



    fromJava(nativeObject)->info = info;

#else