evince r3254 - in branches/gnome-2-24: . backend/dvi/mdvi-lib

[nshmyrev svn gnome org]

Author: nshmyrev
Date: Tue Nov  4 20:48:08 2008
New Revision: 3254
URL: http://svn.gnome.org/viewvc/evince?rev=3254&view=rev

Log:
2008-11-04  Nickolay V. Shmyrev  <nshmyrev yandex ru>

	* backend/dvi/mdvi-lib/t1.c (t1_reset_resolution),
	(t1_transform_font):
	* backend/dvi/mdvi-lib/tt.c (tt_really_load_font), (tt_load_font):
 	
	More renames of warning to mdvi_warning in follow up to the
	fix of the bug #553369. Fix for the bug #559257 by
	Tuxce <tuxce net gmail com>.



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/backend/dvi/mdvi-lib/t1.c
   branches/gnome-2-24/backend/dvi/mdvi-lib/tt.c

Modified: branches/gnome-2-24/backend/dvi/mdvi-lib/t1.c
==============================================================================
--- branches/gnome-2-24/backend/dvi/mdvi-lib/t1.c	(original)
+++ branches/gnome-2-24/backend/dvi/mdvi-lib/t1.c	Tue Nov  4 20:48:08 2008
@@ -184,7 +184,7 @@
 		T1_DeleteAllSizes(i);
 	/* reset device resolutions */
 	if(T1_SetDeviceResolutions((float)xdpi, (float)ydpi) < 0)
-		warning(_("(t1) failed to reset device resolution\n"));
+		mdvi_warning(_("(t1) failed to reset device resolution\n"));
 	else
 		DEBUG((DBG_TYPE1, 
 			"(t1) reset successful, new resolution is (%d, %d)\n",
@@ -212,7 +212,7 @@
 			info->fontname, info->encoding->name));
 		T1_DeleteAllSizes(info->t1id);
 		if(T1_ReencodeFont(info->t1id, info->encoding->vector) < 0)
-			warning(_("%s: could not encode font\n"), info->fontname);
+			mdvi_warning(_("%s: could not encode font\n"), info->fontname);
 	}
 	if(info->mapinfo.slant) {
 		DEBUG((DBG_TYPE1, "(t1) %s: slanting by %.3f\n", 

Modified: branches/gnome-2-24/backend/dvi/mdvi-lib/tt.c
==============================================================================
--- branches/gnome-2-24/backend/dvi/mdvi-lib/tt.c	(original)
+++ branches/gnome-2-24/backend/dvi/mdvi-lib/tt.c	Tue Nov  4 20:48:08 2008
@@ -148,7 +148,7 @@
 		info->fontname));
 	status = TT_Open_Face(tt_handle, font->filename, &info->face);
 	if(status) {
-		warning(_("(tt) %s: could not load face: %s\n"),
+		mdvi_warning(_("(tt) %s: could not load face: %s\n"),
 			info->fontname, TT_ErrToString18(status));
 		return -1;
 	}
@@ -156,7 +156,7 @@
 	/* create a new instance of this face */
 	status = TT_New_Instance(info->face, &info->instance);
 	if(status) {
-		warning(_("(tt) %s: could not create face: %s\n"), 
+		mdvi_warning(_("(tt) %s: could not create face: %s\n"), 
 			info->fontname, TT_ErrToString18(status));
 		TT_Close_Face(info->face);
 		return -1;
@@ -165,7 +165,7 @@
 	/* create a glyph */
 	status = TT_New_Glyph(info->face, &info->glyph);
 	if(status) {
-		warning(_("(tt) %s: could not create glyph: %s\n"), 
+		mdvi_warning(_("(tt) %s: could not create glyph: %s\n"), 
 			info->fontname, TT_ErrToString18(status));
 		goto tt_error;
 	}
@@ -198,7 +198,7 @@
 		}
 	}
 	if(map_found < 0) {
-		warning(_("(tt) %s: no acceptable map found, using #0\n"),
+		mdvi_warning(_("(tt) %s: no acceptable map found, using #0\n"),
 			info->fontname);
 		map_found = 0;
 	}
@@ -237,7 +237,7 @@
 		
 		status = TT_Load_PS_Names(info->face, &post);
 		if(status) {
-			warning(_("(tt) %s: could not load PS name table\n"),
+			mdvi_warning(_("(tt) %s: could not load PS name table\n"),
 				info->fontname);
 			mdvi_release_encoding(info->encoding, 0);
 			info->encoding = NULL;
@@ -249,7 +249,7 @@
 		info->fmftype, info->fmfname);
 
 	if(info->tfminfo == NULL) {
-		warning("(tt) %s: no metrics data, font ignored\n",
+		mdvi_warning("(tt) %s: no metrics data, font ignored\n",
 			info->fontname);
 		goto tt_error;
 	}
@@ -262,7 +262,7 @@
 	if(info->encoding)
 		tt_encode_font(font, info);
 	else {
-		warning(_("%s: no encoding vector found, expect bad output\n"),
+		mdvi_warning(_("%s: no encoding vector found, expect bad output\n"),
 			info->fontname);
 		/* this is better than nothing */
 		for(i = font->loc; i <= font->hic; i++)
@@ -322,7 +322,7 @@
 	}
 	
 	if(info->fmfname == NULL)
-		warning(_("(tt) %s: no font metric data\n"), font->fontname);
+		mdvi_warning(_("(tt) %s: no font metric data\n"), font->fontname);
 	
 	listh_append(&ttfonts, LIST(info));
 	font->private = info;