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 gcc 2.95.3 compile problem
[swftools.git]
/
lib
/
modules
/
swffont.c
diff --git
a/lib/modules/swffont.c
b/lib/modules/swffont.c
index
f8f7707
..
9a572e1
100644
(file)
--- a/
lib/modules/swffont.c
+++ b/
lib/modules/swffont.c
@@
-300,7
+300,10
@@
SWFFONT* swf_LoadT1Font(char*filename)
memset(font, 0, sizeof(SWFFONT));
font->version = 2;
memset(font, 0, sizeof(SWFFONT));
font->version = 2;
- font->name = (U8*)strdup(fontname);
+ if(fontname)
+ font->name = (U8*)strdup(fontname);
+ else
+ font->name = 0;
font->layout = (SWFLAYOUT*)malloc(sizeof(SWFLAYOUT));
memset(font->layout, 0, sizeof(SWFLAYOUT));
font->layout = (SWFLAYOUT*)malloc(sizeof(SWFLAYOUT));
memset(font->layout, 0, sizeof(SWFLAYOUT));
@@
-414,7
+417,7
@@
static int isSWF(const char*filename)
char a[8];
if(!fi) {
perror(filename);
char a[8];
if(!fi) {
perror(filename);
- return 0;
+ return -1;
}
memset(a, 0, sizeof(a));
fread(a, 4, 1, fi);
}
memset(a, 0, sizeof(a));
fread(a, 4, 1, fi);
@@
-428,7
+431,10
@@
static int isSWF(const char*filename)
SWFFONT* swf_LoadFont(char*filename)
{
SWFFONT* swf_LoadFont(char*filename)
{
- if(isSWF(filename)) {
+ int is_swf = isSWF(filename);
+ if(is_swf<0)
+ return 0;
+ if(is_swf) {
return swf_ReadFont(filename);
}
#if defined(HAVE_FREETYPE)
return swf_ReadFont(filename);
}
#if defined(HAVE_FREETYPE)
@@
-436,7
+442,7
@@
SWFFONT* swf_LoadFont(char*filename)
#elif defined(HAVE_T1LIB)
return swf_LoadT1Font(filename);
#else
#elif defined(HAVE_T1LIB)
return swf_LoadT1Font(filename);
#else
- fprintf(stderr, "Error: Neither T1lib nor FreeType support compiled in. Could not load %s\n", infile);
+ fprintf(stderr, "Error: Neither T1lib nor FreeType support compiled in. Could not load %s\n", filename);
return 0;
#endif
}
return 0;
#endif
}