From 59878b62d09d833070d2110a44d24059c48b334f Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Tue, 3 Dec 2019 20:38:14 +0100 Subject: [PATCH] filter-dynamic-mask: Fix nonstandard use of va_start --- source/filters/filter-dynamic-mask.cpp | 4 ++-- source/filters/filter-dynamic-mask.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/filters/filter-dynamic-mask.cpp b/source/filters/filter-dynamic-mask.cpp index 12b609e..2fe359d 100644 --- a/source/filters/filter-dynamic-mask.cpp +++ b/source/filters/filter-dynamic-mask.cpp @@ -171,12 +171,12 @@ obs_properties_t* return props; } -std::string filter::dynamic_mask::dynamic_mask_factory::translate_string(std::string format, ...) +std::string filter::dynamic_mask::dynamic_mask_factory::translate_string(const char* format, ...) { va_list vargs; va_start(vargs, format); std::vector buffer(2048); - size_t len = vsnprintf(buffer.data(), buffer.size(), format.c_str(), vargs); + size_t len = static_cast(vsnprintf(buffer.data(), buffer.size(), format, vargs)); va_end(vargs); return std::string(buffer.data(), buffer.data() + len); } diff --git a/source/filters/filter-dynamic-mask.hpp b/source/filters/filter-dynamic-mask.hpp index 90501b6..37b9849 100644 --- a/source/filters/filter-dynamic-mask.hpp +++ b/source/filters/filter-dynamic-mask.hpp @@ -125,7 +125,7 @@ namespace filter { virtual obs_properties_t* get_properties2(filter::dynamic_mask::dynamic_mask_instance* data) override; - std::string translate_string(std::string format, ...); + std::string translate_string(const char* format, ...); }; } // namespace dynamic_mask } // namespace filter