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

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index 7ed72ed..abfc0c1 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -21,6 +21,16 @@
    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 skip_unused = 1;
+
+// TODO: should be named "setLoadFontParameters"
+void swf_SetLoadFontParameters(int _scale, int _skip_unused)
+{
+    loadfont_scale = _scale;
+    skip_unused = _skip_unused;
+}
+
 #ifdef HAVE_FREETYPE
 
 #include <freetype/freetype.h>
@@ -29,7 +39,7 @@
 #include <freetype/ttnameid.h>
 #include <freetype/ftoutln.h>
 
-#define FT_SCALE 1
+#define FT_SCALE loadfont_scale
 #define FT_SUBPIXELS 64
 
 static int ft_move_to(FT_Vector* _to, void* user) 
@@ -94,7 +104,6 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     FT_UInt gindex;
     SWFFONT* font;
     int t;
-    int skipunused = 1;
     int*glyph2glyph;
    
     if(ftlibrary == 0) {
@@ -108,8 +117,10 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
 	return 0;
     }
-    if(face->num_glyphs <= 0)
+    if(face->num_glyphs <= 0) {
+	fprintf(stderr, "File %s contains %d glyphs\n", face->num_glyphs);
 	return 0;
+    }
 
     font = malloc(sizeof(SWFFONT));
     memset(font, 0, sizeof(SWFFONT));
@@ -133,7 +144,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
     font->layout->ascent = face->ascender*20/FT_SUBPIXELS; //face->bbox.xMin;
     font->layout->descent = abs(face->descender)*20/FT_SUBPIXELS; //face->bbox.xMax;
-    font->layout->leading = -face->bbox.xMin*20/FT_SUBPIXELS;
+    font->layout->leading = abs(face->bbox.yMin - face->bbox.yMax); //-face->bbox.xMin*20/FT_SUBPIXELS;
     font->layout->kerningcount = 0;
     
     name = FT_Get_Postscript_Name(face);
@@ -202,13 +213,19 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 		hasname = 1;
 	    }
 	}
-	if(!font->glyph2ascii[t] && !hasname && skipunused) {
+	if(!font->glyph2ascii[t] && !hasname && skip_unused) {
 	    continue;
 	}
 	error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE);
-	if(error) return 0;
+	if(error) {
+	    fprintf(stderr, "Couldn't load glyph %d\n", t);
+	    continue;
+	}
 	error = FT_Get_Glyph(face->glyph, &glyph);
-	if(error) return 0;
+	if(error) {
+	    fprintf(stderr, "Couldn't get glyph %d\n", t);
+	    continue;
+	}
 
 	FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
 	bbox.yMin = -bbox.yMin;
@@ -230,7 +247,13 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
 	//error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
 	error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
-	if(error) return 0;
+	draw.finish(&draw);
+	
+	if(error) {
+	    fprintf(stderr, "Couldn't decompose glyph %d\n", t);
+	    draw.dealloc(&draw);
+	    continue;
+	}
 
 	draw.finish(&draw);
 
@@ -256,17 +279,15 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	FT_Done_Glyph(glyph);
 	font->glyph2ascii[font->numchars] = font->glyph2ascii[t];
 	glyph2glyph[t] = font->numchars;
-	printf("%d %d\n", t, glyph2glyph[t]);
 	font->numchars++;
     }
-    /* notice: if skipunused is true, font->glyph2ascii, font->glyphnames and font->layout->bounds will 
+    /* notice: if skip_unused is true, font->glyph2ascii, font->glyphnames and font->layout->bounds will 
 	       have more memory allocated than just font->numchars, but only the first font->numchars 
 	       are used/valid */
 
     for(t=0;t<font->maxascii;t++) {
 	if(font->ascii2glyph[t]>=0) {
 	    font->ascii2glyph[t] = glyph2glyph[font->ascii2glyph[t]];
-	    printf("ascii %d -> glyph %d\n", t, font->ascii2glyph[t]);
 	}
     }
     free(glyph2glyph);
@@ -292,6 +313,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
 static int t1lib_initialized = 0;
 
+static int counter = 0;
+
 SWFFONT* swf_LoadT1Font(char*filename)
 {
     SWFFONT * font;
@@ -300,7 +323,6 @@ SWFFONT* swf_LoadT1Font(char*filename)
     char*fontname,*fullname,*familyname;
     BBox bbox;
     int s,num;
-    char*encoding[256];
     char**charnames;
     char**charname;
     int c;
@@ -316,9 +338,6 @@ SWFFONT* swf_LoadT1Font(char*filename)
     nr = T1_AddFont(filename);
     T1_LoadFont(nr);
 
-    num = T1_SetDefaultEncoding(encoding);
-    for(;num<256;num++) encoding[num] = 0;
-
     charnames = T1_GetAllCharNames(nr);
 
     angle = T1_GetItalicAngle(nr);
@@ -443,6 +462,13 @@ SWFFONT* swf_LoadT1Font(char*filename)
 
 #endif
 
+SWFFONT* swf_DummyFont()
+{
+    SWFFONT*font = (SWFFONT*)malloc(sizeof(SWFFONT));
+    memset(font, 0, sizeof(SWFFONT));
+    return font;
+}
+
 static int isSWF(const char*filename)
 {
     FILE*fi = fopen(filename, "rb");
@@ -463,7 +489,10 @@ static int isSWF(const char*filename)
 
 SWFFONT* swf_LoadFont(char*filename)
 {
-    int is_swf = isSWF(filename);
+    int is_swf;
+    if(filename == 0)
+	return swf_DummyFont();
+    is_swf = isSWF(filename);
     if(is_swf<0)
 	return 0;
     if(is_swf) {