This commit is contained in:
Scott Lahteine 2020-11-11 14:05:40 -06:00
parent 68e5a933f1
commit dee2d594ed

View file

@ -93,7 +93,7 @@ uint8_t* get_utf8_value_cb(uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t
NEXT_6_BITS(); NEXT_6_BITS();
p++; p++;
} }
#if MAX_UTF8_CHAR_SIZE > 2 #if MAX_UTF8_CHAR_SIZE >= 3
else if (0xE0 == (0xF0 & valcur)) { else if (0xE0 == (0xF0 & valcur)) {
val = valcur & 0x0F; val = valcur & 0x0F;
NEXT_6_BITS(); NEXT_6_BITS();
@ -101,7 +101,7 @@ uint8_t* get_utf8_value_cb(uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t
p++; p++;
} }
#endif #endif
#if MAX_UTF8_CHAR_SIZE > 3 #if MAX_UTF8_CHAR_SIZE >= 4
else if (0xF0 == (0xF8 & valcur)) { else if (0xF0 == (0xF8 & valcur)) {
val = valcur & 0x07; val = valcur & 0x07;
NEXT_6_BITS(); NEXT_6_BITS();
@ -110,7 +110,7 @@ uint8_t* get_utf8_value_cb(uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t
p++; p++;
} }
#endif #endif
#if MAX_UTF8_CHAR_SIZE > 4 #if MAX_UTF8_CHAR_SIZE >= 5
else if (0xF8 == (0xFC & valcur)) { else if (0xF8 == (0xFC & valcur)) {
val = valcur & 0x03; val = valcur & 0x03;
NEXT_6_BITS(); NEXT_6_BITS();
@ -120,7 +120,7 @@ uint8_t* get_utf8_value_cb(uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t
p++; p++;
} }
#endif #endif
#if MAX_UTF8_CHAR_SIZE > 5 #if MAX_UTF8_CHAR_SIZE >= 6
else if (0xFC == (0xFE & valcur)) { else if (0xFC == (0xFE & valcur)) {
val = valcur & 0x01; val = valcur & 0x01;
NEXT_6_BITS(); NEXT_6_BITS();