Mercurial > sdl-ios-xcode
view src/video/nanox/SDL_nxvideo.h @ 4388:1524d3237820 SDL-1.2
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:00:57 +0000 |
| parents | a1b03ba2fcd0 |
| children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga Copyright (C) 2001 Hsieh-Fu Tsai This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org Hsieh-Fu Tsai clare@setabox.com */ #include "SDL_config.h" #ifndef _SDL_nxvideo_h #define _SDL_nxvideo_h #include <microwin/nano-X.h> #include "../SDL_sysvideo.h" #ifdef ENABLE_NANOX_DEBUG #define Dprintf printf #else #define Dprintf(ignore...) #endif // Hidden "this" pointer for the video functions #define _THIS SDL_VideoDevice * this // Private display data typedef struct NX_SDL_VISUAL { int bpp ; Uint32 red_mask ; Uint32 green_mask ; Uint32 blue_mask ; } nx_sdl_visual_t ; struct SDL_PrivateVideoData { GR_WINDOW_ID SDL_Window ; GR_WINDOW_ID FSwindow ; // Flag: true if we have been passed a window char * SDL_windowid ; GR_GC_ID GC ; unsigned char * Image ; unsigned char * Image_buff ; /* for GrArea*/ unsigned char * Clientfb; /* for DirectFB*/ nx_sdl_visual_t SDL_Visual ; // The current list of available video modes SDL_Rect ** modelist ; int currently_fullscreen ; // for fullscreen int OffsetX, OffsetY ; // for GammaRamp Uint16 * GammaRamp_R, * GammaRamp_G, * GammaRamp_B ; // for GrArea, r_mask, g_mask, b_mask int pixel_type ; #ifdef ENABLE_NANOX_DIRECT_FB GR_WINDOW_FB_INFO fbinfo; #endif } ; #define SDL_Window (this -> hidden -> SDL_Window) #define FSwindow (this -> hidden -> FSwindow) #define SDL_windowid (this -> hidden -> SDL_windowid) #define SDL_GC (this -> hidden -> GC) #define SDL_Image (this -> hidden -> Image) #define Image_buff (this -> hidden -> Image_buff) #define Clientfb (this -> hidden -> Clientfb) #define SDL_Visual (this -> hidden -> SDL_Visual) #define SDL_modelist (this -> hidden -> modelist) #define currently_fullscreen (this -> hidden -> currently_fullscreen) #define OffsetX (this -> hidden -> OffsetX) #define OffsetY (this -> hidden -> OffsetY) #define GammaRamp_R (this -> hidden -> GammaRamp_R) #define GammaRamp_G (this -> hidden -> GammaRamp_G) #define GammaRamp_B (this -> hidden -> GammaRamp_B) #define pixel_type (this -> hidden -> pixel_type) #define fbinfo (this -> hidden -> fbinfo) #define CI_SIZE 256 // color index size #endif // _SDL_nxvideo_h