diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-08 20:31:53 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-08 20:31:53 +0000 |
| commit | 50c79d886bf435d3a9cad056885370e2c3f526ad (patch) | |
| tree | 628f039081e19dc3d447cb8d33d0e94122732c3c /gm | |
| parent | 15655b241bfe1d77032e88115f119684722c10e0 (diff) | |
Enable warnings-as-errors on Windows.
Review URL: https://codereview.appspot.com/7066054
git-svn-id: http://skia.googlecode.com/svn/trunk@7094 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/blurrect.cpp | 4 | ||||
| -rw-r--r-- | gm/gmmain.cpp | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp index a1faf9480f..88863e604c 100644 --- a/gm/blurrect.cpp +++ b/gm/blurrect.cpp @@ -164,11 +164,11 @@ protected: virtual void onDraw(SkCanvas* canvas) { SkRect r; - r.setWH( fRectWidth, fRectHeight ); + r.setWH(SkIntToScalar(fRectWidth), SkIntToScalar(fRectHeight)); SkMask mask; - makeMask( &mask, r ); + makeMask(&mask, r); SkBitmap bm; bm.setConfig(SkBitmap::kA8_Config, mask.fBounds.width(), mask.fBounds.height()); diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index e313352c4d..19adf2658d 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -33,7 +33,16 @@ #include "SkTileGridPicture.h" #include "SamplePipeControllers.h" +#ifdef SK_BUILD_FOR_WIN + // json includes xlocale which generates warning 4530 because we're compiling without + // exceptions + #pragma warning(push) + #pragma warning(disable : 4530) +#endif #include "json/value.h" +#ifdef SK_BUILD_FOR_WIN + #pragma warning(pop) +#endif #if SK_SUPPORT_GPU #include "GrContextFactory.h" |