aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--gyp/codec.gyp5
-rw-r--r--src/codec/SkJpegCodec.cpp5
-rw-r--r--src/codec/SkPngCodec.cpp5
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
///////////////////////////////////////////////////////////////////////////////