projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you cancel a paused...
[dcpomatic.git]
/
src
/
lib
/
types.cc
diff --git
a/src/lib/types.cc
b/src/lib/types.cc
index d052b2a9a71dd3c458bc9126785a15af263e8e6c..6ab4d56f2e09776743d56354838a231c71eedfad 100644
(file)
--- 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 <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 std::max;
using std::min;
using std::string;
using boost::shared_ptr;
-using dcp::raw_convert;
bool operator== (Crop const & a, Crop const & b)
{
bool operator== (Crop const & a, Crop const & b)
{
@@
-51,7
+50,7
@@
resolution_to_string (Resolution r)
return "4K";
}
return "4K";
}
-
assert
(false);
+
DCPOMATIC_ASSERT
(false);
return "";
}
return "";
}
@@
-67,7
+66,7
@@
string_to_resolution (string s)
return RESOLUTION_4K;
}
return RESOLUTION_4K;
}
-
assert
(false);
+
DCPOMATIC_ASSERT
(false);
return RESOLUTION_2K;
}
return RESOLUTION_2K;
}