Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "update dox that we ignore the exact parameter on computeBounds"

Browse Source
This commit is contained in:
Mike Reed
2010-03-25 11:04:02 -07:00
committed by Android (Google) Code Review
parent 2a5641454d 54900e8c05
commit cd06ff13c9
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android/graphics/Path.cpp
View File

@@ -75,7 +75,7 @@ public:
return result;
}
static void computeBounds(JNIEnv* env, jobject clazz, SkPath* obj, jobject bounds, int boundstype) {
static void computeBounds(JNIEnv* env, jobject clazz, SkPath* obj, jobject bounds) {
const SkRect& bounds_ = obj->getBounds();
GraphicsJNI::rect_to_jrectf(bounds_, env, bounds);
}
@@ -267,7 +267,7 @@ static JNINativeMethod methods[] = {
{"native_setFillType","(II)V", (void*) SkPathGlue::setFillType},
{"native_isEmpty","(I)Z", (void*) SkPathGlue::isEmpty},
{"native_isRect","(ILandroid/graphics/RectF;)Z", (void*) SkPathGlue::isRect},
{"native_computeBounds","(ILandroid/graphics/RectF;I)V", (void*) SkPathGlue::computeBounds},
{"native_computeBounds","(ILandroid/graphics/RectF;)V", (void*) SkPathGlue::computeBounds},
{"native_incReserve","(II)V", (void*) SkPathGlue::incReserve},
{"native_moveTo","(IFF)V", (void*) SkPathGlue::moveTo__FF},
{"native_rMoveTo","(IFF)V", (void*) SkPathGlue::rMoveTo},

16
graphics/java/android/graphics/Path.java
View File

@@ -153,16 +153,15 @@ public class Path {
}
/**
* Compute the bounds of the path, and write the answer into bounds. If the
* path contains 0 or 1 points, the bounds is set to (0,0,0,0)
* Compute the bounds of the control points of the path, and write the
* answer into bounds. If the path contains 0 or 1 points, the bounds is
* set to (0,0,0,0)
*
* @param bounds Returns the computed bounds of the path
* @param exact If true, return the exact (but slower) bounds, else return
* just the bounds of all control points
* @param bounds Returns the computed bounds of the path's control points.
* @param exact This parameter is no longer used.
*/
public void computeBounds(RectF bounds, boolean exact) {
// 1-exact, 0-fast correspond to the values in SkPath.h
native_computeBounds(mNativePath, bounds, exact ? 1 : 0);
native_computeBounds(mNativePath, bounds);
}
/**
@@ -552,8 +551,7 @@ public class Path {
private static native void native_setFillType(int nPath, int ft);
private static native boolean native_isEmpty(int nPath);
private static native boolean native_isRect(int nPath, RectF rect);
private static native void native_computeBounds(int nPath, RectF bounds,
int btype);
private static native void native_computeBounds(int nPath, RectF bounds);
private static native void native_incReserve(int nPath, int extraPtCount);
private static native void native_moveTo(int nPath, float x, float y);
private static native void native_rMoveTo(int nPath, float dx, float dy);