along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef USE_FREETYPE
+#ifdef HAVE_FREETYPE
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
return font;
}
-#else //USE_FREETYPE
+#else //HAVE_FREETYPE
SWFFONT* swf_LoadTrueTypeFont(char*filename)
{
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));
char a[8];
if(!fi) {
perror(filename);
- return 0;
+ return -1;
}
memset(a, 0, sizeof(a));
fread(a, 4, 1, fi);
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(USE_FREETYPE)
+#if defined(HAVE_FREETYPE)
return swf_LoadTrueTypeFont(filename);
#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
}