diff options
Diffstat (limited to 'core/jni/android')
-rw-r--r-- | core/jni/android/graphics/Bitmap.cpp | 2 | ||||
-rw-r--r-- | core/jni/android/graphics/Path.cpp | 5 | ||||
-rw-r--r-- | core/jni/android/graphics/Region.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 65f44d5..29d8d3c 100644 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -5,7 +5,7 @@ #include "SkDither.h"
#include "SkUnPreMultiply.h"
-#include "Parcel.h"
+#include <binder/Parcel.h>
#include "android_util_Binder.h"
#include "android_nio_utils.h"
#include "CreateJavaOutputStreamAdaptor.h"
diff --git a/core/jni/android/graphics/Path.cpp b/core/jni/android/graphics/Path.cpp index effb1c8..11c608c 100644 --- a/core/jni/android/graphics/Path.cpp +++ b/core/jni/android/graphics/Path.cpp @@ -75,9 +75,8 @@ public: return result; } - static void computeBounds(JNIEnv* env, jobject clazz, SkPath* obj, jobject bounds, SkPath::BoundsType btype) { - SkRect bounds_; - obj->computeBounds(&bounds_, btype); + static void computeBounds(JNIEnv* env, jobject clazz, SkPath* obj, jobject bounds, int boundstype) { + const SkRect& bounds_ = obj->getBounds(); GraphicsJNI::rect_to_jrectf(bounds_, env, bounds); } diff --git a/core/jni/android/graphics/Region.cpp b/core/jni/android/graphics/Region.cpp index 1dc0314..723cd37 100644 --- a/core/jni/android/graphics/Region.cpp +++ b/core/jni/android/graphics/Region.cpp @@ -134,7 +134,7 @@ static void Region_scale(JNIEnv* env, jobject region, jfloat scale, jobject dst) //////////////////////////////////////////////////////////////////////////////////////////////////////////// -#include "Parcel.h" +#include <binder/Parcel.h> #include "android_util_Binder.h" static SkRegion* Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel) |