X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=4a7596b882b3f6771a233e8750bc847325755820;hb=46d9941a3140ef287a2cd0d4ed48d6d2c279aa5f;hp=7b55f34fab7031abdc39c09feebb2529eec16327;hpb=9dddced581f9ae656eab9b959550eadf5899f939;p=swftools.git

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index 7b55f34..4a7596b 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -21,13 +21,15 @@
    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 = 64;
+static int loadfont_scale = 4;
 static int skip_unused = 1;
+static int full_unicode = 0;
 
-void swf_SetLoadFontParameters(int _scale, int _skip_unused)
+void swf_SetLoadFontParameters(int _scale, int _skip_unused, int _full_unicode)
 {
-    loadfont_scale = _scale;
+    if(_scale) loadfont_scale = _scale;
     skip_unused = _skip_unused;
+    full_unicode = _full_unicode;
 }
 
 #ifdef HAVE_FREETYPE
@@ -39,15 +41,15 @@ void swf_SetLoadFontParameters(int _scale, int _skip_unused)
 #include <freetype/ttnameid.h>
 #include <freetype/ftoutln.h>
 
-#define FT_SCALE loadfont_scale
+#define FT_SCALE 1
 #define FT_SUBPIXELS 64
 
 static int ft_move_to(FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
-    to.x = _to->x/(float)FT_SUBPIXELS;
-    to.y = -_to->y/(float)FT_SUBPIXELS;
+    to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
+    to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
     draw->moveTo(draw, &to);
     return 0;
 }
@@ -55,8 +57,8 @@ static int ft_line_to(FT_Vector* _to, void* user)
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
-    to.x = _to->x/(float)FT_SUBPIXELS;
-    to.y = -_to->y/(float)FT_SUBPIXELS;
+    to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
+    to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
     draw->lineTo(draw, &to);
     return 0;
 }
@@ -64,12 +66,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/(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;
+    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);
     return 0;
 }
@@ -77,10 +79,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/(float)FT_SUBPIXELS;
-    to.y = -_to->y/(float)FT_SUBPIXELS;
-    c.x = _c->x/(float)FT_SUBPIXELS;
-    c.y = -_c->y/(float)FT_SUBPIXELS;
+    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);
     return 0;
 }
@@ -106,6 +108,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     int t;
     int*glyph2glyph;
     FT_Size size;
+    int max_unicode = 0;
    
     if(ftlibrary == 0) {
 	if(FT_Init_FreeType(&ftlibrary)) {
@@ -114,7 +117,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	}
     }
     error = FT_New_Face(ftlibrary, filename, 0, &face);
-    FT_Set_Pixel_Sizes (face, 16*FT_SCALE, 16*FT_SCALE);
+    FT_Set_Pixel_Sizes (face, 16*loadfont_scale, 16*loadfont_scale);
 
     if(error) {
 	fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
@@ -145,9 +148,9 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	memset(font->glyphnames,0,face->num_glyphs*sizeof(char*));
     }
 
-    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->ascent = abs(face->ascender)*FT_SCALE*loadfont_scale*20/FT_SUBPIXELS/2; //face->bbox.xMin;
+    font->layout->descent = abs(face->descender)*FT_SCALE*loadfont_scale*20/FT_SUBPIXELS/2; //face->bbox.xMax;
+    font->layout->leading = font->layout->ascent + font->layout->descent;
     font->layout->kerningcount = 0;
     
     name = FT_Get_Postscript_Name(face);
@@ -181,6 +184,9 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	}
 	charcode = FT_Get_Next_Char(face, charcode, &gindex);
     }
+
+    if(full_unicode)
+	font->maxascii = 65535;
     
     font->ascii2glyph = malloc(font->maxascii*sizeof(int));
     
@@ -190,11 +196,13 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	    g = -1;
 	font->ascii2glyph[t] = g;
 	if(g>=0) {
+	    max_unicode = t+1;
 	    if(!font->glyph2ascii[g]) {
 		font->glyph2ascii[g] = t;
 	    }
 	}
     }
+    font->maxascii = max_unicode;
 
     font->numchars = 0;
 
@@ -258,8 +266,6 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	    continue;
 	}
 
-	draw.finish(&draw);
-
 #if 0
 	if(bbox.xMin > 0) {
 	    font->glyph[font->numchars].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;