36bef0bf30
This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
52 lines
2.0 KiB
Java
52 lines
2.0 KiB
Java
/*
|
|
* Copyright (C) 2007 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package android.graphics;
|
|
|
|
public class PathDashPathEffect extends PathEffect {
|
|
|
|
public enum Style {
|
|
TRANSLATE(0), //!< translate the shape to each position
|
|
ROTATE(1), //!< rotate the shape about its center
|
|
MORPH(2); //!< transform each point, and turn lines into curves
|
|
|
|
Style(int value) {
|
|
native_style = value;
|
|
}
|
|
int native_style;
|
|
}
|
|
|
|
/**
|
|
* Dash the drawn path by stamping it with the specified shape. This only
|
|
* applies to drawings when the paint's style is STROKE or STROKE_AND_FILL.
|
|
* If the paint's style is FILL, then this effect is ignored. The paint's
|
|
* strokeWidth does not affect the results.
|
|
* @param shape The path to stamp along
|
|
* @param advance spacing between each stamp of shape
|
|
* @param phase amount to offset before the first shape is stamped
|
|
* @param style how to transform the shape at each position as it is stamped
|
|
*/
|
|
public PathDashPathEffect(Path shape, float advance, float phase,
|
|
Style style) {
|
|
native_instance = nativeCreate(shape.ni(), advance, phase,
|
|
style.native_style);
|
|
}
|
|
|
|
private static native long nativeCreate(long native_path, float advance,
|
|
float phase, int native_style);
|
|
}
|
|
|