Mercurial > sdl-ios-xcode

view src/video/ps3/spulibs/Makefile @ 4388:1524d3237820 SDL-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3b8ac3d311a2
children
line wrap: on
line source

# This Makefile is for building the CELL BE SPU libs
# libfb_writer_spu.so, libyuv2rgb_spu.so, libbilin_scaler_spu.so

# Toolchain
SPU_GCC=/usr/bin/spu-gcc
PPU_GCC=/usr/bin/gcc
PPU_EMBEDSPU=/usr/bin/embedspu
PPU_AR=/usr/bin/ar
PPU_LD=/usr/bin/ld
INSTALL=/usr/bin/install

SPU_CFLAGS=-W -Wall -Winline -Wno-main -I. -I /usr/spu/include -I /opt/cell/sdk/usr/spu/include -finline-limit=10000 -Winline -ftree-vectorize -funroll-loops -fmodulo-sched -ffast-math -fPIC -O2

# Usually /usr/lib, depending on your distribution
PREFIX=/usr/lib


all: libfb_writer_spu.a libfb_writer_spu.so \
				libyuv2rgb_spu.so libyuv2rgb_spu.a \
				libbilin_scaler_spu.so libbilin_scaler_spu.a


# fb_writer
fb_writer_spu-embed.o: fb_writer.c spu_common.h
	$(SPU_GCC) $(SPU_CFLAGS) -o fb_writer_spu fb_writer.c -lm
	$(PPU_EMBEDSPU) -m32 fb_writer_spu fb_writer_spu fb_writer_spu-embed.o

libfb_writer_spu.so: fb_writer_spu-embed.o
	$(PPU_LD) -o libfb_writer_spu.so -shared -soname=libfb_writer_spu.so fb_writer_spu-embed.o

libfb_writer_spu.a: fb_writer_spu-embed.o
	$(PPU_AR) -qcs libfb_writer_spu.a fb_writer_spu-embed.o


# yuv2rgb_converter
yuv2rgb_spu-embed.o: yuv2rgb_converter.c spu_common.h
	$(SPU_GCC) $(SPU_CFLAGS) -o yuv2rgb_spu yuv2rgb_converter.c -lm
	$(PPU_EMBEDSPU) -m32 yuv2rgb_spu yuv2rgb_spu yuv2rgb_spu-embed.o

libyuv2rgb_spu.a: yuv2rgb_spu-embed.o
	$(PPU_AR) -qcs libyuv2rgb_spu.a yuv2rgb_spu-embed.o

libyuv2rgb_spu.so: yuv2rgb_spu-embed.o
	$(PPU_LD) -o libyuv2rgb_spu.so -shared -soname=libyuv2rgb_spu.so yuv2rgb_spu-embed.o


# bilin_scaler
bilin_scaler_spu-embed.o: bilin_scaler.c spu_common.h
	$(SPU_GCC) $(SPU_CFLAGS) -o bilin_scaler_spu bilin_scaler.c -lm
	$(PPU_EMBEDSPU) -m32 bilin_scaler_spu bilin_scaler_spu bilin_scaler_spu-embed.o

libbilin_scaler_spu.a: bilin_scaler_spu-embed.o
	$(PPU_AR) -qcs libbilin_scaler_spu.a bilin_scaler_spu-embed.o

libbilin_scaler_spu.so: bilin_scaler_spu-embed.o
	$(PPU_LD) -o libbilin_scaler_spu.so -shared -soname=libbilin_scaler_spu.so bilin_scaler_spu-embed.o

install: libfb_writer_spu.a libfb_writer_spu.so \
				libyuv2rgb_spu.so libyuv2rgb_spu.a \
				libbilin_scaler_spu.so libbilin_scaler_spu.a
	$(INSTALL) -c -m 0755 libfb_writer_spu.so $(PREFIX)/.
	$(INSTALL) -c -m 0655 libfb_writer_spu.a $(PREFIX)/.
	$(INSTALL) -c -m 0755 libyuv2rgb_spu.so $(PREFIX)/.
	$(INSTALL) -c -m 0655 libyuv2rgb_spu.a $(PREFIX)/.
	$(INSTALL) -c -m 0755 libbilin_scaler_spu.so $(PREFIX)/.
	$(INSTALL) -c -m 0655 libbilin_scaler_spu.a $(PREFIX)/.


uninstall: $(PREFIX)/libfb_writer_spu.so $(PREFIX)/libfb_writer_spu.a \
		$(PREFIX)/libyuv2rgb_spu.so $(PREFIX)/libyuv2rgb_spu.a \
		$(PREFIX)/libbilin_scaler_spu.so $(PREFIX)/libbilin_scaler_spu.a
	rm -f $(PREFIX)/libfb_writer_spu.a
	rm -f $(PREFIX)/libfb_writer_spu.so
	rm -f $(PREFIX)/libyuv2rgb_spu.so
	rm -f $(PREFIX)/libyuv2rgb_spu.a
	rm -f $(PREFIX)/libbilin_scaler_spu.so
	rm -f $(PREFIX)/libbilin_scaler_spu.a


clean:
	rm -f bilin_scaler_spu-embed.o libbilin_scaler_spu.so libbilin_scaler_spu.a bilin_scaler_spu
	rm -f yuv2rgb_spu-embed.o libyuv2rgb_spu.so libyuv2rgb_spu.a yuv2rgb_spu
	rm -f fb_writer_spu-embed.o libfb_writer_spu.so libfb_writer_spu.a fb_writer_spu