projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up careful_string_filter and add some extra transliterations.
[dcpomatic.git]
/
src
/
lib
/
types.cc
diff --git
a/src/lib/types.cc
b/src/lib/types.cc
index 228ebf28f6d47bc442e12d8b4f43540c66ae1189..e9b412ded06bf2709b03601fce9fda9e6bd23325 100644
(file)
--- a/
src/lib/types.cc
+++ b/
src/lib/types.cc
@@
-21,15
+21,15
@@
#include "types.h"
#include "compose.hpp"
#include "dcpomatic_assert.h"
#include "types.h"
#include "compose.hpp"
#include "dcpomatic_assert.h"
-#include "warnings.h"
-#include <dcp/raw_convert.h>
#include <dcp/cpl.h>
#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/dcp.h>
-#include <dcp/r
eel_file_asse
t.h>
+#include <dcp/r
aw_conver
t.h>
#include <dcp/reel_asset.h>
#include <dcp/reel_asset.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/reel_file_asset.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <libcxml/cxml.h>
#include "i18n.h"
#include <libcxml/cxml.h>
#include "i18n.h"