X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.cc;fp=src%2Flib%2Fimage_proxy.cc;h=c74e846c99680b1e0e3f4ab0319ad17c109f1c9a;hp=47ac5d3728eee1bc249d680d8b0aa94706d190fb;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hpb=884093edac5f63d26c02d411c73dfb52376ccf8f

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 47ac5d372..c74e846c9 100644
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -18,8 +18,8 @@
 */
 
 #include <Magick++.h>
-#include <libdcp/util.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/util.h>
+#include <dcp/raw_convert.h>
 #include "image_proxy.h"
 #include "image.h"
 #include "exceptions.h"
@@ -40,7 +40,7 @@ RawImageProxy::RawImageProxy (shared_ptr<Image> image)
 
 RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
 {
-	libdcp::Size size (
+	dcp::Size size (
 		xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
 		);
 
@@ -58,8 +58,8 @@ void
 RawImageProxy::add_metadata (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text (N_("Raw"));
-	node->add_child("Width")->add_child_text (libdcp::raw_convert<string> (_image->size().width));
-	node->add_child("Height")->add_child_text (libdcp::raw_convert<string> (_image->size().height));
+	node->add_child("Width")->add_child_text (dcp::raw_convert<string> (_image->size().width));
+	node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_image->size().height));
 }
 
 void
@@ -112,7 +112,7 @@ MagickImageProxy::image () const
 		throw DecodeError (_("Could not decode image file"));
 	}
 
-	libdcp::Size size (magick_image->columns(), magick_image->rows());
+	dcp::Size size (magick_image->columns(), magick_image->rows());
 
 	_image.reset (new Image (PIX_FMT_RGB24, size, true));