Support shadow in subtitles (#911).

[dcpomatic.git] / src / wx / video_waveform_plot.cc

diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index 8c13af7a51f8f98ba5e28a3a737eaacf247e8f55..5afe9ee4b78fc53eaa1a6dd19c95617ba3b6f5cd 100644 (file)
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -27,6 +28,7 @@
 #include <wx/rawbmp.h>
 #include <wx/graphics.h>
 #include <boost/bind.hpp>
+#include <iostream>
 
 using std::cout;
 using std::min;
@@ -136,7 +138,7 @@ VideoWaveformPlot::create_waveform ()
        }
 
        dcp::Size const size = _image->size();
-       _waveform.reset (new Image (PIX_FMT_RGB24, dcp::Size (size.width, size.height), true));
+       _waveform.reset (new Image (AV_PIX_FMT_RGB24, dcp::Size (size.width, size.height), true));
 
        for (int x = 0; x < size.width; ++x) {
 
@@ -165,7 +167,7 @@ VideoWaveformPlot::create_waveform ()
 
        _waveform = _waveform->scale (
                dcp::Size (GetSize().GetWidth() - 32, GetSize().GetHeight() - _vertical_margin * 2),
-               dcp::YUV_TO_RGB_REC709, PIX_FMT_RGB24, false
+               dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, false, true
                );
 }