Disable warnings from magick.

diff --git a/src/lib/warnings.h b/src/lib/warnings.h
index e225c03397fcca15155f53e8842a1c468a55385e..bfb666e1b5f2fa191a92a86fbadc2ce103f4a1e3 100644 (file)
--- a/src/lib/warnings.h
+++ b/src/lib/warnings.h
@@ -20,7 +20,8 @@
 
 #define DCPOMATIC_DISABLE_WARNINGS \
   _Pragma("GCC diagnostic push") \
-  _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+  _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
+  _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"")
 
 #define DCPOMATIC_ENABLE_WARNINGS \
   _Pragma("GCC diagnostic pop")

diff --git a/test/test.h b/test/test.h
index 77108af46b586f267dc53db0830f671039148a09..b620a68a0802195982b02ddf365a22563cb2e8ce 100644 (file)
--- a/test/test.h
+++ b/test/test.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <Magick++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <boost/shared_ptr.hpp>