diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | core/jni/android/graphics/MaskFilter.cpp | 13 | ||||
| -rw-r--r-- | core/jni/android/graphics/Shader.cpp | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index cf69d9e..a09c314 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -164,6 +164,7 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/include \ $(TOP)/system/media/camera/include \ external/skia/src/core \ + external/skia/src/effects \ external/skia/src/images \ external/sqlite/dist \ external/sqlite/android \ diff --git a/core/jni/android/graphics/MaskFilter.cpp b/core/jni/android/graphics/MaskFilter.cpp index f331af7..756bb6b 100644 --- a/core/jni/android/graphics/MaskFilter.cpp +++ b/core/jni/android/graphics/MaskFilter.cpp @@ -1,5 +1,6 @@ #include "GraphicsJNI.h" #include "SkMaskFilter.h" +#include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkTableMaskFilter.h" @@ -19,8 +20,9 @@ public: } static jlong createBlur(JNIEnv* env, jobject, jfloat radius, jint blurStyle) { - SkMaskFilter* filter = SkBlurMaskFilter::Create(SkFloatToScalar(radius), - (SkBlurMaskFilter::BlurStyle)blurStyle); + SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkFloatToScalar(radius)); + SkMaskFilter* filter = SkBlurMaskFilter::Create(sigma, + (SkBlurMaskFilter::BlurStyle)blurStyle); ThrowIAE_IfNull(env, filter); return reinterpret_cast<jlong>(filter); } @@ -34,10 +36,9 @@ public: direction[i] = SkFloatToScalar(values[i]); } - SkMaskFilter* filter = SkBlurMaskFilter::CreateEmboss(direction, - SkFloatToScalar(ambient), - SkFloatToScalar(specular), - SkFloatToScalar(radius)); + SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkFloatToScalar(radius)); + SkMaskFilter* filter = SkBlurMaskFilter::CreateEmboss(sigma, + direction, SkFloatToScalar(ambient), SkFloatToScalar(specular)); ThrowIAE_IfNull(env, filter); return reinterpret_cast<jlong>(filter); } diff --git a/core/jni/android/graphics/Shader.cpp b/core/jni/android/graphics/Shader.cpp index 3047440..1fe6358 100644 --- a/core/jni/android/graphics/Shader.cpp +++ b/core/jni/android/graphics/Shader.cpp @@ -520,7 +520,7 @@ static jlong ComposeShader_postCreate1(JNIEnv* env, jobject o, jlong shaderHandl SkiaShader* shaderB = reinterpret_cast<SkiaShader *>(shaderBHandle); SkXfermode* mode = reinterpret_cast<SkXfermode *>(modeHandle); SkXfermode::Mode skiaMode; - if (!SkXfermode::IsMode(mode, &skiaMode)) { + if (!SkXfermode::AsMode(mode, &skiaMode)) { // TODO: Support other modes skiaMode = SkXfermode::kSrcOver_Mode; } |