Added UTF-8 <-> UTF-16 <-> UTF-32 <-> UCS-2 <-> UCS-4 conversion capability

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401505

test/Makefile.in

@@ -7,7 +7,7 @@ EXE	= @EXE@
 CFLAGS  = @CFLAGS@
 LIBS	= @LIBS@
 
-TARGETS = checkkeys$(EXE) graywin$(EXE) loopwave$(EXE) testalpha$(EXE) testbitmap$(EXE) testblitspeed$(EXE) testcdrom$(EXE) testdyngl$(EXE) testerror$(EXE) testfile$(EXE) testgamma$(EXE) testgl$(EXE) testhread$(EXE) testjoystick$(EXE) testkeys$(EXE) testlock$(EXE) testoverlay2$(EXE) testoverlay$(EXE) testpalette$(EXE) testplatform$(EXE) testsem$(EXE) testsprite$(EXE) testtimer$(EXE) testver$(EXE) testvidinfo$(EXE) testwin$(EXE) testwm$(EXE) threadwin$(EXE) torturethread$(EXE)
+TARGETS = checkkeys$(EXE) graywin$(EXE) loopwave$(EXE) testalpha$(EXE) testbitmap$(EXE) testblitspeed$(EXE) testcdrom$(EXE) testdyngl$(EXE) testerror$(EXE) testfile$(EXE) testgamma$(EXE) testgl$(EXE) testhread$(EXE) testiconv$(EXE) testjoystick$(EXE) testkeys$(EXE) testlock$(EXE) testoverlay2$(EXE) testoverlay$(EXE) testpalette$(EXE) testplatform$(EXE) testsem$(EXE) testsprite$(EXE) testtimer$(EXE) testver$(EXE) testvidinfo$(EXE) testwin$(EXE) testwm$(EXE) threadwin$(EXE) torturethread$(EXE)
 
 all: $(TARGETS)
 
@@ -50,6 +50,9 @@ testgl$(EXE): $(srcdir)/testgl.c
 testhread$(EXE): $(srcdir)/testhread.c
 	$(CC) -o $@ $? $(CFLAGS) $(LIBS)
 
+testiconv$(EXE): $(srcdir)/testiconv.c
+	$(CC) -o $@ $? $(CFLAGS) $(LIBS)
+
 testjoystick$(EXE): $(srcdir)/testjoystick.c
 	$(CC) -o $@ $? $(CFLAGS) $(LIBS)
 

test/testiconv.c

@@ -0,0 +1,85 @@
+
+#include <stdio.h>
+
+#include "SDL.h"
+
+static SDL_bool testutf16(char *data)
+{
+	Uint32 *p = (Uint32 *)data;
+	while(*p) {
+		if ( *p > 0x10FFFF ) {
+			return SDL_FALSE;
+		}
+		++p;
+	}
+	return SDL_TRUE;
+}
+
+static size_t widelen(char *data)
+{
+	size_t len = 0;
+	Uint32 *p = (Uint32 *)data;
+	while(*p++) {
+		++len;
+	}
+	return len;
+}
+
+int main(int argc, char *argv[])
+{
+	const char * formats[] = {
+		"UTF8",
+		"UTF-8",
+		"UTF16BE",
+		"UTF-16BE",
+		"UTF16LE",
+		"UTF-16LE",
+		"UTF32BE",
+		"UTF-32BE",
+		"UTF32LE",
+		"UTF-32LE",
+		"UCS4",
+		"UCS-4",
+	};
+	char buffer[BUFSIZ];
+	char *ucs4;
+	char *test[2];
+	int i, j, index = 0;
+	FILE *file;
+	int errors = 0;
+
+	if ( !argv[1] ) {
+		argv[1] = "utf8.txt";
+	}
+	file = fopen(argv[1], "rb");
+	if ( !file ) {
+		fprintf(stderr, "Unable to open %s\n", argv[1]);
+		return (1);
+	}
+
+	while ( fgets(buffer, sizeof(buffer), file) ) {
+		/* Convert to UCS-4 */
+		ucs4 = SDL_iconv_string("UCS-4", "UTF-8", buffer, SDL_strlen(buffer)+1);
+		size_t len = (widelen(ucs4)+1)*4;
+		for ( i = 0; i < SDL_arraysize(formats); ++i ) {
+			if ( (SDL_strncasecmp(formats[i], "UTF16", 5) == 0 ||
+			      SDL_strncasecmp(formats[i], "UTF-16", 6) == 0) &&
+			      !testutf16(ucs4) ) {
+				continue;
+			}
+			test[0] = SDL_iconv_string(formats[i], "UCS-4", ucs4, len);
+			test[1] = SDL_iconv_string("UCS-4", formats[i], test[0], len);
+			if ( SDL_memcmp(test[1], ucs4, len) != 0 ) {
+				fprintf(stderr, "FAIL: %s\n", formats[i]);
+				++errors;
+			}
+			SDL_free(test[0]);
+			SDL_free(test[1]);
+		}
+		test[0] = SDL_iconv_string("UTF-8", "UCS-4", ucs4, len);
+		SDL_free(ucs4);
+		fputs(test[0], stdout);
+		SDL_free(test[0]);
+	}
+	return (errors ? errors + 1 : 0);
+}