Skip to content

L
libSDL
Commit 134ae7ea authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

*** empty log message *** 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401517
parent 393b8049
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
src/stdlib/SDL_iconv.c
View file @ 134ae7ea
......@@ -383,8 +383,8 @@ size_t SDL_iconv(SDL_iconv_t cd,
if ( srclen < 2 ) {
return SDL_ICONV_EINVAL;
}
W1 = ((Uint32)p[0] << 8) |
(Uint32)p[1];
W1 = ((Uint16)p[0] << 8) |
(Uint16)p[1];
src += 2;
srclen -= 2;
if ( W1 < 0xD800 || W1 > 0xDFFF ) {
......@@ -402,8 +402,8 @@ size_t SDL_iconv(SDL_iconv_t cd,
return SDL_ICONV_EINVAL;
}
p = (Uint8 *)src;
W2 = ((Uint32)p[0] << 8) |
(Uint32)p[1];
W2 = ((Uint16)p[0] << 8) |
(Uint16)p[1];
src += 2;
srclen -= 2;
if ( W2 < 0xDC00 || W2 > 0xDFFF ) {
......@@ -424,8 +424,8 @@ size_t SDL_iconv(SDL_iconv_t cd,
if ( srclen < 2 ) {
return SDL_ICONV_EINVAL;
}
W1 = ((Uint32)p[1] << 8) |
(Uint32)p[0];
W1 = ((Uint16)p[1] << 8) |
(Uint16)p[0];
src += 2;
srclen -= 2;
if ( W1 < 0xD800 || W1 > 0xDFFF ) {
......@@ -443,8 +443,8 @@ size_t SDL_iconv(SDL_iconv_t cd,
return SDL_ICONV_EINVAL;
}
p = (Uint8 *)src;
W2 = ((Uint32)p[1] << 8) |
(Uint32)p[0];
W2 = ((Uint16)p[1] << 8) |
(Uint16)p[0];
src += 2;
srclen -= 2;
if ( W2 < 0xDC00 || W2 > 0xDFFF ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment