commit 261b8e2ca1cf22303ad95267f0bdc6e87e1bbe70
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 14 17:53:24 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 14 17:53:24 2011 +0000
tree 4790daae42b569ae19627a12a5d7ef8473e58f20
parent 9ccdb95319e36dd58629117d9a5ea3c8581f7759

fix warnings

git-svn-id: http://skia.googlecode.com/svn/trunk@1129 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SampleText.cpp

diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index b1bb6cb..c1090ee 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -134,12 +134,12 @@
                 SkASSERT(m > mm);
             }
         }
-        nn = n;
+        nn = SkIntToScalar(n);
         mm = m;
     }
 
-    nn = paint.breakText(text, length, width, &mm);
-    SkASSERT(nn == length);
+    int length2 = paint.breakText(text, length, width, &mm);
+    SkASSERT(length2 == length);
     SkASSERT(mm == width);
 }