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

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index ab77363..49c5677 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -22,10 +22,13 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 static int loadfont_scale = 1;
+static int skip_unused = 1;
 
-int swf_SetLoadFontScale(int scale)
+// TODO: should be named "setLoadFontParameters"
+void swf_SetLoadFontParameters(int _scale, int _skip_unused)
 {
-    loadfont_scale = scale;
+    loadfont_scale = _scale;
+    skip_unused = _skip_unused;
 }
 
 #ifdef HAVE_FREETYPE
@@ -101,7 +104,6 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     FT_UInt gindex;
     SWFFONT* font;
     int t;
-    int skipunused = 1;
     int*glyph2glyph;
    
     if(ftlibrary == 0) {
@@ -209,7 +211,7 @@ 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);
@@ -265,7 +267,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	glyph2glyph[t] = font->numchars;
 	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 */
 
@@ -297,6 +299,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
 static int t1lib_initialized = 0;
 
+static int counter = 0;
+
 SWFFONT* swf_LoadT1Font(char*filename)
 {
     SWFFONT * font;
@@ -448,6 +452,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");
@@ -468,7 +479,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) {