X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=backend%2Fdvi%2Fmdvi-lib%2Fgf.c;h=2cfcb36ae9b3c175194ba6672a7f91d6393c2607;hb=16cc05ec4f7663103e45a52ac06d292e6b75a8c0;hp=2c147ec666648d2c649f3f75cda877a945eb058c;hpb=13a06349251874bd35d2f03c3fc93217cee749a2;p=evince.git

diff --git a/backend/dvi/mdvi-lib/gf.c b/backend/dvi/mdvi-lib/gf.c
index 2c147ec6..2cfcb36a 100644
--- a/backend/dvi/mdvi-lib/gf.c
+++ b/backend/dvi/mdvi-lib/gf.c
@@ -19,6 +19,7 @@
 
 /* functions to read GF fonts */
 
+#include <config.h>
 #include <string.h>
 #include "common.h"
 #include "mdvi.h"
@@ -109,8 +110,8 @@ static int gf_read_bitmap(FILE *p, DviFontChar *ch)
 		min_m = max_m - min_m;
 		min_n = max_n - min_n;
 	} else {
-		error(_("GF: invalid opcode %d in character %d\n"),
-			op, ch->code);
+		mdvi_error(_("GF: invalid opcode %d in character %d\n"),
+			   op, ch->code);
 		return -1;
 	}
 
@@ -207,8 +208,8 @@ static int gf_read_bitmap(FILE *p, DviFontChar *ch)
 				DEBUG((DBG_BITMAPS, "(gf) no_op\n"));
 				break;
 			default:
-				error(_("(gf) Character %d: invalid opcode %d\n"),
-					ch->code, op);
+				mdvi_error(_("(gf) Character %d: invalid opcode %d\n"),
+					   ch->code, op);
 				goto error;
 		}
 		/* chech that we're still inside the bitmap */
@@ -223,8 +224,8 @@ static int gf_read_bitmap(FILE *p, DviFontChar *ch)
 	return 0;
 
 toobig:
-	error(_("(gf) character %d has an incorrect bounding box\n"),
-		ch->code);
+	mdvi_error(_("(gf) character %d has an incorrect bounding box\n"),
+		   ch->code);
 error:
 	bitmap_destroy(map);
 	ch->glyph.data = NULL;
@@ -286,8 +287,8 @@ static int gf_load_font(DviParams *unused, DviFont *font)
 	/* the checksum */
 	word = fuget4(p);
 	if(word && font->checksum && font->checksum != word) {
-		warning(_("%s: bad checksum (expected %u, found %u)\n"),
-			font->fontname, font->checksum, word);
+		mdvi_warning(_("%s: bad checksum (expected %u, found %u)\n"),
+			     font->fontname, font->checksum, word);
 	} else if(!font->checksum)
 		font->checksum = word;
 	/* skip pixels per point ratio */
@@ -322,7 +323,7 @@ static int gf_load_font(DviParams *unused, DviFont *font)
 			           /* dy assumed 0 */
 			break;
 		default:
-			error(_("%s: junk in postamble\n"), font->fontname);
+			mdvi_error(_("%s: junk in postamble\n"), font->fontname);
 			goto error;
 		}
 		ch->code = cc;
@@ -359,7 +360,7 @@ static int gf_load_font(DviParams *unused, DviFont *font)
 	return 0;
 
 badgf:
-	error(_("%s: File corrupted, or not a GF file\n"), font->fontname);
+	mdvi_error(_("%s: File corrupted, or not a GF file\n"), font->fontname);
 error:
 	if(font->chars) {
 		mdvi_free(font->chars);