Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitvalue_c: use constexpr instead of #define

Browse Source
This commit is contained in:
Moritz Bunkus 2021-02-20 17:11:40 +01:00
parent d8f64f5ad6
commit 750530f489
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/bitvalue.cpp
View File

@ -21,6 +21,15 @@
namespace mtx::bits {
namespace {
unsigned char
hex_digit_to_decimal(char c) {
return isdigit(c) ? (c - '0') : (c - 'a' + 10);
}
}
value_c::value_c(int bitsize) {
assert((0 < bitsize) && (0 == (bitsize % 8)));
@ -32,11 +41,8 @@ value_c::value_c(const value_c &src) {
*this = src;
}
#define ishexdigit(c) (isdigit(c) || (((c) >= 'a') && ((c) <= 'f')))
#define hextodec(c) (isdigit(c) ? ((c) - '0') : ((c) - 'a' + 10))
value_c::value_c(std::string s,
unsigned int allowed_bitlength) {
unsigned int allowed_bitlength) {
if ((allowed_bitlength != 0) && ((allowed_bitlength % 8) != 0))
throw mtx::invalid_parameter_x();
@ -61,7 +67,8 @@ value_c::value_c(std::string s,
}
// Invalid character?
if (!ishexdigit(s[i]))
auto is_hex_digit = isdigit(s[i]) || ((s[i] >= 'a') && (s[i] <= 'f'));
if (!is_hex_digit)
throw mtx::bits::value_parser_x{fmt::format(Y("Not a hex digit at position {0}"), i)};
// Input too long?
@ -83,7 +90,7 @@ value_c::value_c(std::string s,
unsigned char *buffer = m_value->get_buffer();
for (i = 0; i < len; i += 2)
buffer[i / 2] = hextodec(s2[i]) << 4 | hextodec(s2[i + 1]);
buffer[i / 2] = (hex_digit_to_decimal(s2[i]) << 4) | hex_digit_to_decimal(s2[i + 1]);
}
value_c::value_c(libebml::EbmlBinary const &elt)