| Index: src/utils/debugger/SkDebugCanvas.cpp
|
| diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
|
| index f87a06aa949d9950719b7e609d90ac85c29d23fb..c6fcb07b8c46ba5106d14ec38588f030fd127dca 100644
|
| --- a/src/utils/debugger/SkDebugCanvas.cpp
|
| +++ b/src/utils/debugger/SkDebugCanvas.cpp
|
| @@ -14,17 +14,6 @@
|
| #include "SkDevice.h"
|
| #include "SkXfermode.h"
|
|
|
| -#ifdef SK_BUILD_FOR_WIN
|
| - // iostream includes xlocale which generates warning 4530 because we're compiling without
|
| - // exceptions
|
| - #pragma warning(push)
|
| - #pragma warning(disable : 4530)
|
| -#endif
|
| -#include <iostream>
|
| -#ifdef SK_BUILD_FOR_WIN
|
| - #pragma warning(pop)
|
| -#endif
|
| -
|
| static SkBitmap make_noconfig_bm(int width, int height) {
|
| SkBitmap bm;
|
| bm.setConfig(SkBitmap::kNo_Config, width, height);
|
|
|