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
diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp
index a1faf94..88863e6 100644
--- a/gm/blurrect.cpp
+++ b/gm/blurrect.cpp
@@ -164,11 +164,11 @@
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 e313352..19adf26 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"