git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed negative width/height bug
[swftools.git]
/
lib
/
modules
/
swffont.c
diff --git
a/lib/modules/swffont.c
b/lib/modules/swffont.c
index
6344fd3
..
4a951a9
100644
(file)
--- a/
lib/modules/swffont.c
+++ b/
lib/modules/swffont.c
@@
-51,6
+51,11
@@
void swf_SetLoadFontParameters(int _scale, int _skip_unused, int _full_unicode)
#include <freetype/ftoutln.h>
#endif
#include <freetype/ftoutln.h>
#endif
+/* Setting subpixels to 64 also means that the "point size" of the
+ font outlines will be 64. So the font, when rendered at original
+ size (i.e., the swf fontsize is 1024) will have the same size as
+ if it was rendered at 64pt */
+
#define FT_SCALE 1
#define FT_SUBPIXELS 64
#define FT_SCALE 1
#define FT_SUBPIXELS 64
@@
-289,9
+294,9
@@
SWFFONT* swf_LoadTrueTypeFont(char*filename)
#if 0
if(bbox.xMin > 0) {
#if 0
if(bbox.xMin > 0) {
- font->glyph[font->numchars].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;
+ font->glyph[font->numchars].advance = (bbox.xMax*20*FT_SCALE)/FT_SUBPIXELS;
} else {
} else {
- font->glyph[font->numchars].advance = ((bbox.xMax - bbox.xMin)*FT_SCALE)/FT_SUBPIXELS;
+ font->glyph[font->numchars].advance = ((bbox.xMax - bbox.xMin)*20*FT_SCALE)/FT_SUBPIXELS;
}
#else
font->glyph[font->numchars].advance = glyph->advance.x*20/65536;
}
#else
font->glyph[font->numchars].advance = glyph->advance.x*20/65536;