X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=lib%2Fmodules%2Fswffont.c;h=7b55f34fab7031abdc39c09feebb2529eec16327;hb=9dddced581f9ae656eab9b959550eadf5899f939;hp=abfc0c1a7706953aa44c9d6d9d26f6f78fbec158;hpb=04fa5bf01c7a0ade51ed92f423ae6831ed765195;p=swftools.git

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index abfc0c1..7b55f34 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -21,10 +21,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-static int loadfont_scale = 1;
+static int loadfont_scale = 64;
 static int skip_unused = 1;
 
-// TODO: should be named "setLoadFontParameters"
 void swf_SetLoadFontParameters(int _scale, int _skip_unused)
 {
     loadfont_scale = _scale;
@@ -35,6 +34,7 @@ void swf_SetLoadFontParameters(int _scale, int _skip_unused)
 
 #include <freetype/freetype.h>
 #include <freetype/ftglyph.h>
+#include <freetype/ftsizes.h>
 #include <freetype/ftsnames.h>
 #include <freetype/ttnameid.h>
 #include <freetype/ftoutln.h>
@@ -46,8 +46,8 @@ static int ft_move_to(FT_Vector* _to, void* user)
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
-    to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
-    to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
+    to.x = _to->x/(float)FT_SUBPIXELS;
+    to.y = -_to->y/(float)FT_SUBPIXELS;
     draw->moveTo(draw, &to);
     return 0;
 }
@@ -55,8 +55,8 @@ static int ft_line_to(FT_Vector* _to, void* user)
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
-    to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
-    to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
+    to.x = _to->x/(float)FT_SUBPIXELS;
+    to.y = -_to->y/(float)FT_SUBPIXELS;
     draw->lineTo(draw, &to);
     return 0;
 }
@@ -64,12 +64,12 @@ static int ft_cubic_to(FT_Vector* _c1, FT_Vector* _c2, FT_Vector* _to, void* use
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT c1,c2,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;
+    to.x = _to->x/(float)FT_SUBPIXELS;
+    to.y = -_to->y/(float)FT_SUBPIXELS;
+    c1.x = _c1->x/(float)FT_SUBPIXELS;
+    c1.y = -_c1->y/(float)FT_SUBPIXELS;
+    c2.x = _c2->x/(float)FT_SUBPIXELS;
+    c2.y = -_c2->y/(float)FT_SUBPIXELS;
     draw_cubicTo(draw, &c1, &c2, &to);
     return 0;
 }
@@ -77,10 +77,10 @@ static int ft_conic_to(FT_Vector* _c, FT_Vector* _to, void* user)
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT c,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;
+    to.x = _to->x/(float)FT_SUBPIXELS;
+    to.y = -_to->y/(float)FT_SUBPIXELS;
+    c.x = _c->x/(float)FT_SUBPIXELS;
+    c.y = -_c->y/(float)FT_SUBPIXELS;
     draw_conicTo(draw, &c, &to);
     return 0;
 }
@@ -105,6 +105,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     SWFFONT* font;
     int t;
     int*glyph2glyph;
+    FT_Size size;
    
     if(ftlibrary == 0) {
 	if(FT_Init_FreeType(&ftlibrary)) {
@@ -113,6 +114,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	}
     }
     error = FT_New_Face(ftlibrary, filename, 0, &face);
+    FT_Set_Pixel_Sizes (face, 16*FT_SCALE, 16*FT_SCALE);
+
     if(error) {
 	fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
 	return 0;
@@ -216,14 +219,14 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	if(!font->glyph2ascii[t] && !hasname && skip_unused) {
 	    continue;
 	}
-	error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE);
+	error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP);
 	if(error) {
-	    fprintf(stderr, "Couldn't load glyph %d\n", t);
+	    fprintf(stderr, "Couldn't load glyph %d, error:%d\n", t, error);
 	    continue;
 	}
 	error = FT_Get_Glyph(face->glyph, &glyph);
 	if(error) {
-	    fprintf(stderr, "Couldn't get glyph %d\n", t);
+	    fprintf(stderr, "Couldn't get glyph %d, error:%d\n", t, error);
 	    continue;
 	}
 
@@ -325,7 +328,9 @@ SWFFONT* swf_LoadT1Font(char*filename)
     int s,num;
     char**charnames;
     char**charname;
+    char*encoding[256];
     int c;
+    int t;
 
     if(!t1lib_initialized) {
 	T1_SetBitmapPad(16);
@@ -339,6 +344,10 @@ SWFFONT* swf_LoadT1Font(char*filename)
     T1_LoadFont(nr);
 
     charnames = T1_GetAllCharNames(nr);
+    if(!charnames) {
+	fprintf(stderr, "No Charnames record- not a Type1 Font?\n");
+	return 0;
+    }
 
     angle = T1_GetItalicAngle(nr);
     fontname = T1_GetFontName(nr);
@@ -362,8 +371,16 @@ SWFFONT* swf_LoadT1Font(char*filename)
     charname = charnames;
     while(*charname) {
 	charname++;
+	if(num<256) {
+	    if(*charname) encoding[num] = strdup(*charname);
+	    else          encoding[num] = strdup(".notdef");
+	}
 	num++;
     }
+    for(t=num;t<256;t++)
+	encoding[t] = strdup(".notdef");
+    
+    //T1_ReencodeFont(nr, encoding);
 
     font->maxascii = num;
     font->numchars = num;
@@ -434,7 +451,9 @@ SWFFONT* swf_LoadT1Font(char*filename)
 	    }
 	    last = pos;
 	    outline = outline->link;
+	    printf("(%f,%f) ", pos.x, pos.y);
 	}
+	printf("\n");
 	
 	draw.finish(&draw);
 
@@ -449,6 +468,10 @@ SWFFONT* swf_LoadT1Font(char*filename)
 	}
 	charname++;
     }
+    T1_DeleteFont(nr);
+
+    for(t=0;t<256;t++)
+	free(encoding[t]);
     return font;
 }
 
@@ -498,6 +521,7 @@ SWFFONT* swf_LoadFont(char*filename)
     if(is_swf) {
 	return swf_ReadFont(filename);
     }
+
 #if defined(HAVE_FREETYPE)
     return swf_LoadTrueTypeFont(filename);
 #elif defined(HAVE_T1LIB)