X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fdvi%2Fdvi-document.c;h=a1097c94563d4b775db61b9a1108bb6149e94813;hb=03a4afa9aeab342a63530db46888e405ea1c8afc;hp=1d6ca082b54b57ce520516dcc5f3ea730c01ae36;hpb=96ee76c82cc04f84631bc396ec9c7284a49ac727;p=evince.git

diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c
index 1d6ca082..a1097c94 100644
--- a/backend/dvi/dvi-document.c
+++ b/backend/dvi/dvi-document.c
@@ -32,6 +32,8 @@
 
 #include <glib/gi18n-lib.h>
 #include <ctype.h>
+#include <sys/wait.h>
+#include <stdlib.h>
 
 GMutex *dvi_context_mutex = NULL;
 
@@ -88,14 +90,8 @@ dvi_document_load (EvDocument  *document,
 	DviDocument *dvi_document = DVI_DOCUMENT(document);
 	
 	filename = g_filename_from_uri (uri, NULL, error);
-	
-	if (!filename) {
-		g_set_error (error,
-			     EV_DOCUMENT_ERROR,
-			     EV_DOCUMENT_ERROR_INVALID,
-			     _("File not available"));
+	if (!filename)
         	return FALSE;
-	}
 	
 	g_mutex_lock (dvi_context_mutex);
 	if (dvi_document->context)
@@ -106,10 +102,10 @@ dvi_document_load (EvDocument  *document,
 	g_free (filename);
 	
 	if (!dvi_document->context) {
-    		g_set_error (error,
-			     EV_DOCUMENT_ERROR,
-			     EV_DOCUMENT_ERROR_INVALID,
-			     _("DVI document has incorrect format"));
+    		g_set_error_literal (error,
+                                     EV_DOCUMENT_ERROR,
+                                     EV_DOCUMENT_ERROR_INVALID,
+                                     _("DVI document has incorrect format"));
         	return FALSE;
 	}
 	
@@ -404,8 +400,8 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
 
 	if (success == FALSE) {
 		g_warning ("Error: %s", err->message);
-	} else if (exit_stat != 0) {
-		g_warning ("Error: dvipdfm exited with non-zero status.");
+	} else if (!WIFEXITED(exit_stat) || WEXITSTATUS(exit_stat) != EXIT_SUCCESS){
+		g_warning ("Error: dvipdfm does not end normally or exit with a failure status.");
 	}
 
 	if (err)
@@ -434,7 +430,7 @@ dvi_document_file_exporter_iface_init (EvFileExporterIface *iface)
 #define RGB2ULONG(r,g,b) ((0xFF<<24)|(r<<16)|(g<<8)|(b))
 
 static gboolean
-hsb2rgb (float h, float s, float v, char *red, char *green, char *blue)
+hsb2rgb (float h, float s, float v, guchar *red, guchar *green, guchar *blue)
 {
         float i, f, p, q, t, r, g, b;
 
@@ -478,9 +474,9 @@ hsb2rgb (float h, float s, float v, char *red, char *green, char *blue)
 		b = q;
 	}
 
-        (*red) = (char)floor(r * 255);
-        (*green) = (char)floor(g * 255);
-        (*blue) = (char)floor(b * 255);
+        *red   = (guchar)floor(r * 255.0);
+        *green = (guchar)floor(g * 255.0);
+        *blue  = (guchar)floor(b * 255.0);
 	
         return TRUE;
 }