diff --git a/gfx/matrix_skia.h b/gfx/matrix_skia.h index 1d9cb6b1c..2a25527f1 100644 --- a/gfx/matrix_skia.h +++ b/gfx/matrix_skia.h @@ -101,7 +101,8 @@ namespace gfx { RectF mapRect(const RectF& src) const { SkRect dst; - m_skMatrix.mapRect(&dst, SkRect::MakeXYWH(src.x, src.y, src.w, src.h)); + m_skMatrix.mapRect(&dst, SkRect::MakeXYWH(SkScalar(src.x), SkScalar(src.y), + SkScalar(src.w), SkScalar(src.h))); return RectF(dst.x(), dst.y(), dst.width(), dst.height()); } diff --git a/os/skia/skia_helpers.h b/os/skia/skia_helpers.h index 2ebb64a29..2b10567b5 100644 --- a/os/skia/skia_helpers.h +++ b/os/skia/skia_helpers.h @@ -29,13 +29,13 @@ inline SkIRect to_skia(const gfx::Rect& rc) { } inline SkRect to_skia(const gfx::RectF& rc) { - return SkRect::MakeXYWH(rc.x, rc.y, rc.w, rc.h); + return SkRect::MakeXYWH(SkScalar(rc.x), SkScalar(rc.y), SkScalar(rc.w), SkScalar(rc.h)); } inline SkRect to_skia_fix(const gfx::RectF& rc) { - return SkRect::MakeXYWH(rc.x, rc.y, - std::max(0.0, rc.w-1), - std::max(0.0, rc.h-1)); + return SkRect::MakeXYWH(SkScalar(rc.x), SkScalar(rc.y), + SkScalar(std::max(0.0, rc.w-1)), + SkScalar(std::max(0.0, rc.h-1))); } inline void to_skia(const Paint& paint, SkPaint& skPaint) { diff --git a/os/surface.h b/os/surface.h index 4217e8334..c038e6882 100644 --- a/os/surface.h +++ b/os/surface.h @@ -116,7 +116,7 @@ namespace os { void drawCircle(const gfx::PointF& center, float radius, const os::Paint& paint) { - drawCircle(center.x, center.y, radius, paint); + drawCircle(float(center.x), float(center.y), radius, paint); } void drawCircle(const gfx::Point& center,