From 7460b378d68217167013ca889a4cdcae742908e7 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 25 Apr 2012 16:54:51 +0000 Subject: Fixed minor Release & fixed point compiler warnings on Linux http://codereview.appspot.com/6118050/ git-svn-id: http://skia.googlecode.com/svn/trunk@3766 2bbb7eff-a529-9590-31e7-b0007b416f81 --- samplecode/SampleAnimBlur.cpp | 2 +- samplecode/SampleEffects.cpp | 9 +++++---- samplecode/SampleFontScalerTest.cpp | 9 ++++++--- 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'samplecode') diff --git a/samplecode/SampleAnimBlur.cpp b/samplecode/SampleAnimBlur.cpp index 7f077e63e7..cada0cda77 100644 --- a/samplecode/SampleAnimBlur.cpp +++ b/samplecode/SampleAnimBlur.cpp @@ -45,7 +45,7 @@ protected: }; SkRandom random; - for (int i = 0; i < SK_ARRAY_COUNT(gStyles); ++i) { + for (size_t i = 0; i < SK_ARRAY_COUNT(gStyles); ++i) { SkMaskFilter* mf = SkBlurMaskFilter::Create(blurRadius, gStyles[i], SkBlurMaskFilter::kHighQuality_BlurFlag); diff --git a/samplecode/SampleEffects.cpp b/samplecode/SampleEffects.cpp index bf83bae97e..9aab94af7e 100644 --- a/samplecode/SampleEffects.cpp +++ b/samplecode/SampleEffects.cpp @@ -19,10 +19,11 @@ static void test_edgeclipper() { SkPoint pts[] = { - { -8.38822452e+21f, -7.69721471e+19f }, - { 1.57645875e+23f, 1.44634003e+21f }, - { 1.61519691e+23f, 1.48208059e+21f }, - { 3.13963584e+23f, 2.88057438e+21f } + { SkFloatToScalar(-8.38822452e+21f), + SkFloatToScalar(-7.69721471e+19f) }, + { SkFloatToScalar(1.57645875e+23f), SkFloatToScalar(1.44634003e+21f) }, + { SkFloatToScalar(1.61519691e+23f), SkFloatToScalar(1.48208059e+21f) }, + { SkFloatToScalar(3.13963584e+23f), SkFloatToScalar(2.88057438e+21f) } }; SkRect clip = { 0, 0, 300, 200 }; diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp index 83f962ecac..e6321deb3c 100644 --- a/samplecode/SampleFontScalerTest.cpp +++ b/samplecode/SampleFontScalerTest.cpp @@ -77,9 +77,12 @@ protected: if (false) { SkPoint pts[4]; pts[0].set(1.61061274e+09f, 6291456); - pts[1].set(-7.18397061e+15f, -1.53091184e+13f); - pts[2].set(-1.30077315e+16f, -2.77196141e+13f); - pts[3].set(-1.30077315e+16f, -2.77196162e+13f); + pts[1].set(SkFloatToScalar(-7.18397061e+15f), + SkFloatToScalar(-1.53091184e+13f)); + pts[2].set(SkFloatToScalar(-1.30077315e+16f), + SkFloatToScalar(-2.77196141e+13f)); + pts[3].set(SkFloatToScalar(-1.30077315e+16f), + SkFloatToScalar(-2.77196162e+13f)); SkPath path; path.moveTo(pts[0]); -- cgit v1.2.3