projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Primitive auto-crop (#1477).
[dcpomatic.git]
/
src
/
wx
/
dkdm_dialog.cc
diff --git
a/src/wx/dkdm_dialog.cc
b/src/wx/dkdm_dialog.cc
index 5743cd71204bf079cc53fa61f952cf89e37febb3..c7503048cea80331645afb15808949ca1a1316a0 100644
(file)
--- a/
src/wx/dkdm_dialog.cc
+++ b/
src/wx/dkdm_dialog.cc
@@
-32,17
+32,15
@@
#include "lib/film.h"
#include "lib/job_manager.h"
#include "lib/kdm_with_metadata.h"
#include "lib/film.h"
#include "lib/job_manager.h"
#include "lib/kdm_with_metadata.h"
-#include "lib/warnings.h"
#include <libcxml/cxml.h>
#include <dcp/exceptions.h>
#include <libcxml/cxml.h>
#include <dcp/exceptions.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/listctrl.h>
#include <wx/treectrl.h>
#include <wx/listctrl.h>
#include <wx/treectrl.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
-using std::cout;
using std::exception;
using std::list;
using std::make_pair;
using std::exception;
using std::list;
using std::make_pair;