Fix several compile warnings in the dvi backend.

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.

svn path=/trunk/; revision=3211

diff --git a/ChangeLog b/ChangeLog
index ecdf7b2d4e113ae7be5664781c6dfa4ce5f03eee..6a2ae61b0078d1ad854af1cc1346f3d28553bc9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+       
 2008-09-28  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * backend/dvi/mdvi-lib/common.h:

diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am
index 2f6c9f70a10a3376b86f937403e4de5ec7f97780..49bb518822524e88b561074aba55267bc4c79dc7 100644 (file)
--- a/backend/dvi/Makefile.am
+++ b/backend/dvi/Makefile.am
@@ -7,8 +7,10 @@ INCLUDES =                                     \
        -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
 

diff --git a/backend/dvi/cairo-device.c b/backend/dvi/cairo-device.c
index b8ec39e6877c904b8a9ff0f69635a52c8ce6c362..992728dc4c4b49b012b8a2278840f876d864c5f9 100644 (file)
--- a/backend/dvi/cairo-device.c
+++ b/backend/dvi/cairo-device.c
@@ -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 @@ dvi_cairo_free_image (void *ptr)
 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 @@ mdvi_cairo_device_render (DviContext* dvi)
        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 @@ mdvi_cairo_device_render (DviContext* dvi)
        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,

diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c
index 87bf46a910a7a394a486978e73e50ee78c82fdb8..c5f5f79224d71d95e5ac9a65f55c87b9b32ee22a 100644 (file)
--- a/backend/dvi/dvi-document.c
+++ b/backend/dvi/dvi-document.c
@@ -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;
 

diff --git a/backend/dvi/mdvi-lib/Makefile.am b/backend/dvi/mdvi-lib/Makefile.am
index 73417e1648a97d1cc285a390e827290601c9aeb9..0a09e20fcfc93939e52201cfbbaf7c6c30dea5c6 100644 (file)
--- a/backend/dvi/mdvi-lib/Makefile.am
+++ b/backend/dvi/mdvi-lib/Makefile.am
@@ -1,3 +1,4 @@
+INCLUDES = $(WARN_CFLAGS)
 noinst_LTLIBRARIES = libmdvi.la
 
 libmdvi_la_SOURCES = \