[comics] Correct check for exit status

[evince.git] / backend / dvi / dvi-document.c

diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c
index 73b148b389b491ea82775af91a455389e7667562..a1097c94563d4b775db61b9a1108bb6149e94813 100644 (file)
--- a/backend/dvi/dvi-document.c
+++ b/backend/dvi/dvi-document.c
@@ -17,17 +17,23 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include "dvi-document.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-misc.h"
 #include "ev-file-exporter.h"
+#include "ev-file-helpers.h"
 
 #include "mdvi.h"
 #include "fonts.h"
+#include "color.h"
 #include "cairo-device.h"
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
+#include <ctype.h>
+#include <sys/wait.h>
+#include <stdlib.h>
 
 GMutex *dvi_context_mutex = NULL;
 
@@ -65,20 +71,14 @@ typedef struct _DviDocumentClass DviDocumentClass;
 static void dvi_document_document_iface_init            (EvDocumentIface           *iface);
 static void dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 static void dvi_document_file_exporter_iface_init      (EvFileExporterIface       *iface);
-static void dvi_document_get_page_size                         (EvDocument                *document,
-                                                        int                        page,
-                                                        double                    *width,
-                                                        double                    *height);
 static void dvi_document_do_color_special               (DviContext                *dvi,
                                                         const char                *prefix,
                                                         const char                *arg);
 
-G_DEFINE_TYPE_WITH_CODE 
-    (DviDocument, dvi_document, G_TYPE_OBJECT, 
-    {
-      G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT, dvi_document_document_iface_init);    
-      G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, dvi_document_document_thumbnails_iface_init);
-      G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER, dvi_document_file_exporter_iface_init);
+EV_BACKEND_REGISTER_WITH_CODE (DviDocument, dvi_document,
+     {
+      EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, dvi_document_document_thumbnails_iface_init);
+      EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER, dvi_document_file_exporter_iface_init);
      });
 
 static gboolean
@@ -90,27 +90,22 @@ 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)
                mdvi_destroy_context (dvi_document->context);
-       
+
        dvi_document->context = mdvi_init_context(dvi_document->params, dvi_document->spec, filename);
        g_mutex_unlock (dvi_context_mutex);
+       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;
        }
        
@@ -150,7 +145,7 @@ dvi_document_get_n_pages (EvDocument *document)
 
 static void
 dvi_document_get_page_size (EvDocument *document,
-                           int         page,
+                           EvPage     *page,
                            double     *width,
                            double     *height)
 {
@@ -177,7 +172,7 @@ dvi_document_render (EvDocument      *document,
         */
        g_mutex_lock (dvi_context_mutex);
        
-       mdvi_setpage (dvi_document->context, rc->page);
+       mdvi_setpage (dvi_document->context, rc->page->index);
        
        mdvi_set_shrink (dvi_document->context, 
                         (int)((dvi_document->params->hshrink - 1) / rc->scale) + 1,
@@ -274,8 +269,8 @@ dvi_document_document_iface_init (EvDocumentIface *iface)
 static void
 dvi_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
                                        EvRenderContext      *rc, 
-                                       gint                  *width,
-                                       gint                  *height)
+                                       gint                 *width,
+                                       gint                 *height)
 {      
        DviDocument *dvi_document = DVI_DOCUMENT (document);
        gdouble page_width = dvi_document->base_width;
@@ -307,7 +302,7 @@ dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
 
        g_mutex_lock (dvi_context_mutex);
        
-       mdvi_setpage (dvi_document->context, rc->page);
+       mdvi_setpage (dvi_document->context, rc->page->index);
 
        mdvi_set_shrink (dvi_document->context, 
                          (int)dvi_document->base_width * dvi_document->params->hshrink / thumb_width,
@@ -363,7 +358,7 @@ dvi_document_file_exporter_begin (EvFileExporter        *exporter,
        
        if (dvi_document->exporter_filename)
                g_free (dvi_document->exporter_filename);       
-       dvi_document->exporter_filename = g_strdup(fc->filename);
+       dvi_document->exporter_filename = g_strdup (fc->filename);
        
        if (dvi_document->exporter_opts) {
                g_string_free (dvi_document->exporter_opts, TRUE);
@@ -377,7 +372,7 @@ dvi_document_file_exporter_do_page (EvFileExporter  *exporter,
 {
        DviDocument *dvi_document = DVI_DOCUMENT(exporter);
 
-       g_string_append_printf(dvi_document->exporter_opts, "%d,", (rc->page)+1);
+       g_string_append_printf (dvi_document->exporter_opts, "%d,", (rc->page->index) + 1);
 }
 
 static void
@@ -390,7 +385,7 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
        
        DviDocument *dvi_document = DVI_DOCUMENT(exporter);
        
-       command_line = g_strdup_printf ("dvipdfm %s -o %s %s", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
+       command_line = g_strdup_printf ("dvipdfm %s -o %s \"%s\"", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
                                        dvi_document->exporter_opts->str,
                                        dvi_document->exporter_filename,
                                        dvi_document->context->filename);
@@ -401,16 +396,16 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
                                             &exit_stat,
                                             &err);
 
-       g_free(command_line);
+       g_free (command_line);
 
        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)
-               g_error_free(err);
+               g_error_free (err);
 }
 
 static EvFileExporterCapabilities
@@ -435,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;
 
@@ -479,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;
 }