projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable warnings around all wx includes.
[dcpomatic.git]
/
src
/
wx
/
simple_video_view.cc
diff --git
a/src/wx/simple_video_view.cc
b/src/wx/simple_video_view.cc
index 1ac56bbfe1f0ca3af029b6840511124af242a630..c6a4f1e74816cd8ec7c43bc5774677206e70adf2 100644
(file)
--- a/
src/wx/simple_video_view.cc
+++ b/
src/wx/simple_video_view.cc
@@
-26,8
+26,11
@@
#include "lib/butler.h"
#include "lib/dcpomatic_log.h"
#include "lib/image.h"
#include "lib/butler.h"
#include "lib/dcpomatic_log.h"
#include "lib/image.h"
+#include "lib/warnings.h"
#include <dcp/util.h>
#include <dcp/util.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/bind/bind.hpp>
#include <boost/bind/bind.hpp>
@@
-65,6
+68,8
@@
SimpleVideoView::paint ()
{
_state_timer.set("paint-panel");
wxPaintDC dc (_panel);
{
_state_timer.set("paint-panel");
wxPaintDC dc (_panel);
+ auto scale = 1 / dpi_scale_factor (_panel);
+ dc.SetLogicalScale (scale, scale);
auto const panel_size = _panel->GetSize ();
auto const panel_size = _panel->GetSize ();
@@
-222,7
+227,7
@@
SimpleVideoView::update ()
_state_timer.set ("get image");
_state_timer.set ("get image");
- _image = player_video().first->image(b
ind(&PlayerVideo::force, _1
, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
+ _image = player_video().first->image(b
oost::bind(&PlayerVideo::force
, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
_state_timer.set ("ImageChanged");
_viewer->image_changed (player_video().first);
_state_timer.set ("ImageChanged");
_viewer->image_changed (player_video().first);