diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-03-12 22:42:05 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-03-12 23:03:02 +0100 |
| commit | 9d7e71a233e33a3f1bf9a2b5a69f22dfa3613610 (patch) | |
| tree | 4dabe296d56e4cca3eb623a50a210d6eb49428a9 /libavcodec | |
| parent | 7133ab435abb3e7ae1a7e6d9570343d07d0b0d87 (diff) | |
| download | ffmpeg-9d7e71a233e33a3f1bf9a2b5a69f22dfa3613610.tar.gz | |
avcodec/xpmdec: rename convert to hex_char_to_number
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/xpmdec.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c index ad6de3d05c..7edb04c761 100644 --- a/libavcodec/xpmdec.c +++ b/libavcodec/xpmdec.c @@ -185,7 +185,7 @@ static const ColorEntry color_table[] = { { "YellowGreen", 0xFF9ACD32 } }; -static unsigned convert(uint8_t x) +static unsigned hex_char_to_number(uint8_t x) { if (x >= 'a' && x <= 'f') x -= 87; @@ -237,30 +237,30 @@ static uint32_t hexstring_to_rgba(const char *p, int len) p++; len--; if (len == 3) { - ret |= (convert(p[2]) << 4) | - (convert(p[1]) << 12) | - (convert(p[0]) << 20); + ret |= (hex_char_to_number(p[2]) << 4) | + (hex_char_to_number(p[1]) << 12) | + (hex_char_to_number(p[0]) << 20); } else if (len == 4) { - ret = (convert(p[3]) << 4) | - (convert(p[2]) << 12) | - (convert(p[1]) << 20) | - (convert(p[0]) << 28); + ret = (hex_char_to_number(p[3]) << 4) | + (hex_char_to_number(p[2]) << 12) | + (hex_char_to_number(p[1]) << 20) | + (hex_char_to_number(p[0]) << 28); } else if (len == 6) { - ret |= convert(p[5]) | - (convert(p[4]) << 4) | - (convert(p[3]) << 8) | - (convert(p[2]) << 12) | - (convert(p[1]) << 16) | - (convert(p[0]) << 20); + ret |= hex_char_to_number(p[5]) | + (hex_char_to_number(p[4]) << 4) | + (hex_char_to_number(p[3]) << 8) | + (hex_char_to_number(p[2]) << 12) | + (hex_char_to_number(p[1]) << 16) | + (hex_char_to_number(p[0]) << 20); } else if (len == 8) { - ret = convert(p[7]) | - (convert(p[6]) << 4) | - (convert(p[5]) << 8) | - (convert(p[4]) << 12) | - (convert(p[3]) << 16) | - (convert(p[2]) << 20) | - (convert(p[1]) << 24) | - (convert(p[0]) << 28); + ret = hex_char_to_number(p[7]) | + (hex_char_to_number(p[6]) << 4) | + (hex_char_to_number(p[5]) << 8) | + (hex_char_to_number(p[4]) << 12) | + (hex_char_to_number(p[3]) << 16) | + (hex_char_to_number(p[2]) << 20) | + (hex_char_to_number(p[1]) << 24) | + (hex_char_to_number(p[0]) << 28); } } else { strncpy(color_name, p, len); |