[Wesnoth-cvs-commits] wesnoth/src/sdl_ttf SDL_ttf.c SDL_ttf.h

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      04/11/18 19:22:59

Modified files:
        src/sdl_ttf    : SDL_ttf.c SDL_ttf.h 

Log message:
        Syncing our SDL_ttf copy with the official SDL_ttf CVS (Now with Wesnoth
        patches included :))

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sdl_ttf/SDL_ttf.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sdl_ttf/SDL_ttf.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: wesnoth/src/sdl_ttf/SDL_ttf.c
diff -u wesnoth/src/sdl_ttf/SDL_ttf.c:1.3 wesnoth/src/sdl_ttf/SDL_ttf.c:1.4
--- wesnoth/src/sdl_ttf/SDL_ttf.c:1.3   Sat Oct 30 20:50:23 2004
+++ wesnoth/src/sdl_ttf/SDL_ttf.c       Thu Nov 18 19:22:59 2004
@@ -20,7 +20,7 @@
     address@hidden
 */
 
-/* $Id: SDL_ttf.c,v 1.3 2004/10/30 20:50:23 gruikya Exp $ */
+/* $Id: SDL_ttf.c,v 1.4 2004/11/18 19:22:59 gruikya Exp $ */
 
 #include <math.h>
 #include <stdio.h>
@@ -697,12 +697,12 @@
                        ch |=  (Uint16)(utf8[++i]&0x3F);
                } else
                if ( ch >= 0xE0 ) {
-                       ch  =  (Uint16)(utf8[i]&0x3F) << 12;
+                       ch  =  (Uint16)(utf8[i]&0x0F) << 12;
                        ch |=  (Uint16)(utf8[++i]&0x3F) << 6;
                        ch |=  (Uint16)(utf8[++i]&0x3F);
                } else
                if ( ch >= 0xC0 ) {
-                       ch  =  (Uint16)(utf8[i]&0x3F) << 6;
+                       ch  =  (Uint16)(utf8[i]&0x1F) << 6;
                        ch |=  (Uint16)(utf8[++i]&0x3F);
                }
                unicode[j] = ch;
Index: wesnoth/src/sdl_ttf/SDL_ttf.h
diff -u wesnoth/src/sdl_ttf/SDL_ttf.h:1.1 wesnoth/src/sdl_ttf/SDL_ttf.h:1.2
--- wesnoth/src/sdl_ttf/SDL_ttf.h:1.1   Tue Oct 26 19:03:55 2004
+++ wesnoth/src/sdl_ttf/SDL_ttf.h       Thu Nov 18 19:22:59 2004
@@ -20,7 +20,7 @@
     address@hidden
 */
 
-/* $Id: SDL_ttf.h,v 1.1 2004/10/26 19:03:55 gruikya Exp $ */
+/* $Id: SDL_ttf.h,v 1.2 2004/11/18 19:22:59 gruikya Exp $ */
 
 /* This library is a wrapper around the excellent FreeType 2.0 library,
    available at: