git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added more graceful error handling.
[swftools.git]
/
lib
/
modules
/
swffont.c
diff --git
a/lib/modules/swffont.c
b/lib/modules/swffont.c
index
bfaa1a4
..
ba73409
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) {
@@
-108,8
+117,10
@@
SWFFONT* swf_LoadTrueTypeFont(char*filename)
fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
return 0;
}
fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
return 0;
}
- if(face->num_glyphs <= 0)
+ if(face->num_glyphs <= 0) {
+ fprintf(stderr, "File %s contains %d glyphs\n", face->num_glyphs);
return 0;
return 0;
+ }
font = malloc(sizeof(SWFFONT));
memset(font, 0, sizeof(SWFFONT));
font = malloc(sizeof(SWFFONT));
memset(font, 0, sizeof(SWFFONT));
@@
-202,13
+213,19
@@
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);
- if(error) return 0;
+ if(error) {
+ fprintf(stderr, "Couldn't load glyph %d\n", t);
+ continue;
+ }
error = FT_Get_Glyph(face->glyph, &glyph);
error = FT_Get_Glyph(face->glyph, &glyph);
- if(error) return 0;
+ if(error) {
+ fprintf(stderr, "Couldn't get glyph %d\n", t);
+ continue;
+ }
FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
bbox.yMin = -bbox.yMin;
FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
bbox.yMin = -bbox.yMin;
@@
-230,7
+247,13
@@
SWFFONT* swf_LoadTrueTypeFont(char*filename)
//error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
//error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
- if(error) return 0;
+ draw.finish(&draw);
+
+ if(error) {
+ fprintf(stderr, "Couldn't decompose glyph %d\n", t);
+ draw.dealloc(&draw);
+ continue;
+ }
draw.finish(&draw);
draw.finish(&draw);
@@
-258,7
+281,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 */
@@
-290,6
+313,8
@@
SWFFONT* swf_LoadTrueTypeFont(char*filename)
static int t1lib_initialized = 0;
static int t1lib_initialized = 0;
+static int counter = 0;
+
SWFFONT* swf_LoadT1Font(char*filename)
{
SWFFONT * font;
SWFFONT* swf_LoadT1Font(char*filename)
{
SWFFONT * font;
@@
-441,6
+466,13
@@
SWFFONT* swf_LoadT1Font(char*filename)
#endif
#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");
static int isSWF(const char*filename)
{
FILE*fi = fopen(filename, "rb");
@@
-461,7
+493,10
@@
static int isSWF(const char*filename)
SWFFONT* swf_LoadFont(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) {
if(is_swf<0)
return 0;
if(is_swf) {