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
55 lines
1.8 KiB
Java
55 lines
1.8 KiB
Java
/*
|
|
* Copyright (C) 2006 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 RegionIterator {
|
|
|
|
/**
|
|
* Construct an iterator for all of the rectangles in a region. This
|
|
* effectively makes a private copy of the region, so any subsequent edits
|
|
* to region will not affect the iterator.
|
|
*
|
|
* @param region the region that will be iterated
|
|
*/
|
|
public RegionIterator(Region region) {
|
|
mNativeIter = nativeConstructor(region.ni());
|
|
}
|
|
|
|
/**
|
|
* Return the next rectangle in the region. If there are no more rectangles
|
|
* this returns false and r is unchanged. If there is at least one more,
|
|
* this returns true and r is set to that rectangle.
|
|
*/
|
|
public final boolean next(Rect r) {
|
|
if (r == null) {
|
|
throw new NullPointerException("The Rect must be provided");
|
|
}
|
|
return nativeNext(mNativeIter, r);
|
|
}
|
|
|
|
protected void finalize() throws Throwable {
|
|
nativeDestructor(mNativeIter);
|
|
}
|
|
|
|
private static native long nativeConstructor(long native_region);
|
|
private static native void nativeDestructor(long native_iter);
|
|
private static native boolean nativeNext(long native_iter, Rect r);
|
|
|
|
private final long mNativeIter;
|
|
}
|
|
|