summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvipdfmx
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-06-22 07:25:13 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-06-22 07:25:13 +0000
commitba784d78fc710b869577c60a825d02512853b1ee (patch)
tree04a09bf46f5242d1deec5fe2481e03f88fd7398d /Build/source/texk/xdvipdfmx
parente555bc95c4c35af8b2e0a2e6989ad508caa8a280 (diff)
enable compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@13871 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvipdfmx')
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog.TL29
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.am1
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.in1
-rw-r--r--Build/source/texk/xdvipdfmx/src/agl.c4
-rw-r--r--Build/source/texk/xdvipdfmx/src/cidtype0.c3
-rw-r--r--Build/source/texk/xdvipdfmx/src/dvi.c7
-rw-r--r--Build/source/texk/xdvipdfmx/src/dvipdfmx.c2
-rw-r--r--Build/source/texk/xdvipdfmx/src/epdf.c12
-rw-r--r--Build/source/texk/xdvipdfmx/src/jpegimage.c4
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfdev.c2
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfobj.c2
-rw-r--r--Build/source/texk/xdvipdfmx/src/spc_dvips.c7
-rw-r--r--Build/source/texk/xdvipdfmx/src/tt_aux.c2
-rw-r--r--Build/source/texk/xdvipdfmx/src/tt_aux.h2
-rw-r--r--Build/source/texk/xdvipdfmx/src/tt_cmap.c1
15 files changed, 54 insertions, 25 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 711551e80aa..f38120989a0 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,5 +1,30 @@
-ChangeLog.TL: Changes for xdvipdfmx (teTeX / TeX Live)
-======================================================
+ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
+=================================================
+
+2009-06-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (AM_CFLAGS): enable compiler warnings.
+ * src/agl.c (agl_load_line): delare as static, add forward decl.
+ * src/cidtype0.c (CIDFont_type0_t1open): remove ft_to_gid (unused).
+ * src/dvi.c (do_xxx): avoid unused variable.
+ (do_pic_file): declare as static.
+ (get_and_buffer_signed_byte): unused.
+ * src/dvipdfmx.c: remove do_objstm (unused).
+ * src/epdf.c: #include "pdfdoc.h" for pdf_doc_add_page_content.
+ (pdf_get_page_obj): remove info, contents, contents_dict, and
+ matrix (all unused).
+ (pdf_include_page): remove page_idx (unused).
+ (pdf_copy_clip): remove p0, p1, p2, and bbox (all unused),
+ silence initialized warning.
+ * src/jpegimage.c (read_APP1_Exif): remove rational_value (unused),
+ silence initialized warnings.
+ * src/pdfdev.c: #include "dvi.h" for dvi_is_tracking_boxes.
+ * src/pdfobj.c (pdf_file_new): declare as static.
+ * src/spc_dvips.c: #include "epdf.h" for pdf_copy_clip.
+ (spc_handler_ps_tricks_gdef): unused.
+ (spc_dvips_at_begin_page): remove fp (unused).
+ * src/tt_aux.[ch] (tt_aux_set_verbose): use ANSI C prototype.
+ * src/tt_cmap.c (handle_subst_glyphs): remove ucv (unused).
2009-06-05 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.am b/Build/source/texk/xdvipdfmx/src/Makefile.am
index efb86a33b99..1f48ccee5f1 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.am
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.am
@@ -5,6 +5,7 @@
##
INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
AM_CPPFLAGS =
+AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = xdvipdfmx
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in
index 46dc4971b7b..4459d809600 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.in
@@ -241,6 +241,7 @@ top_srcdir = @top_srcdir@
INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) \
$(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(am__append_1)
AM_CPPFLAGS =
+AM_CFLAGS = $(WARNING_CFLAGS)
xdvipdfmx_SOURCES = \
agl.c agl_standard.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \
cmap.c cmap_read.c cmap_write.c cs_type2.c \
diff --git a/Build/source/texk/xdvipdfmx/src/agl.c b/Build/source/texk/xdvipdfmx/src/agl.c
index 96a63ee17b2..d267d2d42a8 100644
--- a/Build/source/texk/xdvipdfmx/src/agl.c
+++ b/Build/source/texk/xdvipdfmx/src/agl.c
@@ -54,6 +54,8 @@
static int verbose = 0;
+static int agl_load_line(char* p, char* endptr, int is_predef);
+
void
agl_set_verbose (void)
{
@@ -403,7 +405,7 @@ agl_close_map (void)
ht_clear_table(&aglmap, hval_free);
}
-int
+static int
agl_load_line(char* p, char* endptr, int is_predef)
{
char *wbuf = p;
diff --git a/Build/source/texk/xdvipdfmx/src/cidtype0.c b/Build/source/texk/xdvipdfmx/src/cidtype0.c
index cead0004c99..be3086c1af0 100644
--- a/Build/source/texk/xdvipdfmx/src/cidtype0.c
+++ b/Build/source/texk/xdvipdfmx/src/cidtype0.c
@@ -1508,9 +1508,6 @@ CIDFont_type0_t1open (CIDFont *font, const char *name,
FILE *fp;
char *fontname, *shortname;
cff_font *cffont;
-#ifdef XETEX
- unsigned short *ft_to_gid;
-#endif
ASSERT(font);
diff --git a/Build/source/texk/xdvipdfmx/src/dvi.c b/Build/source/texk/xdvipdfmx/src/dvi.c
index 217e74f404c..7aaae027ff8 100644
--- a/Build/source/texk/xdvipdfmx/src/dvi.c
+++ b/Build/source/texk/xdvipdfmx/src/dvi.c
@@ -198,6 +198,8 @@ static UNSIGNED_BYTE get_and_buffer_unsigned_byte (FILE *file)
return (UNSIGNED_BYTE) ch;
}
+#if 0
+/* Not used */
static SIGNED_BYTE get_and_buffer_signed_byte (FILE *file)
{
int byte;
@@ -206,6 +208,7 @@ static SIGNED_BYTE get_and_buffer_signed_byte (FILE *file)
byte -= 0x100;
return (SIGNED_BYTE) byte;
}
+#endif
static UNSIGNED_PAIR get_and_buffer_unsigned_pair (FILE *file)
{
@@ -1775,8 +1778,8 @@ do_fnt4 (void)
static void
do_xxx (UNSIGNED_QUAD size)
{
- UNSIGNED_QUAD i;
#if 0
+ UNSIGNED_QUAD i;
Ubyte *buffer; /* FIXME - no need for new buffer here */
buffer = NEW(size+1, Ubyte);
@@ -2008,7 +2011,7 @@ do_glyph_array (int yLocsPresent)
return;
}
-void
+static void
do_pic_file()
/* parameters for XDV_PIC_FILE opcode: pdf_box[1] t[4][6] p[2] len[2] path[l] */
{
diff --git a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
index e85e291eebc..c2f9190af31 100644
--- a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
+++ b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
@@ -74,8 +74,6 @@ static long opt_flags = 0;
#define OPT_CIDFONT_FIXEDPITCH (1 << 2)
#define OPT_FONTMAP_FIRST_MATCH (1 << 3)
-static int do_objstm;
-
static char ignore_colors = 0;
static double annot_grow = 0.0;
static int bookmark_open = 0;
diff --git a/Build/source/texk/xdvipdfmx/src/epdf.c b/Build/source/texk/xdvipdfmx/src/epdf.c
index ce778a9c4fd..da39bb89fba 100644
--- a/Build/source/texk/xdvipdfmx/src/epdf.c
+++ b/Build/source/texk/xdvipdfmx/src/epdf.c
@@ -47,6 +47,8 @@
#include "pdfximage.h"
+#include "pdfdoc.h"
+
#include "epdf.h"
#if HAVE_ZLIB
@@ -129,10 +131,8 @@ static pdf_obj*
pdf_get_page_obj (pdf_file *pf, long page_no,
pdf_obj **ret_bbox, pdf_obj **ret_resources)
{
- xform_info info;
- pdf_obj *contents, *contents_dict;
pdf_obj *page_tree;
- pdf_obj *bbox = NULL, *resources = NULL, *rotate = NULL, *matrix;
+ pdf_obj *bbox = NULL, *resources = NULL, *rotate = NULL;
long page_idx;
/*
@@ -400,7 +400,7 @@ pdf_include_page (pdf_ximage *ximage, FILE *image_file)
pdf_obj *page_tree;
pdf_obj *matrix;
pdf_obj *bbox = NULL, *resources = NULL;
- long page_no, page_idx;
+ long page_no;
pdf_file *pf;
char *ident = pdf_ximage_get_ident(ximage);
@@ -568,8 +568,6 @@ pdf_copy_clip (FILE *image_file, int pageNo, double x_user, double y_user)
char *clip_path, *temp, *end_path;
pdf_tmatrix M;
double stack[6];
- pdf_coord p0, p1, p2;
- pdf_rect bbox;
pdf_file *pf;
pf = pdf_open(NULL, image_file);
@@ -600,7 +598,7 @@ pdf_copy_clip (FILE *image_file, int pageNo, double x_user, double y_user)
depth = 0;
for (; clip_path < end_path; clip_path++) {
- int color_dimen;
+ int color_dimen = 0; /* silence uninitialized warning */
char *token;
skip_white(&clip_path, end_path);
if (clip_path == end_path)
diff --git a/Build/source/texk/xdvipdfmx/src/jpegimage.c b/Build/source/texk/xdvipdfmx/src/jpegimage.c
index 71cd2ae695c..08ef5c49d10 100644
--- a/Build/source/texk/xdvipdfmx/src/jpegimage.c
+++ b/Build/source/texk/xdvipdfmx/src/jpegimage.c
@@ -576,8 +576,8 @@ read_APP1_Exif (struct JPEG_info *j_info, FILE *fp, unsigned short length)
unsigned char *tiff_header;
char bigendian;
int i;
- double rational_value;
- int num_fields, tag, type, count, value, num, den;
+ int num_fields, tag, type, count;
+ int value = 0, num = 0, den = 0; /* silence uninitialized warnings */
double xres = 72.0;
double yres = 72.0;
double res_unit = 1.0;
diff --git a/Build/source/texk/xdvipdfmx/src/pdfdev.c b/Build/source/texk/xdvipdfmx/src/pdfdev.c
index 9f4fae1ea5c..35cd9cc283e 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfdev.c
+++ b/Build/source/texk/xdvipdfmx/src/pdfdev.c
@@ -50,6 +50,8 @@
#include "pdflimits.h"
+#include "dvi.h"
+
#include "pdfdev.h"
static int verbose = 0;
diff --git a/Build/source/texk/xdvipdfmx/src/pdfobj.c b/Build/source/texk/xdvipdfmx/src/pdfobj.c
index 196da1d0500..b04ad418ea7 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfobj.c
+++ b/Build/source/texk/xdvipdfmx/src/pdfobj.c
@@ -2884,7 +2884,7 @@ read_xref (pdf_file *pf)
static struct ht_table *pdf_files = NULL;
-pdf_file *
+static pdf_file *
pdf_file_new (FILE *file)
{
pdf_file *pf;
diff --git a/Build/source/texk/xdvipdfmx/src/spc_dvips.c b/Build/source/texk/xdvipdfmx/src/spc_dvips.c
index 10641f6e9a1..29088d21dd8 100644
--- a/Build/source/texk/xdvipdfmx/src/spc_dvips.c
+++ b/Build/source/texk/xdvipdfmx/src/spc_dvips.c
@@ -53,6 +53,8 @@
#include "spc_dvips.h"
#include "spc_xtx.h"
+#include "epdf.h"
+
static int block_pending = 0;
static double pending_x = 0.0;
@@ -289,6 +291,8 @@ static pdf_coord *put_stack;
static int put_stack_depth = -1;
static char *gs_in = 0;
+#if 0
+/* Not used */
static int
spc_handler_ps_tricks_gdef (struct spc_env *spe, struct spc_arg *args)
{
@@ -301,6 +305,7 @@ spc_handler_ps_tricks_gdef (struct spc_env *spe, struct spc_arg *args)
return 0;
}
+#endif
static int
spc_handler_ps_tricks_pdef (struct spc_env *spe, struct spc_arg *args)
@@ -850,8 +855,6 @@ static struct spc_handler dvips_handlers[] = {
int
spc_dvips_at_begin_page (void)
{
- FILE* fp;
-
if (page_defs) {
dpx_delete_temp_file(page_defs);
page_defs = 0;
diff --git a/Build/source/texk/xdvipdfmx/src/tt_aux.c b/Build/source/texk/xdvipdfmx/src/tt_aux.c
index 96ff84764ed..60cf894b69d 100644
--- a/Build/source/texk/xdvipdfmx/src/tt_aux.c
+++ b/Build/source/texk/xdvipdfmx/src/tt_aux.c
@@ -40,7 +40,7 @@ extern int always_embed; /* flag declared in dvipdfmx.c */
static int verbose = 0;
-void tt_aux_set_verbose()
+void tt_aux_set_verbose(void)
{
++verbose;
}
diff --git a/Build/source/texk/xdvipdfmx/src/tt_aux.h b/Build/source/texk/xdvipdfmx/src/tt_aux.h
index c39d2aa7b85..00256585e52 100644
--- a/Build/source/texk/xdvipdfmx/src/tt_aux.h
+++ b/Build/source/texk/xdvipdfmx/src/tt_aux.h
@@ -26,7 +26,7 @@
#include "pdfobj.h"
#include "sfnt.h"
-extern void tt_aux_set_verbose();
+extern void tt_aux_set_verbose(void);
/* TTC (TrueType Collection) */
extern ULONG ttc_read_offset (sfnt *sfont, int ttc_idx);
diff --git a/Build/source/texk/xdvipdfmx/src/tt_cmap.c b/Build/source/texk/xdvipdfmx/src/tt_cmap.c
index 304c502380f..0a5890d583a 100644
--- a/Build/source/texk/xdvipdfmx/src/tt_cmap.c
+++ b/Build/source/texk/xdvipdfmx/src/tt_cmap.c
@@ -852,7 +852,6 @@ handle_subst_glyphs (CMap *cmap,
{
USHORT count;
USHORT i, gid;
- long ucv;
for (count = 0, i = 0; i < 8192; i++) {
int j;