commit 7460b378d68217167013ca889a4cdcae742908e7
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Apr 25 16:54:51 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Apr 25 16:54:51 2012 +0000
tree 7d06cbc4554cf15078d7877c08bfc6c267d7a892
parent c1f66214460e88ea96cde2f94798aaad4d2f01a5

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

diff --git a/samplecode/SampleAnimBlur.cpp b/samplecode/SampleAnimBlur.cpp
index 7f077e6..cada0cd 100644
--- a/samplecode/SampleAnimBlur.cpp
+++ b/samplecode/SampleAnimBlur.cpp
@@ -45,7 +45,7 @@
         };
         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);

samplecode/SampleEffects.cpp

diff --git a/samplecode/SampleEffects.cpp b/samplecode/SampleEffects.cpp
index bf83bae..9aab94a 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 };
     

samplecode/SampleFontScalerTest.cpp

diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp
index 83f962e..e6321de 100644
--- a/samplecode/SampleFontScalerTest.cpp
+++ b/samplecode/SampleFontScalerTest.cpp
@@ -77,9 +77,12 @@
         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]);