Use libdcp's warnings.h

[dcpomatic.git] / src / lib / j2k_image_proxy.cc

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 67083e6550cb314b7e9a13f166ea1486ffb26bec..269b01bca7457c65dfe0377240bb4b7fbbdc7348 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -23,7 +23,6 @@
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "j2k_image_proxy.h"
-#include "warnings.h"
 #include <dcp/colour_conversion.h>
 #include <dcp/j2k_transcode.h>
 #include <dcp/mono_picture_frame.h>
@@ -31,10 +30,11 @@
 #include <dcp/raw_convert.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/stereo_picture_frame.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"