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

Commit 6a8bf8e9 authored by Mike Reed's avatar Mike Reed
Browse files

use new SkPathFillType enum 

Test: make

Change-Id: I8f20b7da284483ea4f59e35d9c3d48202cba02d5
parent 426e4c1b

core/jni/android/graphics/Path.cpp

+2 −2
Original line number Diff line number Diff line
@@ -497,12 +497,12 @@ public: 


    static jint getFillType(CRITICAL_JNI_PARAMS_COMMA jlong objHandle) {

        SkPath* obj = reinterpret_cast<SkPath*>(objHandle);

        return obj->getFillType();

        return static_cast<int>(obj->getFillType());

    }



    static void setFillType(CRITICAL_JNI_PARAMS_COMMA jlong pathHandle, jint ftHandle) {;

        SkPath* path = reinterpret_cast<SkPath*>(pathHandle);

        SkPath::FillType ft = static_cast<SkPath::FillType>(ftHandle);

        SkPathFillType ft = static_cast<SkPathFillType>(ftHandle);

        path->setFillType(ft);

    }

};

libs/hwui/VectorDrawable.cpp

+1 −2
Original line number Diff line number Diff line
@@ -135,8 +135,7 @@ const SkPath& FullPath::getUpdatedPath(bool useStagingData, SkPath* tempStagingP 
    bool setFillPath = properties.getFillGradient() != nullptr ||

                       properties.getFillColor() != SK_ColorTRANSPARENT;

    if (setFillPath) {

        SkPath::FillType ft = static_cast<SkPath::FillType>(properties.getFillType());

        outPath->setFillType(ft);

        outPath->setFillType(static_cast<SkPathFillType>(properties.getFillType()));

    }

    return *outPath;

}