virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/xpmdec: rename convert to hex_char_to_number

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2017-03-12 22:42:05 +01:00
parent 7133ab435a
commit 9d7e71a233
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
libavcodec/xpmdec.c
View File

@@ -185,7 +185,7 @@ static const ColorEntry color_table[] = {
{ "YellowGreen", 0xFF9ACD32 } { "YellowGreen", 0xFF9ACD32 }
}; };
static unsigned convert(uint8_t x) static unsigned hex_char_to_number(uint8_t x)
{ {
if (x >= 'a' && x <= 'f') if (x >= 'a' && x <= 'f')
x -= 87; x -= 87;
@@ -237,30 +237,30 @@ static uint32_t hexstring_to_rgba(const char *p, int len)
p++; p++;
len--; len--;
if (len == 3) { if (len == 3) {
ret |= (convert(p[2]) << 4) | ret |= (hex_char_to_number(p[2]) << 4) |
(convert(p[1]) << 12) | (hex_char_to_number(p[1]) << 12) |
(convert(p[0]) << 20); (hex_char_to_number(p[0]) << 20);
} else if (len == 4) { } else if (len == 4) {
ret = (convert(p[3]) << 4) | ret = (hex_char_to_number(p[3]) << 4) |
(convert(p[2]) << 12) | (hex_char_to_number(p[2]) << 12) |
(convert(p[1]) << 20) | (hex_char_to_number(p[1]) << 20) |
(convert(p[0]) << 28); (hex_char_to_number(p[0]) << 28);
} else if (len == 6) { } else if (len == 6) {
ret |= convert(p[5]) | ret |= hex_char_to_number(p[5]) |
(convert(p[4]) << 4) | (hex_char_to_number(p[4]) << 4) |
(convert(p[3]) << 8) | (hex_char_to_number(p[3]) << 8) |
(convert(p[2]) << 12) | (hex_char_to_number(p[2]) << 12) |
(convert(p[1]) << 16) | (hex_char_to_number(p[1]) << 16) |
(convert(p[0]) << 20); (hex_char_to_number(p[0]) << 20);
} else if (len == 8) { } else if (len == 8) {
ret = convert(p[7]) | ret = hex_char_to_number(p[7]) |
(convert(p[6]) << 4) | (hex_char_to_number(p[6]) << 4) |
(convert(p[5]) << 8) | (hex_char_to_number(p[5]) << 8) |
(convert(p[4]) << 12) | (hex_char_to_number(p[4]) << 12) |
(convert(p[3]) << 16) | (hex_char_to_number(p[3]) << 16) |
(convert(p[2]) << 20) | (hex_char_to_number(p[2]) << 20) |
(convert(p[1]) << 24) | (hex_char_to_number(p[1]) << 24) |
(convert(p[0]) << 28); (hex_char_to_number(p[0]) << 28);
} }
} else { } else {
strncpy(color_name, p, len); strncpy(color_name, p, len);