diff options
author | Carlos Garcia Campos <carlosgc@gnome.org> | 2008-09-28 17:09:18 (GMT) |
---|---|---|
committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2008-09-28 17:09:18 (GMT) |
commit | df7ffac1abb2328b91bb87306f6e77807cc4e10d (patch) | |
tree | d4ea4e01f6bc442cba17831b8a04174c1fbedc64 /backend | |
parent | 14def5e0c1c11cee1523e10c72df74f4cf5e451d (diff) |
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
Diffstat (limited to 'backend')
-rw-r--r-- | backend/dvi/Makefile.am | 4 | ||||
-rw-r--r-- | backend/dvi/cairo-device.c | 6 | ||||
-rw-r--r-- | backend/dvi/dvi-document.c | 4 | ||||
-rw-r--r-- | backend/dvi/mdvi-lib/Makefile.am | 1 |
4 files changed, 10 insertions, 5 deletions
diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am index 2f6c9f7..49bb518 100644 --- 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 b8ec39e..992728d 100644 --- 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 87bf46a..c5f5f79 100644 --- 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 73417e1..0a09e20 100644 --- 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 = \ |