X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=ab773630c8f01619435895ca9c117db586b0b581;hb=e7e648cde875031dff11ac56c18779dc7ee2f09f;hp=f8f7707e749c41ad902fe1928e7b6fa4acefe5c1;hpb=c17ea569d3883466bc247f479ab202ff9ce7c638;p=swftools.git

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index f8f7707..ab77363 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -21,6 +21,13 @@
    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;
+
+int swf_SetLoadFontScale(int scale)
+{
+    loadfont_scale = scale;
+}
+
 #ifdef HAVE_FREETYPE
 
 #include <freetype/freetype.h>
@@ -29,7 +36,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,6 +101,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     FT_UInt gindex;
     SWFFONT* font;
     int t;
+    int skipunused = 1;
+    int*glyph2glyph;
    
     if(ftlibrary == 0) {
 	if(FT_Init_FreeType(&ftlibrary)) {
@@ -116,23 +125,22 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     font->layout = malloc(sizeof(SWFLAYOUT));
     memset(font->layout, 0, sizeof(SWFLAYOUT));
     font->layout->bounds = malloc(face->num_glyphs*sizeof(SRECT));
-    font->numchars = face->num_glyphs;
     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 = malloc(face->num_glyphs*sizeof(U16));
     memset(font->glyph2ascii, 0, face->num_glyphs*sizeof(U16));
     font->maxascii = 0;
-    memset(font->ascii2glyph, -1, font->maxascii*sizeof(int));
     font->glyph = malloc(face->num_glyphs*sizeof(SWFGLYPH));
-    memset(font->glyph, 0, face->num_glyphs*sizeof(U16));
+    memset(font->glyph, 0, face->num_glyphs*sizeof(SWFGLYPH));
     if(FT_HAS_GLYPH_NAMES(face)) {
 	font->glyphnames = malloc(face->num_glyphs*sizeof(char*));
+	memset(font->glyphnames,0,face->num_glyphs*sizeof(char*));
     }
 
-    font->layout->ascent = face->ascender; //face->bbox.xMin;
-    font->layout->descent = face->descender; //face->bbox.xMax;
-    font->layout->leading = -face->bbox.xMin;
+    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 = abs(face->bbox.yMin - face->bbox.yMax); //-face->bbox.xMin*20/FT_SUBPIXELS;
     font->layout->kerningcount = 0;
     
     name = FT_Get_Postscript_Name(face);
@@ -170,11 +178,21 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     font->ascii2glyph = malloc(font->maxascii*sizeof(int));
     
     for(t=0;t<font->maxascii;t++) {
-	font->ascii2glyph[t] = FT_Get_Char_Index(face, t);
-	if(!font->ascii2glyph[t])
-	    font->ascii2glyph[t] = -1;
+	int g = FT_Get_Char_Index(face, t);
+	if(!g || g>=face->num_glyphs)
+	    g = -1;
+	font->ascii2glyph[t] = g;
+	if(g>=0) {
+	    if(!font->glyph2ascii[g]) {
+		font->glyph2ascii[g] = t;
+	    }
+	}
     }
 
+    font->numchars = 0;
+
+    glyph2glyph = (int*)malloc(face->num_glyphs*sizeof(int));
+
     for(t=0; t < face->num_glyphs; t++) {
 	FT_Glyph glyph;
 	FT_BBox bbox;
@@ -182,11 +200,17 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	char name[128];
 	drawer_t draw;
 	int ret;
+	char hasname = 0;
 	name[0]=0;
 	if(FT_HAS_GLYPH_NAMES(face)) {
 	    error = FT_Get_Glyph_Name(face, t, name, 127);
-	    if(!error) 
-		font->glyphnames[t] = strdup(name);
+	    if(!error && name[0] && !strstr(name, "notdef")) {
+		font->glyphnames[font->numchars] = strdup(name);
+		hasname = 1;
+	    }
+	}
+	if(!font->glyph2ascii[t] && !hasname && skipunused) {
+	    continue;
 	}
 	error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE);
 	if(error) return 0;
@@ -219,25 +243,38 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
 #if 0
 	if(bbox.xMin > 0) {
-	    font->glyph[t].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;
+	    font->glyph[font->numchars].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;
 	} else {
-	    font->glyph[t].advance = ((bbox.xMax - bbox.xMin)*FT_SCALE)/FT_SUBPIXELS;
+	    font->glyph[font->numchars].advance = ((bbox.xMax - bbox.xMin)*FT_SCALE)/FT_SUBPIXELS;
 	}
 #else
-	font->glyph[t].advance = glyph->advance.x/65536;
+	font->glyph[font->numchars].advance = glyph->advance.x*20/65536;
 #endif
 	
-	font->glyph[t].shape = swf_ShapeDrawerToShape(&draw);
+	font->glyph[font->numchars].shape = swf_ShapeDrawerToShape(&draw);
 	
-	font->layout->bounds[t].xmin = (bbox.xMin*FT_SCALE*20)/FT_SUBPIXELS;
-	font->layout->bounds[t].ymin = (bbox.yMin*FT_SCALE*20)/FT_SUBPIXELS;
-	font->layout->bounds[t].xmax = (bbox.xMax*FT_SCALE*20)/FT_SUBPIXELS;
-	font->layout->bounds[t].ymax = (bbox.yMax*FT_SCALE*20)/FT_SUBPIXELS;
+	font->layout->bounds[font->numchars].xmin = (bbox.xMin*FT_SCALE*20)/FT_SUBPIXELS;
+	font->layout->bounds[font->numchars].ymin = (bbox.yMin*FT_SCALE*20)/FT_SUBPIXELS;
+	font->layout->bounds[font->numchars].xmax = (bbox.xMax*FT_SCALE*20)/FT_SUBPIXELS;
+	font->layout->bounds[font->numchars].ymax = (bbox.yMax*FT_SCALE*20)/FT_SUBPIXELS;
 
 	draw.dealloc(&draw);
 
 	FT_Done_Glyph(glyph);
+	font->glyph2ascii[font->numchars] = font->glyph2ascii[t];
+	glyph2glyph[t] = font->numchars;
+	font->numchars++;
+    }
+    /* notice: if skipunused 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]];
+	}
     }
+    free(glyph2glyph);
 
     FT_Done_Face(face);
     FT_Done_FreeType(ftlibrary);ftlibrary=0;
@@ -300,7 +337,10 @@ SWFFONT* swf_LoadT1Font(char*filename)
     memset(font, 0, sizeof(SWFFONT));
 
     font->version = 2;
-    font->name = (U8*)strdup(fontname);
+    if(fontname) 
+	font->name = (U8*)strdup(fontname);
+    else 
+	font->name = 0;
     font->layout = (SWFLAYOUT*)malloc(sizeof(SWFLAYOUT));
     memset(font->layout, 0, sizeof(SWFLAYOUT));
 
@@ -389,7 +429,7 @@ SWFFONT* swf_LoadT1Font(char*filename)
 	draw.dealloc(&draw);
 	    
 	font->layout->bounds[c] = bbox;
-	font->glyph[c].advance = bbox.xmax/20;
+	font->glyph[c].advance = bbox.xmax;
 	if(!font->glyph[c].advance) {
 	    font->glyph[c].advance = firstx;
 	}
@@ -414,7 +454,7 @@ static int isSWF(const char*filename)
     char a[8];
     if(!fi) {
 	perror(filename);
-	return 0;
+	return -1;
     }
     memset(a, 0, sizeof(a));
     fread(a, 4, 1, fi);
@@ -428,7 +468,10 @@ static int isSWF(const char*filename)
 
 SWFFONT* swf_LoadFont(char*filename)
 {
-    if(isSWF(filename)) {
+    int is_swf = isSWF(filename);
+    if(is_swf<0)
+	return 0;
+    if(is_swf) {
 	return swf_ReadFont(filename);
     }
 #if defined(HAVE_FREETYPE)
@@ -436,7 +479,7 @@ SWFFONT* swf_LoadFont(char*filename)
 #elif defined(HAVE_T1LIB)
     return swf_LoadT1Font(filename);
 #else
-    fprintf(stderr, "Error: Neither T1lib nor FreeType support compiled in. Could not load %s\n", infile);
+    fprintf(stderr, "Error: Neither T1lib nor FreeType support compiled in. Could not load %s\n", filename);
     return 0;
 #endif
 }