|
 |
e5179ca |
diff -up alfont-2.0.9/include/alfont.h.linux alfont-2.0.9/include/alfont.h
|
|
|
e5179ca |
--- alfont-2.0.9/include/alfont.h.linux 2009-02-01 23:52:34.000000000 +0100
|
|
|
e5179ca |
+++ alfont-2.0.9/include/alfont.h 2012-07-04 17:54:36.934125374 +0200
|
|
|
e5179ca |
@@ -10,9 +10,9 @@
|
|
|
e5179ca |
/* See FTL.txt (FreeType Project License) for license */
|
|
|
e5179ca |
|
|
|
e5179ca |
|
|
|
e5179ca |
-#define ALFONT_WINDOWS //When compiling in WINDOWS,please uncomment this line.
|
|
|
e5179ca |
+//#define ALFONT_WINDOWS //When compiling in WINDOWS,please uncomment this line.
|
|
|
e5179ca |
//#define ALFONT_DOS //When compiling in DOS,please uncomment this line.
|
|
|
e5179ca |
-//#define ALFONT_LINUX //When compiling in LINUX,please uncomment this line.
|
|
|
e5179ca |
+#define ALFONT_LINUX //When compiling in LINUX,please uncomment this line.
|
|
|
e5179ca |
|
|
|
e5179ca |
|
|
|
e5179ca |
#ifndef ALFONT_H
|
|
|
e5179ca |
@@ -468,4 +468,4 @@ TDS565
|
|
|
e5179ca |
|
|
|
e5179ca |
Platform specifics
|
|
|
e5179ca |
RISCOS-LATIN1
|
|
|
e5179ca |
-*/
|
|
|
e5179ca |
\ No newline at end of file
|
|
|
e5179ca |
+*/
|
|
|
e5179ca |
diff -up alfont-2.0.9/src/alfont.c.linux alfont-2.0.9/src/alfont.c
|
|
|
e5179ca |
--- alfont-2.0.9/src/alfont.c.linux 2009-02-04 22:40:24.000000000 +0100
|
|
|
e5179ca |
+++ alfont-2.0.9/src/alfont.c 2012-07-05 12:09:47.299021581 +0200
|
|
|
e5179ca |
@@ -468,7 +468,7 @@ ALFONT_FONT *alfont_load_font(const char
|
|
|
e5179ca |
alfont_set_char_extra_spacing(font, 0);
|
|
|
e5179ca |
|
|
|
e5179ca |
//Initial Font attribute
|
|
|
e5179ca |
- font->language=""; /* Initial Language */
|
|
|
e5179ca |
+ font->language=NULL; /* Initial Language */
|
|
|
e5179ca |
font->type=0; /* Initial Code Convert */
|
|
|
e5179ca |
font->outline_top=0; /* Initial Font top outline width */
|
|
|
e5179ca |
font->outline_bottom=0; /* Initial Font bottom outline width */
|
|
|
e5179ca |
@@ -548,7 +548,7 @@ ALFONT_FONT *alfont_load_font_from_mem(c
|
|
|
e5179ca |
alfont_set_char_extra_spacing(font, 0);
|
|
|
e5179ca |
|
|
|
e5179ca |
//Initial Font attribute
|
|
|
e5179ca |
- font->language=""; /* Initial Language */
|
|
|
e5179ca |
+ font->language=NULL; /* Initial Language */
|
|
|
e5179ca |
font->type=0; /* Initial Code Convert */
|
|
|
e5179ca |
font->outline_top=0; /* Initial Font top outline width */
|
|
|
e5179ca |
font->outline_bottom=0; /* Initial Font bottom outline width */
|
|
|
e5179ca |
@@ -4823,12 +4823,13 @@ void alfont_set_char_extra_spacing(ALFON
|
|
|
e5179ca |
|
|
|
e5179ca |
|
|
|
e5179ca |
void alfont_set_language(ALFONT_FONT *f, const char *language) {
|
|
|
e5179ca |
+ free(f->language);
|
|
|
e5179ca |
if (language == NULL) {
|
|
|
e5179ca |
f->language = NULL;
|
|
|
e5179ca |
}
|
|
|
e5179ca |
else
|
|
|
e5179ca |
{
|
|
|
e5179ca |
- f->language=(char *)malloc(strlen(language)*sizeof(char));
|
|
|
e5179ca |
+ f->language=(char *)malloc((strlen(language)+1)*sizeof(char));
|
|
|
e5179ca |
strcpy(f->language,language);
|
|
|
e5179ca |
}
|
|
|
e5179ca |
}
|