projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move Image::as_png() out to image_as_png().
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_player.cc
diff --git
a/src/tools/dcpomatic_player.cc
b/src/tools/dcpomatic_player.cc
index 1ab83a23079436e9d9323a84aadc65f18f3f4414..5d5e2e825d45c9d87a8e19e283440c11bc716c56 100644
(file)
--- a/
src/tools/dcpomatic_player.cc
+++ b/
src/tools/dcpomatic_player.cc
@@
-45,6
+45,8
@@
#include "lib/ffmpeg_content.h"
#include "lib/file_log.h"
#include "lib/film.h"
#include "lib/ffmpeg_content.h"
#include "lib/file_log.h"
#include "lib/film.h"
+#include "lib/image.h"
+#include "lib/image_png.h"
#include "lib/internet.h"
#include "lib/job.h"
#include "lib/job_manager.h"
#include "lib/internet.h"
#include "lib/job.h"
#include "lib/job_manager.h"
@@
-57,13
+59,13
@@
#include "lib/util.h"
#include "lib/verify_dcp_job.h"
#include "lib/video_content.h"
#include "lib/util.h"
#include "lib/verify_dcp_job.h"
#include "lib/video_content.h"
-#include "lib/warnings.h"
#include <dcp/cpl.h>
#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/dcp.h>
-#include <dcp/raw_convert.h>
#include <dcp/exceptions.h>
#include <dcp/exceptions.h>
+#include <dcp/raw_convert.h>
#include <dcp/search.h>
#include <dcp/search.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/cmdline.h>
#include <wx/display.h>
#include <wx/preferences.h>
#include <wx/cmdline.h>
#include <wx/display.h>
#include <wx/preferences.h>
@@
-71,7
+73,7
@@
DCPOMATIC_DISABLE_WARNINGS
#include <wx/splash.h>
#include <wx/stdpaths.h>
#include <wx/wx.h>
#include <wx/splash.h>
#include <wx/stdpaths.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#ifdef __WXGTK__
#include <X11/Xlib.h>
#endif
#ifdef __WXGTK__
#include <X11/Xlib.h>
#endif