Compare commits

...

2 Commits

Author SHA1 Message Date
Jean-Baptiste Mardelle
e2da06720b Remove duplicate line from last cherry-pick 2021-06-08 08:04:51 +02:00
Jean-Baptiste Mardelle
fcd82a3fde Hopefully proper patch to solve "white" rendering issues 2021-06-08 08:03:19 +02:00
2 changed files with 4 additions and 4 deletions

View File

@@ -134,6 +134,7 @@ int main(int argc, char **argv)
// older MLT version, does not support embedded consumer in/out in xml, and current
// MLT (6.16) does not pass it onto the multi / movit consumer, so read it manually and enforce
LocaleHandling::resetAllLocale();
QFile f(playlist);
QDomDocument doc;
doc.setContent(&f, false);
@@ -146,7 +147,6 @@ int main(int argc, char **argv)
playlist.append(QStringLiteral("?multi=1"));
}
}
LocaleHandling::resetAllLocale();
auto *rJob = new RenderJob(render, playlist, target, pid, in, out, qApp);
rJob->start();
QObject::connect(rJob, &RenderJob::renderingFinished, rJob, [&, rJob]() {

View File

@@ -50,11 +50,11 @@ void LocaleHandling::resetLocale()
void LocaleHandling::resetAllLocale()
{
#ifdef Q_OS_FREEBSD
setlocale(LC_ALL, "C");
setlocale(LC_ALL, "C.UTF-8");
#else
std::setlocale(LC_ALL, "C");
std::setlocale(LC_ALL, "C.UTF-8");
#endif
::qputenv("LC_ALL", "C");
::qputenv("LC_ALL", "C.UTF-8");
}
QPair<QLocale, LocaleHandling::MatchType> LocaleHandling::getQLocaleForDecimalPoint(const QString &requestedLocale, const QString &decimalPoint)