diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-20 18:58:26 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-20 18:58:26 +0000 |
| commit | b7961193a3ecca44cf2650d9e446ebaa10b1583d (patch) | |
| tree | 5fe861e6fc1a29bb8341c3f3fbab3ced07a8cb94 /gm | |
| parent | b73e0f9b693b5c8c9440a493463f91dd8dd0dcc9 (diff) | |
Enable 64-bit builds on Windows
Encountered compile errors passing 64-bit size_t to
SkIntToScalar and needed to make adjustments to
gm/gradients.cpp and bench/PicturePlaybackBench.cpp.
Verified on my local Linux, Mac, and Windows machines.
As of this change, the skia_arch_width gyp define
actually forces a 32/64-bit build on Linux, Mac, and
Windows.
Review URL: https://codereview.appspot.com/6460112
git-svn-id: http://skia.googlecode.com/svn/trunk@5195 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/gradients.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 775c796be7..8e8bb13ee9 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -169,9 +169,9 @@ protected: // apply an increasing y perspective as we move to the right SkMatrix perspective; perspective.setIdentity(); - perspective.setPerspY(SkScalarDiv(SkIntToScalar(i+1), + perspective.setPerspY(SkScalarDiv(SkIntToScalar((unsigned) i+1), SkIntToScalar(500))); - perspective.setSkewX(SkScalarDiv(SkIntToScalar(i+1), + perspective.setSkewX(SkScalarDiv(SkIntToScalar((unsigned) i+1), SkIntToScalar(10))); shader->setLocalMatrix(perspective); |