Fix failure to open v2.14.x documents with invalid or empty subtitle languages (...

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

diff --git a/src/lib/filter.cc b/src/lib/filter.cc
index 663d1454742e63f388af460430f048cf68abd4b0..5631af55a8885a5d1e6a02cad27d1cb7e85bd9a8 100644 (file)
--- a/src/lib/filter.cc
+++ b/src/lib/filter.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,23 +18,30 @@
 
 */
 
+
 /** @file src/filter.cc
  *  @brief A class to describe one of FFmpeg's video or audio filters.
  */
 
+
 #include "filter.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/avfilter.h>
 }
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"
 
+
 using namespace std;
 
+
 vector<Filter const *> Filter::_filters;
 
+
 /** @param i Our id.
  *  @param n User-visible name.
  *  @param c User-visible category.
@@ -49,6 +56,7 @@ Filter::Filter (string i, string n, string c, string f)
 
 }
 
+
 /** @return All available filters */
 vector<Filter const *>
 Filter::all ()
@@ -56,6 +64,7 @@ Filter::all ()
        return _filters;
 }
 
+
 /** Set up the static _filters vector; must be called before from_*
  *  methods are used.
  */
@@ -81,6 +90,7 @@ Filter::setup_filters ()
        maybe_add (N_("ow"),          _("Overcomplete wavelet denoiser"),    _("Noise reduction"), N_("mp=ow"));
 }
 
+
 void
 Filter::maybe_add (string i, string n, string c, string f)
 {
@@ -90,11 +100,12 @@ Filter::maybe_add (string i, string n, string c, string f)
                check_name = check_name.substr (0, end);
        }
 
-       if (avfilter_get_by_name (check_name.c_str())) {
-               _filters.push_back (new Filter (i, n, c, f));
+       if (avfilter_get_by_name(check_name.c_str())) {
+               _filters.push_back (new Filter(i, n, c, f));
        }
 }
 
+
 /** @param filters Set of filters.
  *  @return String to pass to FFmpeg for the video filters.
  */
@@ -103,7 +114,7 @@ Filter::ffmpeg_string (vector<Filter const *> const & filters)
 {
        string ff;
 
-       BOOST_FOREACH (Filter const * i, filters) {
+       for (auto const i: filters) {
                if (!ff.empty ()) {
                        ff += N_(",");
                }
@@ -113,19 +124,20 @@ Filter::ffmpeg_string (vector<Filter const *> const & filters)
        return ff;
 }
 
+
 /** @param d Our id.
  *  @return Corresponding Filter, or 0.
  */
 Filter const *
 Filter::from_id (string d)
 {
-       vector<Filter const *>::iterator i = _filters.begin ();
+       auto i = _filters.begin ();
        while (i != _filters.end() && (*i)->id() != d) {
                ++i;
        }
 
        if (i == _filters.end ()) {
-               return 0;
+               return nullptr;
        }
 
        return *i;