diff options
author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-06 20:01:46 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-06 20:01:46 +0000 |
commit | 09042b80d22837c760bb530124aaa67469b19b8f (patch) | |
tree | 1e4e2a5e1f31c6d4eb83d290f9dec0591d1058e8 /gm | |
parent | 419400bf6e475dfbaa424ef0155598a3422cfa67 (diff) |
Fixing Windows compiler complaints
http://codereview.appspot.com/5991056/
git-svn-id: http://skia.googlecode.com/svn/trunk@3626 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
-rw-r--r-- | gm/gm.h | 1 | ||||
-rw-r--r-- | gm/gmmain.cpp | 1 | ||||
-rw-r--r-- | gm/gradients.cpp | 6 |
3 files changed, 3 insertions, 5 deletions
@@ -12,7 +12,6 @@ #include "SkCanvas.h" #include "SkDevice.h" #include "SkPaint.h" -#include "SkRefCnt.h" #include "SkSize.h" #include "SkString.h" #include "SkTRegistry.h" diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index 76bd4914b1..def00948f9 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -29,7 +29,6 @@ #include "gl/SkDebugGLContext.h" #include "SkPicture.h" #include "SkStream.h" -#include "SkRefCnt.h" static bool gForceBWtext; diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 3eb5633c21..ad745df8c1 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -237,9 +237,9 @@ protected: center.set(SkIntToScalar(dim.width())/2, SkIntToScalar(dim.height())/2); SkScalar radius = SkIntToScalar(dim.width())/2; const SkColor colors[] = { 0x7f7f7f7f, 0x7f7f7f7f, 0xb2000000 }; - const SkScalar pos[] = { SkFloatToScalar(0.0), - SkFloatToScalar(0.35), - SkFloatToScalar(1.0) }; + const SkScalar pos[] = { SkFloatToScalar(0.0f), + SkFloatToScalar(0.35f), + SkFloatToScalar(1.0f) }; SkShader* shader = SkGradientShader::CreateRadial(center, radius, colors, pos, SK_ARRAY_COUNT(pos), |