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

Commit 2d66b6e3 authored by Jerome Gaillard's avatar Jerome Gaillard Committed by Automerger Merge Worker
Browse files

Merge "Use JNI types for return types of JNI methods" into rvc-dev am: 77e1d068 am: f7695293 

Change-Id: I95b2e4ad24573af6933113c9369d275ae4f03299
parents 6db5b0d2 f7695293

libs/hwui/jni/android_graphics_Canvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static void restoreUnclippedLayer(CRITICAL_JNI_PARAMS_COMMA jlong canvasHandle, 
    get_canvas(canvasHandle)->restoreUnclippedLayer(saveCount, *paint);

}



static bool restore(CRITICAL_JNI_PARAMS_COMMA jlong canvasHandle) {

static jboolean restore(CRITICAL_JNI_PARAMS_COMMA jlong canvasHandle) {

    Canvas* canvas = get_canvas(canvasHandle);

    if (canvas->getSaveCount() <= 1) {

        return false; // cannot restore anymore

libs/hwui/jni/android_graphics_drawable_VectorDrawable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void setAntiAlias(JNIEnv*, jobject, jlong treePtr, jboolean aa) { 
/**

 * Draw

 */

static int draw(JNIEnv* env, jobject, jlong treePtr, jlong canvasPtr,

static jint draw(JNIEnv* env, jobject, jlong treePtr, jlong canvasPtr,

        jlong colorFilterPtr, jobject jrect, jboolean needsMirroring, jboolean canReuseCache) {

    VectorDrawable::Tree* tree = reinterpret_cast<VectorDrawable::Tree*>(treePtr);

    Canvas* canvas = reinterpret_cast<Canvas*>(canvasPtr);

libs/hwui/jni/android_util_PathParser.cpp

+5 −5
Original line number Diff line number Diff line
@@ -39,18 +39,18 @@ static void parseStringForPath(JNIEnv* env, jobject, jlong skPathHandle, jstring 
    }

}



static long createEmptyPathData(JNIEnv*, jobject) {

static jlong createEmptyPathData(JNIEnv*, jobject) {

    PathData* pathData = new PathData();

    return reinterpret_cast<jlong>(pathData);

}



static long createPathData(JNIEnv*, jobject, jlong pathDataPtr) {

static jlong createPathData(JNIEnv*, jobject, jlong pathDataPtr) {

    PathData* pathData = reinterpret_cast<PathData*>(pathDataPtr);

    PathData* newPathData = new PathData(*pathData);

    return reinterpret_cast<jlong>(newPathData);

}



static long createPathDataFromStringPath(JNIEnv* env, jobject, jstring inputStr, jint strLength) {

static jlong createPathDataFromStringPath(JNIEnv* env, jobject, jstring inputStr, jint strLength) {

    const char* pathString = env->GetStringUTFChars(inputStr, NULL);

    PathData* pathData = new PathData();

    PathParser::ParseResult result;
@@ -65,7 +65,7 @@ static long createPathDataFromStringPath(JNIEnv* env, jobject, jstring inputStr, 
    }

}



static bool interpolatePathData(JNIEnv*, jobject, jlong outPathDataPtr, jlong fromPathDataPtr,

static jboolean interpolatePathData(JNIEnv*, jobject, jlong outPathDataPtr, jlong fromPathDataPtr,

        jlong toPathDataPtr, jfloat fraction) {

    PathData* outPathData = reinterpret_cast<PathData*>(outPathDataPtr);

    PathData* fromPathData = reinterpret_cast<PathData*>(fromPathDataPtr);
@@ -79,7 +79,7 @@ static void deletePathData(JNIEnv*, jobject, jlong pathDataHandle) { 
    delete pathData;

}



static bool canMorphPathData(JNIEnv*, jobject, jlong fromPathDataPtr, jlong toPathDataPtr) {

static jboolean canMorphPathData(JNIEnv*, jobject, jlong fromPathDataPtr, jlong toPathDataPtr) {

    PathData* fromPathData = reinterpret_cast<PathData*>(fromPathDataPtr);

    PathData* toPathData = reinterpret_cast<PathData*>(toPathDataPtr);

    return VectorDrawableUtils::canMorph(*fromPathData, *toPathData);