Mercurial > sdl-ios-xcode
view src/video/SDL_drawpoint.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 | 0267b8b1595c |
children | f638ded38b8a |
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 */ #include "SDL_config.h" #include "SDL_draw.h" int SDL_DrawPoint(SDL_Surface * dst, int x, int y, Uint32 color) { if (!dst) { SDL_SetError("Passed NULL destination surface"); return -1; } /* This function doesn't work on surfaces < 8 bpp */ if (dst->format->BitsPerPixel < 8) { SDL_SetError("SDL_DrawPoint(): Unsupported surface format"); return -1; } /* Perform clipping */ if (x < dst->clip_rect.x || y < dst->clip_rect.y || x >= (dst->clip_rect.x + dst->clip_rect.w) || y >= (dst->clip_rect.y + dst->clip_rect.h)) { return 0; } switch (dst->format->BytesPerPixel) { case 1: DRAW_FASTSETPIXEL1(x, y); break; case 2: DRAW_FASTSETPIXEL2(x, y); break; case 3: SDL_Unsupported(); return -1; case 4: DRAW_FASTSETPIXEL4(x, y); break; } return 0; } int SDL_DrawPoints(SDL_Surface * dst, const SDL_Point * points, int count, Uint32 color) { int minx, miny; int maxx, maxy; int i; int x, y; if (!dst) { SDL_SetError("Passed NULL destination surface"); return -1; } /* This function doesn't work on surfaces < 8 bpp */ if (dst->format->BitsPerPixel < 8) { SDL_SetError("SDL_DrawPoints(): Unsupported surface format"); return -1; } minx = dst->clip_rect.x; maxx = dst->clip_rect.x + dst->clip_rect.w - 1; miny = dst->clip_rect.y; maxy = dst->clip_rect.y + dst->clip_rect.h - 1; for (i = 0; i < count; ++i) { x = points[i].x; y = points[i].y; if (x < minx || x > maxx || y < miny || y > maxy) { continue; } switch (dst->format->BytesPerPixel) { case 1: DRAW_FASTSETPIXEL1(x, y); break; case 2: DRAW_FASTSETPIXEL2(x, y); break; case 3: SDL_Unsupported(); return -1; case 4: DRAW_FASTSETPIXEL4(x, y); break; } } return 0; } /* vi: set ts=4 sw=4 expandtab: */