#include <glib/gi18n-lib.h>
#include <ctype.h>
+#include <sys/wait.h>
+#include <stdlib.h>
GMutex *dvi_context_mutex = NULL;
struct _DviDocumentClass
{
- GObjectClass parent_class;
+ EvDocumentClass parent_class;
};
struct _DviDocument
{
- GObject parent_instance;
+ EvDocument parent_instance;
DviContext *context;
DviPageSpec *spec;
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_do_color_special (DviContext *dvi,
G_OBJECT_CLASS (dvi_document_parent_class)->finalize (object);
}
-
static void
dvi_document_class_init (DviDocumentClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ EvDocumentClass *ev_document_class = EV_DOCUMENT_CLASS (klass);
gobject_class->finalize = dvi_document_finalize;
mdvi_register_fonts ();
dvi_context_mutex = g_mutex_new ();
-}
-
-static EvDocumentInfo *
-dvi_document_get_info (EvDocument *document)
-{
- EvDocumentInfo *info;
-
- info = g_new0 (EvDocumentInfo, 1);
- return info;
-}
-
-static void
-dvi_document_document_iface_init (EvDocumentIface *iface)
-{
- iface->load = dvi_document_load;
- iface->save = dvi_document_save;
- iface->get_n_pages = dvi_document_get_n_pages;
- iface->get_page_size = dvi_document_get_page_size;
- iface->render = dvi_document_render;
- iface->get_info = dvi_document_get_info;
+ ev_document_class->load = dvi_document_load;
+ ev_document_class->save = dvi_document_save;
+ ev_document_class->get_n_pages = dvi_document_get_n_pages;
+ ev_document_class->get_page_size = dvi_document_get_page_size;
+ ev_document_class->render = dvi_document_render;
}
static void
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)
#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;
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;
}