2017-12-13 23:28:35 +00:00
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
2019-01-14 10:23:21 +00:00
|
|
|
#include "util-math.hpp"
|
2018-11-07 14:24:25 +00:00
|
|
|
#include <cctype>
|
2019-01-14 10:23:21 +00:00
|
|
|
#include <cstdlib>
|
2019-09-04 01:03:41 +00:00
|
|
|
#include <stdexcept>
|
2019-01-14 10:23:21 +00:00
|
|
|
#include "util-memory.hpp"
|
2017-12-13 23:28:35 +00:00
|
|
|
|
2019-01-24 04:14:17 +00:00
|
|
|
void* util::vec2a::operator new(size_t count)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
return util::malloc_aligned(16, count);
|
2019-01-24 04:14:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void* util::vec2a::operator new[](size_t count)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
return util::malloc_aligned(16, count);
|
2019-01-24 04:14:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void util::vec2a::operator delete(void* p)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
util::free_aligned(p);
|
2019-01-24 04:14:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void util::vec2a::operator delete[](void* p)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
util::free_aligned(p);
|
2019-01-24 04:14:17 +00:00
|
|
|
}
|
|
|
|
|
2018-11-07 14:24:25 +00:00
|
|
|
void* util::vec3a::operator new(size_t count)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
return util::malloc_aligned(16, count);
|
2018-01-08 14:23:25 +00:00
|
|
|
}
|
|
|
|
|
2018-11-07 14:24:25 +00:00
|
|
|
void* util::vec3a::operator new[](size_t count)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
return util::malloc_aligned(16, count);
|
2018-01-08 14:23:25 +00:00
|
|
|
}
|
|
|
|
|
2018-11-07 14:24:25 +00:00
|
|
|
void util::vec3a::operator delete(void* p)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
util::free_aligned(p);
|
2018-01-08 14:23:25 +00:00
|
|
|
}
|
|
|
|
|
2018-11-07 14:24:25 +00:00
|
|
|
void util::vec3a::operator delete[](void* p)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
util::free_aligned(p);
|
2018-01-08 14:23:25 +00:00
|
|
|
}
|
|
|
|
|
2018-11-07 14:24:25 +00:00
|
|
|
void* util::vec4a::operator new(size_t count)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
return util::malloc_aligned(16, count);
|
2018-01-08 14:23:25 +00:00
|
|
|
}
|
|
|
|
|
2018-11-07 14:24:25 +00:00
|
|
|
void* util::vec4a::operator new[](size_t count)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
return util::malloc_aligned(16, count);
|
2018-01-08 14:23:25 +00:00
|
|
|
}
|
|
|
|
|
2018-11-07 14:24:25 +00:00
|
|
|
void util::vec4a::operator delete(void* p)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
util::free_aligned(p);
|
2018-01-08 14:23:25 +00:00
|
|
|
}
|
|
|
|
|
2018-11-07 14:24:25 +00:00
|
|
|
void util::vec4a::operator delete[](void* p)
|
|
|
|
{
|
2019-08-04 18:29:04 +00:00
|
|
|
util::free_aligned(p);
|
2018-01-08 14:23:25 +00:00
|
|
|
}
|
util-math: Add SizeFromString method
Converts a String to an std::pair of int64_t (long long), which contain the size or 0 if none could be parsed. Any delimiter except digits(0-9), a minus sign(-) or a plus sign(+) between width and height are allowed. If a plus or minus sign is used as a delimiter, it must immediately be followed by the second size number. This allows for formats such as: 100x100, 100:100, 100p100, 100@100, 100+100 and so on, but not formats such as 100+:100, 100ThisIsSomeReall+yLongText100, etc.
The parameter 'allowSquare' also determines what to do when the height parameter is not found. A value of true will have the function return <width,width> instead of <width,0>.
2018-03-05 15:36:20 +00:00
|
|
|
|
2019-08-04 18:29:04 +00:00
|
|
|
std::pair<int64_t, int64_t> util::size_from_string(std::string text, bool allowSquare)
|
2018-11-07 14:24:25 +00:00
|
|
|
{
|
util-math: Add SizeFromString method
Converts a String to an std::pair of int64_t (long long), which contain the size or 0 if none could be parsed. Any delimiter except digits(0-9), a minus sign(-) or a plus sign(+) between width and height are allowed. If a plus or minus sign is used as a delimiter, it must immediately be followed by the second size number. This allows for formats such as: 100x100, 100:100, 100p100, 100@100, 100+100 and so on, but not formats such as 100+:100, 100ThisIsSomeReall+yLongText100, etc.
The parameter 'allowSquare' also determines what to do when the height parameter is not found. A value of true will have the function return <width,width> instead of <width,0>.
2018-03-05 15:36:20 +00:00
|
|
|
int64_t width, height;
|
|
|
|
|
|
|
|
const char* begin = text.c_str();
|
2018-11-07 14:24:25 +00:00
|
|
|
const char* end = text.c_str() + text.size() + 1;
|
|
|
|
char* here = const_cast<char*>(end);
|
util-math: Add SizeFromString method
Converts a String to an std::pair of int64_t (long long), which contain the size or 0 if none could be parsed. Any delimiter except digits(0-9), a minus sign(-) or a plus sign(+) between width and height are allowed. If a plus or minus sign is used as a delimiter, it must immediately be followed by the second size number. This allows for formats such as: 100x100, 100:100, 100p100, 100@100, 100+100 and so on, but not formats such as 100+:100, 100ThisIsSomeReall+yLongText100, etc.
The parameter 'allowSquare' also determines what to do when the height parameter is not found. A value of true will have the function return <width,width> instead of <width,0>.
2018-03-05 15:36:20 +00:00
|
|
|
|
|
|
|
long long res = strtoll(begin, &here, 0);
|
|
|
|
if (errno == ERANGE) {
|
2018-11-07 14:24:25 +00:00
|
|
|
return {0, 0};
|
util-math: Add SizeFromString method
Converts a String to an std::pair of int64_t (long long), which contain the size or 0 if none could be parsed. Any delimiter except digits(0-9), a minus sign(-) or a plus sign(+) between width and height are allowed. If a plus or minus sign is used as a delimiter, it must immediately be followed by the second size number. This allows for formats such as: 100x100, 100:100, 100p100, 100@100, 100+100 and so on, but not formats such as 100+:100, 100ThisIsSomeReall+yLongText100, etc.
The parameter 'allowSquare' also determines what to do when the height parameter is not found. A value of true will have the function return <width,width> instead of <width,0>.
2018-03-05 15:36:20 +00:00
|
|
|
}
|
|
|
|
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.
|
2018-11-07 14:24:25 +00:00
|
|
|
return {width, width};
|
util-math: Add SizeFromString method
Converts a String to an std::pair of int64_t (long long), which contain the size or 0 if none could be parsed. Any delimiter except digits(0-9), a minus sign(-) or a plus sign(+) between width and height are allowed. If a plus or minus sign is used as a delimiter, it must immediately be followed by the second size number. This allows for formats such as: 100x100, 100:100, 100p100, 100@100, 100+100 and so on, but not formats such as 100+:100, 100ThisIsSomeReall+yLongText100, etc.
The parameter 'allowSquare' also determines what to do when the height parameter is not found. A value of true will have the function return <width,width> instead of <width,0>.
2018-03-05 15:36:20 +00:00
|
|
|
} else {
|
|
|
|
// No: Return width,0.
|
2018-11-07 14:24:25 +00:00
|
|
|
return {width, 0};
|
util-math: Add SizeFromString method
Converts a String to an std::pair of int64_t (long long), which contain the size or 0 if none could be parsed. Any delimiter except digits(0-9), a minus sign(-) or a plus sign(+) between width and height are allowed. If a plus or minus sign is used as a delimiter, it must immediately be followed by the second size number. This allows for formats such as: 100x100, 100:100, 100p100, 100@100, 100+100 and so on, but not formats such as 100+:100, 100ThisIsSomeReall+yLongText100, etc.
The parameter 'allowSquare' also determines what to do when the height parameter is not found. A value of true will have the function return <width,width> instead of <width,0>.
2018-03-05 15:36:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res = strtoll(here, nullptr, 0);
|
|
|
|
if (errno == ERANGE) {
|
2018-11-07 14:24:25 +00:00
|
|
|
return {width, 0};
|
util-math: Add SizeFromString method
Converts a String to an std::pair of int64_t (long long), which contain the size or 0 if none could be parsed. Any delimiter except digits(0-9), a minus sign(-) or a plus sign(+) between width and height are allowed. If a plus or minus sign is used as a delimiter, it must immediately be followed by the second size number. This allows for formats such as: 100x100, 100:100, 100p100, 100@100, 100+100 and so on, but not formats such as 100+:100, 100ThisIsSomeReall+yLongText100, etc.
The parameter 'allowSquare' also determines what to do when the height parameter is not found. A value of true will have the function return <width,width> instead of <width,0>.
2018-03-05 15:36:20 +00:00
|
|
|
}
|
|
|
|
height = res;
|
|
|
|
|
2018-11-07 14:24:25 +00:00
|
|
|
return {width, height};
|
util-math: Add SizeFromString method
Converts a String to an std::pair of int64_t (long long), which contain the size or 0 if none could be parsed. Any delimiter except digits(0-9), a minus sign(-) or a plus sign(+) between width and height are allowed. If a plus or minus sign is used as a delimiter, it must immediately be followed by the second size number. This allows for formats such as: 100x100, 100:100, 100p100, 100@100, 100+100 and so on, but not formats such as 100+:100, 100ThisIsSomeReall+yLongText100, etc.
The parameter 'allowSquare' also determines what to do when the height parameter is not found. A value of true will have the function return <width,width> instead of <width,0>.
2018-03-05 15:36:20 +00:00
|
|
|
}
|