projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font_id_map errors when importing DCP subtitles that have no
[dcpomatic.git]
/
src
/
lib
/
raw_image_proxy.cc
diff --git
a/src/lib/raw_image_proxy.cc
b/src/lib/raw_image_proxy.cc
index fb0d16df8a5b6cc29cef87a5054d85ccdc8dec5e..9b486dd5cc669966f8e600c26c24579bbcb0f4bd 100644
(file)
--- a/
src/lib/raw_image_proxy.cc
+++ b/
src/lib/raw_image_proxy.cc
@@
-21,16
+21,16
@@
#include "raw_image_proxy.h"
#include "image.h"
#include "raw_image_proxy.h"
#include "image.h"
-#include "warnings.h"
#include <dcp/raw_convert.h>
#include <dcp/util.h>
#include <dcp/raw_convert.h>
#include <dcp/util.h>
+#include <dcp/warnings.h>
#include <libcxml/cxml.h>
extern "C" {
#include <libavutil/pixfmt.h>
}
#include <libcxml/cxml.h>
extern "C" {
#include <libavutil/pixfmt.h>
}
-
DCPOMATIC
_DISABLE_WARNINGS
+
LIBDCP
_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include "i18n.h"
#include "i18n.h"