static FT_Library ftlibrary = 0;
-SWFFONT* swf_LoadTrueTypeFont(char*filename)
+SWFFONT* swf_LoadTrueTypeFont(const char*filename)
{
FT_Face face;
FT_Error error;
//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->ascent = -fontbbox.ymin;
- if(font->layout->ascent < 0)
+ if(-fontbbox.ymin < 0)
font->layout->ascent = 0;
- font->layout->descent = fontbbox.ymax;
- if(font->layout->descent < 0)
+ else
+ font->layout->ascent = -fontbbox.ymin;
+
+ if(-fontbbox.ymax < 0)
font->layout->descent = 0;
+ else
+ font->layout->descent = -fontbbox.ymax;
+
font->layout->leading = fontbbox.ymax - fontbbox.ymin;
/* notice: if skip_unused is true, font->glyph2ascii, font->glyphnames and font->layout->bounds will
}
#else //HAVE_FREETYPE
-SWFFONT* swf_LoadTrueTypeFont(char*filename)
+SWFFONT* swf_LoadTrueTypeFont(const char*filename)
{
fprintf(stderr, "Warning: no freetype library- not able to load %s\n", filename);
return 0;
static int counter = 0;
-SWFFONT* swf_LoadT1Font(char*filename)
+SWFFONT* swf_LoadT1Font(const char*filename)
{
SWFFONT * font;
int nr;
#else
-SWFFONT* swf_LoadT1Font(char*filename)
+SWFFONT* swf_LoadT1Font(const char*filename)
{
fprintf(stderr, "Warning: no t1lib- not able to load %s\n", filename);
return 0;
return 0;
}
-SWFFONT* swf_LoadFont(char*filename)
+SWFFONT* swf_LoadFont(const char*filename)
{
int is_swf;
if(filename == 0)