evince r3211 - in trunk: . backend/dvi backend/dvi/mdvi-lib

[carlosgc svn gnome org]

Author: carlosgc
Date: Sun Sep 28 17:09:18 2008
New Revision: 3211
URL: http://svn.gnome.org/viewvc/evince?rev=3211&view=rev

Log:
2008-09-28  Carlos Garcia Campos  <carlosgc gnome org>

	* backend/dvi/Makefile.am:
	* backend/dvi/cairo-device.c:
	* backend/dvi/dvi-document.c:
	* backend/dvi/mdvi-lib/Makefile.am:

	Fix several compile warnings in the dvi backend.

Modified:
   trunk/ChangeLog
   trunk/backend/dvi/Makefile.am
   trunk/backend/dvi/cairo-device.c
   trunk/backend/dvi/dvi-document.c
   trunk/backend/dvi/mdvi-lib/Makefile.am

Modified: trunk/backend/dvi/Makefile.am
==============================================================================
--- trunk/backend/dvi/Makefile.am	(original)
+++ trunk/backend/dvi/Makefile.am	Sun Sep 28 17:09:18 2008
@@ -7,8 +7,10 @@
 	-I$(top_srcdir)/libdocument		\
 	-I$(srcdir)/mdvi-lib			\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
+	$(WARN_CFLAGS)				\
 	$(BACKEND_CFLAGS)			\
-	$(SPECTRE_CFLAGS)
+	$(SPECTRE_CFLAGS)			\
+	$(DISABLE_DEPRECATED)
 
 backend_LTLIBRARIES = libdvidocument.la
 

Modified: trunk/backend/dvi/cairo-device.c
==============================================================================
--- trunk/backend/dvi/cairo-device.c	(original)
+++ trunk/backend/dvi/cairo-device.c	Sun Sep 28 17:09:18 2008
@@ -18,6 +18,7 @@
 
 #include <config.h>
 
+#include <stdlib.h>
 #include <gdk/gdkcolor.h>
 #ifdef HAVE_SPECTRE
 #include <libspectre/spectre.h>
@@ -244,7 +245,6 @@
 static void
 dvi_cairo_put_pixel (void *image, int x, int y, Ulong color)
 {
-	cairo_t         *cr;
 	cairo_surface_t *surface;
 	gint             rowstride;
 	guchar          *p;
@@ -319,7 +319,7 @@
 	gint             page_width;
 	gint             page_height;
 	cairo_surface_t *surface;
-	gchar           *pixels;
+	guchar          *pixels;
 	gint             rowstride;
 	static const cairo_user_data_key_t key;
 
@@ -332,7 +332,7 @@
 	page_height = dvi->dvi_page_h * dvi->params.vconv + 2 * cairo_device->ymargin;
 
 	rowstride = page_width * 4;
-	pixels = (gchar *) g_malloc (page_height * rowstride);
+	pixels = (guchar *) g_malloc (page_height * rowstride);
 	memset (pixels, 0xff, page_height * rowstride);
 
 	surface = cairo_image_surface_create_for_data (pixels,

Modified: trunk/backend/dvi/dvi-document.c
==============================================================================
--- trunk/backend/dvi/dvi-document.c	(original)
+++ trunk/backend/dvi/dvi-document.c	Sun Sep 28 17:09:18 2008
@@ -19,17 +19,19 @@
 
 #include "config.h"
 
-#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 <glib/gi18n.h>
+#include <ctype.h>
 
 GMutex *dvi_context_mutex = NULL;
 

Modified: trunk/backend/dvi/mdvi-lib/Makefile.am
==============================================================================
--- trunk/backend/dvi/mdvi-lib/Makefile.am	(original)
+++ trunk/backend/dvi/mdvi-lib/Makefile.am	Sun Sep 28 17:09:18 2008
@@ -1,3 +1,4 @@
+INCLUDES = $(WARN_CFLAGS)
 noinst_LTLIBRARIES = libmdvi.la
 
 libmdvi_la_SOURCES = \