diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-07-27 21:47:26 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-07-27 21:47:26 +0200 |
| commit | 2da4caba7871455c097c0ed940dd6f2332dbda5d (patch) | |
| tree | f87883d0fcfe4c19ae5f7490306d49cc4f5d02b3 /src/lib/colour_conversion.cc | |
| parent | 94aadbd62c259a73d7511522dd167d519c68c5f9 (diff) | |
| parent | 5d440e1133fc68dfffeaf53cf934b996dae811c7 (diff) | |
Merge branch 'warnings' into v2.15.x.
Clean up our handling of compiler warnings in a variety of ways,
and use #pragma rather than -Wno to only disable warnings where
necessary.
Diffstat (limited to 'src/lib/colour_conversion.cc')
| -rw-r--r-- | src/lib/colour_conversion.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 2e052060e..22404c279 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -22,6 +22,7 @@ #include "colour_conversion.h" #include "util.h" #include "digester.h" +#include "warnings.h" #include <dcp/raw_convert.h> #include <dcp/chromaticity.h> #include <dcp/gamma_transfer_function.h> @@ -29,7 +30,9 @@ #include <dcp/identity_transfer_function.h> #include <dcp/s_gamut3_transfer_function.h> #include <libcxml/cxml.h> +DCPOMATIC_DISABLE_WARNINGS #include <libxml++/libxml++.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/foreach.hpp> #include <iostream> |