Mercurial > sdl-ios-xcode
view src/video/photon/SDL_photon_pixelfmt.c @ 3539:f2846bf19360
Fixed bug #896
John Popplewell 2009-12-08 23:05:50 PST
Originally reported by AKFoerster on the mailing list.
Error decoding UTF8 Russian text to UTF-16LE on Windows, but specifically on
platforms without iconv support (the default on Windows).
Valid UTF8 characters are flagged as being overlong and then substituted by the
UNKNOWN_UNICODE character.
After studying the testiconv.c example program, reading the RFCs and putting
some printf statements in SDL_iconv.c the problem is in a test for 'Maximum
overlong sequences', specifically 4.2.1, which is carried out by the following
code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xCE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
Here is the 2-byte encoding of a character in range 00000080 - 000007FF
110xxxxx 10xxxxxx
The line in question is supposed to be checking for an overlong sequence which
would be less than
11000001 10111111
which should be represented as a single byte.
BUT, the mask value (0xCE) is wrong, it isn't checking the top-most bit:
11000001 value
11001110 mask (incorrect)
^
and should be (0xDE):
11000001 value
11011110 mask (correct)
making the above code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xDE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
I can supply a test program and/or a patch if required,
best regards,
John Popplewell
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 11 Dec 2009 08:03:43 +0000 |
parents | f96615051c8c |
children | f7b03b6838cb |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org QNX Photon GUI SDL driver Copyright (C) 2009 Mike Gorchak (mike@malva.ua, lestat@i.com.ua) */ #include "SDL_photon_pixelfmt.h" uint32_t photon_bits_to_sdl_pixelformat(uint32_t pixelfmt) { switch (pixelfmt) { case 8: { return SDL_PIXELFORMAT_INDEX8; } break; case 15: { return SDL_PIXELFORMAT_ARGB1555; } break; case 16: { return SDL_PIXELFORMAT_RGB565; } break; case 24: { return SDL_PIXELFORMAT_RGB888; } break; case 32: { return SDL_PIXELFORMAT_ARGB8888; } break; } } uint32_t photon_sdl_to_bits_pixelformat(uint32_t pixelfmt) { switch (pixelfmt) { case SDL_PIXELFORMAT_INDEX8: { return 8; } break; case SDL_PIXELFORMAT_ARGB1555: { return 15; } break; case SDL_PIXELFORMAT_RGB555: { return 15; } break; case SDL_PIXELFORMAT_ABGR1555: { return 15; } break; case SDL_PIXELFORMAT_RGB565: { return 16; } break; case SDL_PIXELFORMAT_RGB24: { return 24; } break; case SDL_PIXELFORMAT_RGB888: { return 32; } break; case SDL_PIXELFORMAT_BGRA8888: { return 32; } break; case SDL_PIXELFORMAT_ARGB8888: { return 32; } break; case SDL_PIXELFORMAT_YV12: { return 8; } break; case SDL_PIXELFORMAT_YUY2: { return 16; } break; case SDL_PIXELFORMAT_UYVY: { return 16; } break; case SDL_PIXELFORMAT_YVYU: { return 16; } break; } return 0; } uint32_t photon_image_to_sdl_pixelformat(uint32_t pixelfmt) { switch (pixelfmt) { case Pg_IMAGE_PALETTE_BYTE: { return SDL_PIXELFORMAT_INDEX8; } break; case Pg_IMAGE_DIRECT_8888: { return SDL_PIXELFORMAT_ARGB8888; } break; case Pg_IMAGE_DIRECT_888: { return SDL_PIXELFORMAT_RGB24; } break; case Pg_IMAGE_DIRECT_565: { return SDL_PIXELFORMAT_RGB565; } break; case Pg_IMAGE_DIRECT_555: { return SDL_PIXELFORMAT_RGB555; } break; case Pg_IMAGE_DIRECT_1555: { return SDL_PIXELFORMAT_ARGB1555; } break; } return 0; } uint32_t photon_sdl_to_image_pixelformat(uint32_t pixelfmt) { switch (pixelfmt) { case SDL_PIXELFORMAT_INDEX8: { return Pg_IMAGE_PALETTE_BYTE; } break; case SDL_PIXELFORMAT_ARGB8888: { return Pg_IMAGE_DIRECT_8888; } break; case SDL_PIXELFORMAT_RGB888: { return Pg_IMAGE_DIRECT_8888; } break; case SDL_PIXELFORMAT_RGB24: { return Pg_IMAGE_DIRECT_888; } break; case SDL_PIXELFORMAT_RGB565: { return Pg_IMAGE_DIRECT_565; } break; case SDL_PIXELFORMAT_ARGB1555: { return Pg_IMAGE_DIRECT_1555; } break; case SDL_PIXELFORMAT_RGB555: { return Pg_IMAGE_DIRECT_555; } break; } return 0; } /* vi: set ts=4 sw=4 expandtab: */