Mercurial > sdl-ios-xcode
view src/video/SDL_blendline.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 | c8bed77b0386 |
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" static int SDL_BlendLine_RGB555(SDL_Surface * dst, int x1, int y1, int x2, int y2, int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) { unsigned inva = 0xff - a; switch (blendMode) { case SDL_BLENDMODE_BLEND: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_BLEND_RGB555); break; case SDL_BLENDMODE_ADD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_ADD_RGB555); break; case SDL_BLENDMODE_MOD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_MOD_RGB555); break; default: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_RGB555); break; } return 0; } static int SDL_BlendLine_RGB565(SDL_Surface * dst, int x1, int y1, int x2, int y2, int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) { unsigned inva = 0xff - a; switch (blendMode) { case SDL_BLENDMODE_BLEND: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_BLEND_RGB565); break; case SDL_BLENDMODE_ADD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_ADD_RGB565); break; case SDL_BLENDMODE_MOD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_MOD_RGB565); break; default: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_RGB565); break; } return 0; } static int SDL_BlendLine_RGB888(SDL_Surface * dst, int x1, int y1, int x2, int y2, int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) { unsigned inva = 0xff - a; switch (blendMode) { case SDL_BLENDMODE_BLEND: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_BLEND_RGB888); break; case SDL_BLENDMODE_ADD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_ADD_RGB888); break; case SDL_BLENDMODE_MOD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_MOD_RGB888); break; default: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_RGB888); break; } return 0; } static int SDL_BlendLine_ARGB8888(SDL_Surface * dst, int x1, int y1, int x2, int y2, int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) { unsigned inva = 0xff - a; switch (blendMode) { case SDL_BLENDMODE_BLEND: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_BLEND_ARGB8888); break; case SDL_BLENDMODE_ADD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_ADD_ARGB8888); break; case SDL_BLENDMODE_MOD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_MOD_ARGB8888); break; default: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY_ARGB8888); break; } return 0; } static int SDL_BlendLine_RGB(SDL_Surface * dst, int x1, int y1, int x2, int y2, int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) { SDL_PixelFormat *fmt = dst->format; unsigned inva = 0xff - a; switch (fmt->BytesPerPixel) { case 2: switch (blendMode) { case SDL_BLENDMODE_BLEND: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY2_BLEND_RGB); break; case SDL_BLENDMODE_ADD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY2_ADD_RGB); break; case SDL_BLENDMODE_MOD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY2_MOD_RGB); break; default: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY2_RGB); break; } return 0; case 4: switch (blendMode) { case SDL_BLENDMODE_BLEND: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY4_BLEND_RGB); break; case SDL_BLENDMODE_ADD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY4_ADD_RGB); break; case SDL_BLENDMODE_MOD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY4_MOD_RGB); break; default: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY4_RGB); break; } return 0; default: SDL_Unsupported(); return -1; } } static int SDL_BlendLine_RGBA(SDL_Surface * dst, int x1, int y1, int x2, int y2, int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) { SDL_PixelFormat *fmt = dst->format; unsigned inva = 0xff - a; switch (fmt->BytesPerPixel) { case 4: switch (blendMode) { case SDL_BLENDMODE_BLEND: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY4_BLEND_RGBA); break; case SDL_BLENDMODE_ADD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY4_ADD_RGBA); break; case SDL_BLENDMODE_MOD: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY4_MOD_RGBA); break; default: DRAWLINE(x1, y1, x2, y2, DRAW_SETPIXELXY4_RGBA); break; } return 0; default: SDL_Unsupported(); return -1; } } int SDL_BlendLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) { /* This function doesn't work on surfaces < 8 bpp */ if (dst->format->BitsPerPixel < 8) { SDL_SetError("SDL_BlendLine(): Unsupported surface format"); return (-1); } /* Perform clipping */ if (!SDL_IntersectRectAndLine(&dst->clip_rect, &x1, &y1, &x2, &y2)) { return (0); } if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) { r = DRAW_MUL(r, a); g = DRAW_MUL(g, a); b = DRAW_MUL(b, a); } switch (dst->format->BitsPerPixel) { case 15: switch (dst->format->Rmask) { case 0x7C00: return SDL_BlendLine_RGB555(dst, x1, y1, x2, y2, blendMode, r, g, b, a); } break; case 16: switch (dst->format->Rmask) { case 0xF800: return SDL_BlendLine_RGB565(dst, x1, y1, x2, y2, blendMode, r, g, b, a); } break; case 32: switch (dst->format->Rmask) { case 0x00FF0000: if (!dst->format->Amask) { return SDL_BlendLine_RGB888(dst, x1, y1, x2, y2, blendMode, r, g, b, a); } else { return SDL_BlendLine_ARGB8888(dst, x1, y1, x2, y2, blendMode, r, g, b, a); } break; } break; default: break; } if (!dst->format->Amask) { return SDL_BlendLine_RGB(dst, x1, y1, x2, y2, blendMode, r, g, b, a); } else { return SDL_BlendLine_RGBA(dst, x1, y1, x2, y2, blendMode, r, g, b, a); } } int SDL_BlendLines(SDL_Surface * dst, const SDL_Point * points, int count, int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) { int i; int x1, y1; int x2, y2; int (*func)(SDL_Surface * dst, int x1, int y1, int x2, int y2, int blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) = NULL; int status = 0; 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_BlendLines(): Unsupported surface format"); return -1; } if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) { r = DRAW_MUL(r, a); g = DRAW_MUL(g, a); b = DRAW_MUL(b, a); } /* FIXME: Does this function pointer slow things down significantly? */ switch (dst->format->BitsPerPixel) { case 15: switch (dst->format->Rmask) { case 0x7C00: func = SDL_BlendLine_RGB555; } break; case 16: switch (dst->format->Rmask) { case 0xF800: func = SDL_BlendLine_RGB565; } break; case 32: switch (dst->format->Rmask) { case 0x00FF0000: if (!dst->format->Amask) { func = SDL_BlendLine_RGB888; } else { func = SDL_BlendLine_ARGB8888; } break; } default: break; } if (!func) { if (!dst->format->Amask) { func = SDL_BlendLine_RGB; } else { func = SDL_BlendLine_RGBA; } } for (i = 1; i < count; ++i) { x1 = points[i-1].x; y1 = points[i-1].y; x2 = points[i].x; y2 = points[i].y; /* Perform clipping */ /* FIXME: We don't actually want to clip, as it may change line slope */ if (!SDL_IntersectRectAndLine(&dst->clip_rect, &x1, &y1, &x2, &y2)) { continue; } status = func(dst, x1, y1, x2, y2, blendMode, r, g, b, a); } return status; } /* vi: set ts=4 sw=4 expandtab: */