git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed swf_LoadFontSetScale to swf_LoadFontSetParameters.
[swftools.git]
/
lib
/
modules
/
swffont.c
diff --git
a/lib/modules/swffont.c
b/lib/modules/swffont.c
index
d039ae4
..
c957878
100644
(file)
--- 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 */
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>
#ifdef HAVE_FREETYPE
#include <freetype/freetype.h>
@@
-29,7
+39,7
@@
#include <freetype/ttnameid.h>
#include <freetype/ftoutln.h>
#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)
#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;
FT_UInt gindex;
SWFFONT* font;
int t;
- int skipunused = 1;
int*glyph2glyph;
if(ftlibrary == 0) {
int*glyph2glyph;
if(ftlibrary == 0) {
@@
-133,7
+142,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->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);
font->layout->kerningcount = 0;
name = FT_Get_Postscript_Name(face);
@@
-202,7
+211,7
@@
SWFFONT* swf_LoadTrueTypeFont(char*filename)
hasname = 1;
}
}
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);
continue;
}
error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE);
@@
-258,7
+267,7
@@
SWFFONT* swf_LoadTrueTypeFont(char*filename)
glyph2glyph[t] = font->numchars;
font->numchars++;
}
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 */
have more memory allocated than just font->numchars, but only the first font->numchars
are used/valid */