X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.cc;h=6ab4d56f2e09776743d56354838a231c71eedfad;hb=769c71b5c3e050ccfc1c13771d24328fbf76a495;hp=d052b2a9a71dd3c458bc9126785a15af263e8e6c;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/src/lib/types.cc b/src/lib/types.cc
index d052b2a9a..6ab4d56f2 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -17,16 +17,15 @@
 
 */
 
+#include "types.h"
+#include "raw_convert.h"
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
-#include "types.h"
 
 using std::max;
 using std::min;
 using std::string;
 using boost::shared_ptr;
-using dcp::raw_convert;
 
 bool operator== (Crop const & a, Crop const & b)
 {
@@ -51,7 +50,7 @@ resolution_to_string (Resolution r)
 		return "4K";
 	}
 
-	assert (false);
+	DCPOMATIC_ASSERT (false);
 	return "";
 }
 
@@ -67,7 +66,7 @@ string_to_resolution (string s)
 		return RESOLUTION_4K;
 	}
 
-	assert (false);
+	DCPOMATIC_ASSERT (false);
 	return RESOLUTION_2K;
 }