projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix black borders around the preview in some cases (#2331).
[dcpomatic.git]
/
src
/
lib
/
filter.cc
diff --git
a/src/lib/filter.cc
b/src/lib/filter.cc
index 1c1039065227c4c5c3fdbc27abf8ded1a331b8c8..9158cba5c10b6741995433ea767c2a3899611920 100644
(file)
--- a/
src/lib/filter.cc
+++ b/
src/lib/filter.cc
@@
-25,10
+25,12
@@
#include "filter.h"
#include "filter.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
extern "C" {
#include <libavfilter/avfilter.h>
}
extern "C" {
#include <libavfilter/avfilter.h>
}
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
#include "i18n.h"
#include "i18n.h"
@@
-36,7
+38,7
@@
extern "C" {
using namespace std;
using namespace std;
-vector<Filter
const *
> Filter::_filters;
+vector<Filter> Filter::_filters;
/** @param i Our id.
/** @param i Our id.
@@
-58,7
+60,11
@@
Filter::Filter (string i, string n, string c, string f)
vector<Filter const *>
Filter::all ()
{
vector<Filter const *>
Filter::all ()
{
- return _filters;
+ vector<Filter const *> raw;
+ for (auto& filter: _filters) {
+ raw.push_back (&filter);
+ }
+ return raw;
}
}
@@
-98,7
+104,7
@@
Filter::maybe_add (string i, string n, string c, string f)
}
if (avfilter_get_by_name(check_name.c_str())) {
}
if (avfilter_get_by_name(check_name.c_str())) {
- _filters.push_back (
new
Filter(i, n, c, f));
+ _filters.push_back (Filter(i, n, c, f));
}
}
}
}
@@
-129,7
+135,7
@@
Filter const *
Filter::from_id (string d)
{
auto i = _filters.begin ();
Filter::from_id (string d)
{
auto i = _filters.begin ();
- while (i != _filters.end() &&
(*i)
->id() != d) {
+ while (i != _filters.end() &&
i
->id() != d) {
++i;
}
++i;
}
@@
-137,5
+143,5
@@
Filter::from_id (string d)
return nullptr;
}
return nullptr;
}
- return
*i
;
+ return
&(*i)
;
}
}