mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-10-24 05:42:39 +00:00
e0e2d9fe80
While Linux was not an original goal of the project, it should still be supported out of the box. Therefore a number of changes are contained in this changeset: - All C++ .h files were renamed to .hpp. - All C includes (<....h>) were replaced with C++ includes (<c...>) and missing includes were added. - std::memset and std::memcpy was replaced with memset and memcpy. - All anonymous structs were removed where necessary. - `extern "C"` was removed where it wasn't needed. - #pragma warning was placed behind an #ifdef _MSC_VER - The macros for `min`, `max` and `clamp` were removed as they were not used. - `-fpedantic` was added to the GCC flags for bitmask support. - `gs::rendertarget_op` is now declared before use. - std::exception(const char*) was replaced with std::runtime_error(const char*). - Added aligned_alloc and aligned_free macros for GCC and MSVC support. - Replaced use of `sprintf_s` with `snprintf`. - Placed additional guards around windows only code. Additonally some changes were made that do not affect Linux: - `NOMINMAX` and `NOINOUT` were removed. Fixes: #27 Fixes: #13
103 lines
2.2 KiB
C++
103 lines
2.2 KiB
C++
/*
|
|
* Modern effects for a modern Streamer
|
|
* Copyright (C) 2017 Michael Fabian Dirks
|
|
*
|
|
* This program 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,
|
|
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
*/
|
|
|
|
#include "util-math.hpp"
|
|
#include <cctype>
|
|
#include <cstdlib>
|
|
#include "util-memory.hpp"
|
|
|
|
void* util::vec3a::operator new(size_t count)
|
|
{
|
|
return aligned_alloc(count, 16);
|
|
}
|
|
|
|
void* util::vec3a::operator new[](size_t count)
|
|
{
|
|
return aligned_alloc(count, 16);
|
|
}
|
|
|
|
void util::vec3a::operator delete(void* p)
|
|
{
|
|
aligned_free(p);
|
|
}
|
|
|
|
void util::vec3a::operator delete[](void* p)
|
|
{
|
|
aligned_free(p);
|
|
}
|
|
|
|
void* util::vec4a::operator new(size_t count)
|
|
{
|
|
return aligned_alloc(count, 16);
|
|
}
|
|
|
|
void* util::vec4a::operator new[](size_t count)
|
|
{
|
|
return aligned_alloc(count, 16);
|
|
}
|
|
|
|
void util::vec4a::operator delete(void* p)
|
|
{
|
|
aligned_free(p);
|
|
}
|
|
|
|
void util::vec4a::operator delete[](void* p)
|
|
{
|
|
aligned_free(p);
|
|
}
|
|
|
|
std::pair<int64_t, int64_t> util::SizeFromString(std::string text, bool allowSquare)
|
|
{
|
|
int64_t width, height;
|
|
|
|
const char* begin = text.c_str();
|
|
const char* end = text.c_str() + text.size() + 1;
|
|
char* here = const_cast<char*>(end);
|
|
|
|
long long res = strtoll(begin, &here, 0);
|
|
if (errno == ERANGE) {
|
|
return {0, 0};
|
|
}
|
|
width = res;
|
|
|
|
while (here != end) {
|
|
if (isdigit(*here) || (*here == '-') || (*here == '+')) {
|
|
break;
|
|
}
|
|
here++;
|
|
}
|
|
if (here == end) {
|
|
// Are we allowed to return a square?
|
|
if (allowSquare) {
|
|
// Yes: Return width,width.
|
|
return {width, width};
|
|
} else {
|
|
// No: Return width,0.
|
|
return {width, 0};
|
|
}
|
|
}
|
|
|
|
res = strtoll(here, nullptr, 0);
|
|
if (errno == ERANGE) {
|
|
return {width, 0};
|
|
}
|
|
height = res;
|
|
|
|
return {width, height};
|
|
}
|