X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=df231e711b1c7f8aef89e52ee872ef8ea3caa60f;hb=91cad7c2baf4d257bd97bcea1244937c21c083cd;hp=47cd20aa68349eaa3231b61cd7497061bfae4d7a;hpb=0d5377bcf397d284c9c0fadc7102e6e000d17157;p=swftools.git

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index 47cd20a..df231e7 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -21,6 +21,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include "../rfxswf.h"
+
 static int loadfont_scale = 4;
 static int skip_unused = 1;
 static int full_unicode = 0;
@@ -59,7 +63,7 @@ void swf_SetLoadFontParameters(int _scale, int _skip_unused, int _full_unicode)
 #define FT_SCALE 1
 #define FT_SUBPIXELS 64
 
-static int ft_move_to(FT_Vector* _to, void* user) 
+static int ft_move_to(const FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
@@ -68,7 +72,7 @@ static int ft_move_to(FT_Vector* _to, void* user)
     draw->moveTo(draw, &to);
     return 0;
 }
-static int ft_line_to(FT_Vector* _to, void* user) 
+static int ft_line_to(const FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
@@ -77,28 +81,28 @@ static int ft_line_to(FT_Vector* _to, void* user)
     draw->lineTo(draw, &to);
     return 0;
 }
-static int ft_cubic_to(FT_Vector* _c1, FT_Vector* _c2, FT_Vector* _to, void* user)
+static int ft_conic_to(const FT_Vector* _c, const FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
-    FPOINT c1,c2,to;
+    FPOINT c,to;
     to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
     to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c1.x = _c1->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c1.y = -_c1->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c2.x = _c2->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c2.y = -_c2->y*FT_SCALE/(float)FT_SUBPIXELS;
-    draw_cubicTo(draw, &c1, &c2, &to);
+    c.x = _c->x*FT_SCALE/(float)FT_SUBPIXELS;
+    c.y = -_c->y*FT_SCALE/(float)FT_SUBPIXELS;
+    draw_conicTo(draw, &c, &to);
     return 0;
 }
-static int ft_conic_to(FT_Vector* _c, FT_Vector* _to, void* user) 
+static int ft_cubic_to(const FT_Vector* _c1, const FT_Vector* _c2, const FT_Vector* _to, void* user)
 {
     drawer_t* draw = (drawer_t*)user;
-    FPOINT c,to;
+    FPOINT c1,c2,to;
     to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
     to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c.x = _c->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c.y = -_c->y*FT_SCALE/(float)FT_SUBPIXELS;
-    draw_conicTo(draw, &c, &to);
+    c1.x = _c1->x*FT_SCALE/(float)FT_SUBPIXELS;
+    c1.y = -_c1->y*FT_SCALE/(float)FT_SUBPIXELS;
+    c2.x = _c2->x*FT_SCALE/(float)FT_SUBPIXELS;
+    c2.y = -_c2->y*FT_SCALE/(float)FT_SUBPIXELS;
+    draw_cubicTo(draw, &c1, &c2, &to);
     return 0;
 }
 static FT_Outline_Funcs outline_functions =
@@ -122,7 +126,6 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     SWFFONT* font;
     int t;
     int*glyph2glyph;
-    FT_Size size;
     int max_unicode = 0;
     int charmap = -1;
 
@@ -146,19 +149,19 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	return 0;
     }
 
-    font = rfx_calloc(sizeof(SWFFONT));
+    font = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
     font->id = -1;
     font->version = 2;
-    font->layout = rfx_calloc(sizeof(SWFLAYOUT));
-    font->layout->bounds = rfx_calloc(face->num_glyphs*sizeof(SRECT));
+    font->layout = (SWFLAYOUT*)rfx_calloc(sizeof(SWFLAYOUT));
+    font->layout->bounds = (SRECT*)rfx_calloc(face->num_glyphs*sizeof(SRECT));
     font->style =  ((face->style_flags&FT_STYLE_FLAG_ITALIC)?FONT_STYLE_ITALIC:0)
 	          |((face->style_flags&FT_STYLE_FLAG_BOLD)?FONT_STYLE_BOLD:0);
     font->encoding = FONT_ENCODING_UNICODE;
-    font->glyph2ascii = rfx_calloc(face->num_glyphs*sizeof(U16));
+    font->glyph2ascii = (U16*)rfx_calloc(face->num_glyphs*sizeof(U16));
     font->maxascii = 0;
-    font->glyph = rfx_calloc(face->num_glyphs*sizeof(SWFGLYPH));
+    font->glyph = (SWFGLYPH*)rfx_calloc(face->num_glyphs*sizeof(SWFGLYPH));
     if(FT_HAS_GLYPH_NAMES(face)) {
-	font->glyphnames = rfx_calloc(face->num_glyphs*sizeof(char*));
+	font->glyphnames = (char**)rfx_calloc(face->num_glyphs*sizeof(char*));
     }
 
     font->layout->ascent = abs(face->ascender)*FT_SCALE*loadfont_scale*20/FT_SUBPIXELS/2; //face->bbox.xMin;
@@ -166,7 +169,9 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     font->layout->leading = font->layout->ascent + font->layout->descent;
     font->layout->kerningcount = 0;
     
-    name = FT_Get_Postscript_Name(face);
+    name = face->family_name;
+    if(!(name && *name))
+        name = FT_Get_Postscript_Name(face);
     if(name && *name)
 	font->name = (U8*)strdup(name);
 
@@ -216,7 +221,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     if(full_unicode)
 	font->maxascii = 65535;
     
-    font->ascii2glyph = rfx_calloc(font->maxascii*sizeof(int));
+    font->ascii2glyph = (int*)rfx_calloc(font->maxascii*sizeof(int));
     
     for(t=0;t<font->maxascii;t++) {
 	int g = FT_Get_Char_Index(face, t);
@@ -239,10 +244,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     for(t=0; t < face->num_glyphs; t++) {
 	FT_Glyph glyph;
 	FT_BBox bbox;
-	FT_Matrix matrix;
 	char name[128];
 	drawer_t draw;
-	int ret;
 	char hasname = 0;
 	name[0]=0;
 	if(FT_HAS_GLYPH_NAMES(face)) {
@@ -495,9 +498,7 @@ SWFFONT* swf_LoadT1Font(char*filename)
 	    }
 	    last = pos;
 	    outline = outline->link;
-	    printf("t1lib: (%f,%f) ", pos.x, pos.y);
 	}
-	printf("\n");
 	
 	draw.finish(&draw);