diff options
| author |  mtklein <mtklein@chromium.org> | 2016-07-28 14:45:28 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-28 14:45:28 -0700 |
| commit | dc90b53350b9b21a856d2fb1574f9b41ded4f735 (patch) | |
| tree | bfa1f25b99945e43b3700857728db1104cab04b3 | |
| parent | 00450f1ae570a2efdbb93c88140b49c7ee84473b (diff) | |
Silence -Wclobbered in each file that needs it.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184823009
Committed: https://skia.googlesource.com/skia/+/03f704a343d7a82974f977eda8789a8c721c93e5
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Win-MSVC-GCE-CPU-AVX2-x86-Release-Trybot
Review-Url: https://codereview.chromium.org/2184823009
| -rw-r--r-- | gyp/codec.gyp | 5 | ||||
| -rw-r--r-- | src/codec/SkJpegCodec.cpp | 5 | ||||
| -rw-r--r-- | src/codec/SkPngCodec.cpp | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/gyp/codec.gyp b/gyp/codec.gyp index e2269f2a93..4b4029bdf3 100644 --- a/gyp/codec.gyp +++ b/gyp/codec.gyp @@ -22,11 +22,6 @@ 'libpng.gyp:libpng', 'libwebp.gyp:libwebp', ], - 'cflags':[ - # FIXME: This gets around a warning: "Argument might be clobbered by longjmp". - '-Wno-clobbered', - '-Wno-unknown-warning-option', - ], 'include_dirs': [ '../include/codec', '../include/private', diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp index f4116e324f..a81c759ff0 100644 --- a/src/codec/SkJpegCodec.cpp +++ b/src/codec/SkJpegCodec.cpp @@ -19,6 +19,11 @@ #include <stdio.h> #include "SkJpegUtility.h" +// This warning triggers false postives way too often in here. +#if defined(__GNUC__) && !defined(__clang__) + #pragma GCC diagnostic ignored "-Wclobbered" +#endif + extern "C" { #include "jerror.h" #include "jpeglib.h" diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp index ee72af58ad..b8916f9de7 100644 --- a/src/codec/SkPngCodec.cpp +++ b/src/codec/SkPngCodec.cpp @@ -20,6 +20,11 @@ #include "SkTemplates.h" #include "SkUtils.h" +// This warning triggers false postives way too often in here. +#if defined(__GNUC__) && !defined(__clang__) + #pragma GCC diagnostic ignored "-Wclobbered" +#endif + /////////////////////////////////////////////////////////////////////////////// // Callback functions /////////////////////////////////////////////////////////////////////////////// |