Use make_shared<>.

[dcpomatic.git] / src / lib / render_subtitles.cc

diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index ed7d131fd7455352d6a49aa695629eb2a9667814..94a6b837b2f5981e583b0a93bc4d53f9446e7491 100644 (file)
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 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/>.
 
 */
 
@@ -23,9 +24,11 @@
 #include "cross.h"
 #include "font.h"
 #include "dcpomatic_assert.h"
+#include <fontconfig/fontconfig.h>
 #include <cairomm/cairomm.h>
 #include <pangomm.h>
 #include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
 #include <iostream>
 
 using std::list;
@@ -37,6 +40,7 @@ using std::pair;
 using std::cerr;
 using std::make_pair;
 using boost::shared_ptr;
+using boost::make_shared;
 using boost::optional;
 
 static FcConfig* fc_config = 0;
@@ -78,9 +82,10 @@ render_line (list<dcp::SubtitleString> subtitles, list<shared_ptr<Font> > fonts,
        /* ...and add a bit more for luck */
        height += target.height / 11;
 
-       shared_ptr<Image> image (new Image (AV_PIX_FMT_RGBA, dcp::Size (target.width, height), false));
+       shared_ptr<Image> image = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (target.width, height), false);
        image->make_black ();
 
+#ifdef DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH
        Cairo::RefPtr<Cairo::ImageSurface> surface = Cairo::ImageSurface::create (
                image->data()[0],
                Cairo::FORMAT_ARGB32,
@@ -88,6 +93,18 @@ render_line (list<dcp::SubtitleString> subtitles, list<shared_ptr<Font> > fonts,
                image->size().height,
                Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB32, image->size().width)
                );
+#else
+       /* Centos 5 does not have Cairo::ImageSurface::format_stride_for_width, so just use width * 4
+          which I hope is safe (if slow)
+       */
+       Cairo::RefPtr<Cairo::ImageSurface> surface = Cairo::ImageSurface::create (
+               image->data()[0],
+               Cairo::FORMAT_ARGB32,
+               image->size().width,
+               image->size().height,
+               image->size().width * 4
+               );
+#endif
 
        Cairo::RefPtr<Cairo::Context> context = Cairo::Context::create (surface);
 
@@ -185,6 +202,7 @@ render_line (list<dcp::SubtitleString> subtitles, list<shared_ptr<Font> > fonts,
 
        string marked_up;
        bool italic = false;
+       bool bold = false;
        BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) {
                if (i.italic() != italic) {
                        if (i.italic()) {
@@ -195,6 +213,15 @@ render_line (list<dcp::SubtitleString> subtitles, list<shared_ptr<Font> > fonts,
                        italic = i.italic ();
                }
 
+               if (i.bold() != bold) {
+                       if (i.bold()) {
+                               marked_up += "<b>";
+                       } else {
+                               marked_up += "</b>";
+                       }
+                       bold = i.bold ();
+               }
+
                marked_up += i.text ();
        }
 
@@ -202,6 +229,10 @@ render_line (list<dcp::SubtitleString> subtitles, list<shared_ptr<Font> > fonts,
                marked_up += "</i>";
        }
 
+       if (bold) {
+               marked_up += "</b>";
+       }
+
        layout->set_markup (marked_up);
 
        /* Compute fade factor */