DEBUG((DBG_TYPE1, "(t1) %s: found `%s' (cached)\n",
name, info.fullfile));
/* this is a cached lookup */
- return xstrdup(info.fullfile);
+ return mdvi_strdup(info.fullfile);
}
/* no file associated to this font? */
/* get the `base' name */
if(ext) {
- newname = xstrdup(name);
+ newname = mdvi_strdup(name);
newname[ext - info.fontfile - 1] = 0;
} else
newname = (char *)name; /* we don't modify this */
/* we don't need this anymore */
if(newname != name)
- xfree(newname);
+ mdvi_free(newname);
if(filename == NULL) {
DEBUG((DBG_TYPE1, "(t1) %s: not found\n", name));
return NULL;
DEBUG((DBG_TYPE1, "(t1) resetting device resolution (current: (%d,%d))\n",
t1lib_xdpi, t1lib_ydpi));
-
+#if T1LIB_VERSION < 5
nfonts = T1_Get_no_fonts();
+#else
+ nfonts = T1_GetNoFonts();
+#endif
+
for(i = 0; i < nfonts; i++)
T1_DeleteAllSizes(i);
/* reset device resolutions */
font->design = info->tfminfo->design;
/* check if we have a font with this name (maybe at a different size) */
- old = (T1Info *)mdvi_hash_lookup(&t1hash, info->fontname);
+ old = (T1Info *)mdvi_hash_lookup(&t1hash, (unsigned char *)info->fontname);
if(old == info) {
/* let's avoid confusion */
old = NULL;
if(old && old->t1id == -1) {
DEBUG((DBG_TYPE1, "(t1) font `%s' exchanged in hash table\n",
info->fontname));
- mdvi_hash_remove(&t1hash, old->fontname);
- mdvi_hash_add(&t1hash, info->fontname,
+ mdvi_hash_remove(&t1hash, (unsigned char *)old->fontname);
+ mdvi_hash_add(&t1hash, (unsigned char *)info->fontname,
info, MDVI_HASH_UNCHECKED);
}
i = info->tfminfo->hic - info->tfminfo->loc + 1;
if(i != font->hic - font->loc + 1) {
/* reset to optimal size */
- font->chars = xrealloc(font->chars, i * sizeof(DviFontChar));
+ font->chars = mdvi_realloc(font->chars, i * sizeof(DviFontChar));
}
/* get the scaled characters metrics */
/* first destroy the private data */
t1_font_remove(info);
/* now reset all chars -- this is the important part */
- xfree(font->chars);
+ mdvi_free(font->chars);
font->chars = NULL;
font->loc = font->hic = 0;
return -1;
/* create the hash table if we have not done so yet */
if(t1hash.nbucks == 0)
mdvi_hash_create(&t1hash, T1_HASH_SIZE);
- mdvi_hash_add(&t1hash, info->fontname, info, MDVI_HASH_UNIQUE);
+ mdvi_hash_add(&t1hash, (unsigned char *) info->fontname, info, MDVI_HASH_UNIQUE);
listh_append(&t1fonts, LIST(info));
font->private = info;
return MDVI_GLYPH_EMPTY;
switch(glyph->bpp << 3) {
case 8:
- bm = bitmap_convert_lsb8(glyph->bits, w, h);
+ bm = bitmap_convert_lsb8((unsigned char *)glyph->bits, w, h);
break;
default:
warning(_("(t1) unsupported bitmap pad size %d\n"),
listh_remove(&t1fonts, LIST(info));
/* it it's in the hash table, we may need to replace this by another font */
- old = (T1Info *)mdvi_hash_lookup(&t1hash, info->fontname);
+ old = (T1Info *)mdvi_hash_lookup(&t1hash, (unsigned char *)info->fontname);
if(old == info) {
- mdvi_hash_remove(&t1hash, info->fontname);
+ mdvi_hash_remove(&t1hash, (unsigned char *) info->fontname);
/* go through the list and see if there is another
* font with this name */
for(old = (T1Info *)t1fonts.head; old; old = old->next)
if(STREQ(old->fontname, info->fontname))
break;
if(old != NULL)
- mdvi_hash_add(&t1hash, old->fontname, old,
+ mdvi_hash_add(&t1hash, (unsigned char *) old->fontname, old,
MDVI_HASH_UNCHECKED);
}
/* release our encoding vector */
if(info->tfminfo)
free_font_metrics(info->tfminfo);
- /*xfree(info->fontname);*/
- xfree(info);
+ /*mdvi_free(info->fontname);*/
+ mdvi_free(info);
}
static void t1_free_data(DviFont *font)