diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
| commit | 4c8e526b99cb717e9086dec87a94b56fecad8984 (patch) | |
| tree | 45294c593721be9bc8def1563b07438554dfa08b /indra/llkdu | |
| parent | d3387faca57c560279a6b8b83711a789b84f0ecd (diff) | |
| parent | a0a61ff61e6cf38ccbd0d0a9eecb10d532feaf55 (diff) | |
merge changes for callum fixes and workarounds
Diffstat (limited to 'indra/llkdu')
| -rwxr-xr-x | indra/llkdu/llimagej2ckdu.h | 10 | ||||
| -rwxr-xr-x | indra/llkdu/llkdumem.h | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index fb1f6535ba..762476ce69 100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -36,7 +36,17 @@ #include "kdu_elementary.h" #include "kdu_messaging.h" #include "kdu_params.h" + +// don't *really* want to rebuild KDU so turn off specific warnings for this header +#if LL_DARWIN +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-private-field" +#include "kdu_compressed.h" +#pragma clang diagnostic pop +#elif #include "kdu_compressed.h" +#endif + #include "kdu_sample_processing.h" class LLKDUDecodeState; diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index dbdf88b2d9..a0d304868e 100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -29,7 +29,17 @@ // Support classes for reading and writing from memory buffers in KDU #define KDU_NO_THREADS +// don't *really* want to rebuild KDU so turn off specific warnings for this header +#if LL_DARWIN +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wself-assign-field" +#pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_image.h" +#pragma clang diagnostic pop +#elif +#include "kdu_image.h" +#endif + #include "kdu_elementary.h" #include "kdu_messaging.h" #include "kdu_params.h" |