diff options
| -rw-r--r-- | bench/PicturePlaybackBench.cpp | 2 | ||||
| -rw-r--r-- | gm/gradients.cpp | 4 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/bench/PicturePlaybackBench.cpp b/bench/PicturePlaybackBench.cpp index ebb542489e..7cdbccfdca 100644 --- a/bench/PicturePlaybackBench.cpp +++ b/bench/PicturePlaybackBench.cpp @@ -119,7 +119,7 @@ protected: if (fDrawPosH) pos[i].set(x + advX, y); else - pos[i].set(x + advX, y + SkIntToScalar(i)); + pos[i].set(x + advX, y + i); advX += adv[i]; } 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); diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index eff47bf8b0..b9fa429f70 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -85,6 +85,14 @@ }, }, }, + 'conditions' : [ + ['skia_arch_width == 64', { + 'msvs_configuration_platform': 'x64' + }], + ['skia_arch_width == 32', { + 'msvs_configuration_platform': 'Win32', + }], + ], }, ], |