summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ghostscript.com>2010-07-13 23:11:24 +0200
committerTor Andersson <tor@ghostscript.com>2010-07-13 23:11:24 +0200
commit84b10eb85392bfa907c395ceb58d776c9004ae14 (patch)
tree0fe8a5475a5640da521147639a440d20fa3912b8
parentcacfe5d248f713648206a40bf2ec339a71bb93c7 (diff)
downloadmupdf-84b10eb85392bfa907c395ceb58d776c9004ae14.tar.xz
Fix clang warnings.
-rw-r--r--apps/pdfapp.c2
-rw-r--r--fitz/stm_read.c2
-rw-r--r--mupdf/pdf_open.c4
-rw-r--r--mupdf/pdf_parse.c2
-rw-r--r--mupdf/pdf_repair.c2
-rw-r--r--mupdf/pdf_shade.c5
6 files changed, 8 insertions, 9 deletions
diff --git a/apps/pdfapp.c b/apps/pdfapp.c
index 92ce7dd3..990dcd8c 100644
--- a/apps/pdfapp.c
+++ b/apps/pdfapp.c
@@ -259,8 +259,6 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage)
if (error)
pdfapp_error(app, error);
- ctm = pdfapp_viewctm(app);
-
/* Create display list */
app->page->list = fz_newdisplaylist();
mdev = fz_newlistdevice(app->page->list);
diff --git a/fitz/stm_read.c b/fitz/stm_read.c
index aeded131..3b09bf41 100644
--- a/fitz/stm_read.c
+++ b/fitz/stm_read.c
@@ -290,7 +290,7 @@ fz_readline(fz_stream *stm, char *mem, int n)
if (c == '\r') {
c = fz_peekbyte(stm);
if (c == '\n')
- c = fz_readbyte(stm);
+ fz_readbyte(stm);
break;
}
if (c == '\n')
diff --git a/mupdf/pdf_open.c b/mupdf/pdf_open.c
index 62149586..7e9727fe 100644
--- a/mupdf/pdf_open.c
+++ b/mupdf/pdf_open.c
@@ -80,7 +80,7 @@ static fz_error
pdf_readoldtrailer(pdf_xref *xref, char *buf, int cap)
{
fz_error error;
- int ofs, len;
+ int len;
char *s;
int n;
int t;
@@ -106,7 +106,7 @@ pdf_readoldtrailer(pdf_xref *xref, char *buf, int cap)
return fz_rethrow(error, "cannot read xref count");
s = buf;
- ofs = atoi(fz_strsep(&s, " "));
+ atoi(fz_strsep(&s, " ")); /* ignore ofs */
if (!s)
return fz_throw("invalid range marker in xref");
len = atoi(fz_strsep(&s, " "));
diff --git a/mupdf/pdf_parse.c b/mupdf/pdf_parse.c
index 27dc8743..e531080d 100644
--- a/mupdf/pdf_parse.c
+++ b/mupdf/pdf_parse.c
@@ -504,7 +504,7 @@ skip:
if (c != '\n')
fz_warn("line feed missing after stream begin marker (%d %d R)", num, gen);
else
- c = fz_readbyte(file);
+ fz_readbyte(file);
}
error = fz_readerror(file);
if (error)
diff --git a/mupdf/pdf_repair.c b/mupdf/pdf_repair.c
index 13d977e6..ab130260 100644
--- a/mupdf/pdf_repair.c
+++ b/mupdf/pdf_repair.c
@@ -30,6 +30,8 @@ fz_repairobj(fz_stream *file, char *buf, int cap, int *stmofsp, int *stmlenp, in
stmlen = 0;
error = pdf_lex(&tok, file, buf, cap, &len);
+ if (error)
+ return fz_rethrow(error, "cannot parse object");
if (tok == PDF_TODICT)
{
fz_obj *dict, *obj;
diff --git a/mupdf/pdf_shade.c b/mupdf/pdf_shade.c
index b5a8f7b5..6a04c369 100644
--- a/mupdf/pdf_shade.c
+++ b/mupdf/pdf_shade.c
@@ -793,13 +793,13 @@ pdf_loadtype4shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
case 0: /* start new triangle */
va = vd;
- flag = readbits(stream, p.bpflag);
+ readbits(stream, p.bpflag);
vb.x = readsample(stream, p.bpcoord, p.x0, p.x1);
vb.y = readsample(stream, p.bpcoord, p.y0, p.y1);
for (i = 0; i < ncomp; i++)
vb.c[i] = readsample(stream, p.bpcomp, p.c0[i], p.c1[i]);
- flag = readbits(stream, p.bpflag);
+ readbits(stream, p.bpflag);
vc.x = readsample(stream, p.bpcoord, p.x0, p.x1);
vc.y = readsample(stream, p.bpcoord, p.y0, p.y1);
for (i = 0; i < ncomp; i++)
@@ -1238,7 +1238,6 @@ pdf_loadshadingdict(fz_shade **shadep, pdf_xref *xref, fz_obj *dict, fz_matrix t
return fz_rethrow(error, "cannot open shading stream (%d %d R)", fz_tonum(dict), fz_togen(dict));
}
- error = 0;
switch (type)
{
case 1: