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/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp
index 2883be9..e4c74b2 100644
--- a/core/jni/android/graphics/Graphics.cpp
+++ b/core/jni/android/graphics/Graphics.cpp
@@ -228,10 +228,10 @@
{
SkASSERT(env->IsInstanceOf(obj, gRectF_class));
- r->set(SkFloatToScalar(env->GetFloatField(obj, gRectF_leftFieldID)),
- SkFloatToScalar(env->GetFloatField(obj, gRectF_topFieldID)),
- SkFloatToScalar(env->GetFloatField(obj, gRectF_rightFieldID)),
- SkFloatToScalar(env->GetFloatField(obj, gRectF_bottomFieldID)));
+ r->set(env->GetFloatField(obj, gRectF_leftFieldID),
+ env->GetFloatField(obj, gRectF_topFieldID),
+ env->GetFloatField(obj, gRectF_rightFieldID),
+ env->GetFloatField(obj, gRectF_bottomFieldID));
return r;
}
@@ -277,8 +277,8 @@
{
SkASSERT(env->IsInstanceOf(obj, gPointF_class));
- point->set(SkFloatToScalar(env->GetIntField(obj, gPointF_xFieldID)),
- SkFloatToScalar(env->GetIntField(obj, gPointF_yFieldID)));
+ point->set(env->GetIntField(obj, gPointF_xFieldID),
+ env->GetIntField(obj, gPointF_yFieldID));
return point;
}