view src/video/photon/SDL_photon_render.h @ 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 d6b79fc83362
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)
*/

#ifndef __SDL_PHOTON_RENDER_H__
#define __SDL_PHOTON_RENDER_H__

#include "../SDL_sysvideo.h"

#include <Ph.h>
#include <photon/PhRender.h>

#define SDL_PHOTON_MAX_SURFACES 3

#define SDL_PHOTON_SURFTYPE_UNKNOWN    0x00000000
#define SDL_PHOTON_SURFTYPE_OFFSCREEN  0x00000001
#define SDL_PHOTON_SURFTYPE_PHIMAGE    0x00000002

#define SDL_PHOTON_UNKNOWN_BLEND       0x00000000
#define SDL_PHOTON_DRAW_BLEND          0x00000001
#define SDL_PHOTON_TEXTURE_BLEND       0x00000002

typedef struct SDL_RenderData
{
    SDL_bool enable_vsync;              /* VSYNC flip synchronization enable  */
    uint32_t surface_visible_idx;       /* Index of visible surface           */
    uint32_t surface_render_idx;        /* Index of render surface            */
    uint32_t surfaces_count;            /* Amount of allocated surfaces       */
    uint32_t surfaces_type;             /* Type of allocated surfaces         */
    uint32_t window_width;              /* Last active window width           */
    uint32_t window_height;             /* Last active window height          */
    PhGC_t* gc;                         /* Graphics context                   */
    SDL_bool direct_mode;               /* Direct Mode state                  */
    PdOffscreenContext_t* osurfaces[SDL_PHOTON_MAX_SURFACES];
    PhImage_t* psurfaces[SDL_PHOTON_MAX_SURFACES];
    PmMemoryContext_t* pcontexts[SDL_PHOTON_MAX_SURFACES];
} SDL_RenderData;

typedef struct SDL_TextureData
{
   uint32_t surface_type;
   PdOffscreenContext_t* osurface;
   PhImage_t* psurface;
   PmMemoryContext_t* pcontext;
} SDL_TextureData;

extern void photon_addrenderdriver(_THIS);

/* Helper function, which redraws the backbuffer */
int _photon_update_rectangles(SDL_Renderer* renderer, PhRect_t* rect);

#endif /* __SDL_PHOTON_RENDER_H__ */

/* vi: set ts=4 sw=4 expandtab: */