Remove SkFloatToScalar.
Now that SkScalar is always float (it may someday be double, but
float to double is trivial), remove callers of SkFloatToScalar,
which is deprecated in Skia.
BUG:13694396
Change-Id: I524a9bb6f7702bc810bac55fb9d2cd5361a01cf7
diff --git a/core/jni/android/graphics/MaskFilter.cpp b/core/jni/android/graphics/MaskFilter.cpp
index 7dc0446..2113330 100644
--- a/core/jni/android/graphics/MaskFilter.cpp
+++ b/core/jni/android/graphics/MaskFilter.cpp
@@ -20,7 +20,7 @@
}
static jlong createBlur(JNIEnv* env, jobject, jfloat radius, jint blurStyle) {
- SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkFloatToScalar(radius));
+ SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(radius);
SkMaskFilter* filter = SkBlurMaskFilter::Create(
(SkBlurMaskFilter::BlurStyle)blurStyle, sigma);
ThrowIAE_IfNull(env, filter);
@@ -33,12 +33,12 @@
AutoJavaFloatArray autoDir(env, dirArray, 3);
float* values = autoDir.ptr();
for (int i = 0; i < 3; i++) {
- direction[i] = SkFloatToScalar(values[i]);
+ direction[i] = values[i];
}
- SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkFloatToScalar(radius));
+ SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(radius);
SkMaskFilter* filter = SkBlurMaskFilter::CreateEmboss(sigma,
- direction, SkFloatToScalar(ambient), SkFloatToScalar(specular));
+ direction, ambient, specular);
ThrowIAE_IfNull(env, filter);
return reinterpret_cast<jlong>(filter);
}