diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2013-03-21 22:03:12 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-03-22 01:06:10 +0000 |
| commit | 7b334e226f7ac03352461935e7193d4c9a27ddca (patch) | |
| tree | d4d768c49164a9c885c9f5d784c6a88cc99ae80b /pdf/pdf_stream.c | |
| parent | bf08301ded2f44e33bebf5572587a9c7102dcc98 (diff) | |
| download | mupdf-7b334e226f7ac03352461935e7193d4c9a27ddca.tar.xz | |
Squash some warnings.
Some -Wshadow ones, plus some 'set but not used' ones.
Diffstat (limited to 'pdf/pdf_stream.c')
| -rw-r--r-- | pdf/pdf_stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pdf/pdf_stream.c b/pdf/pdf_stream.c index 2639c9e1..0af1ddcf 100644 --- a/pdf/pdf_stream.c +++ b/pdf/pdf_stream.c @@ -54,7 +54,8 @@ build_filter(fz_stream *chain, pdf_document * xref, pdf_obj * f, pdf_obj * p, in char *s = pdf_to_name(f); int predictor = pdf_to_int(pdf_dict_gets(p, "Predictor")); - int columns = pdf_to_int(pdf_dict_gets(p, "Columns")); + pdf_obj *columns_obj = pdf_dict_gets(p, "Columns"); + int columns = pdf_to_int(columns_obj); int colors = pdf_to_int(pdf_dict_gets(p, "Colors")); int bpc = pdf_to_int(pdf_dict_gets(p, "BitsPerComponent")); @@ -69,7 +70,6 @@ build_filter(fz_stream *chain, pdf_document * xref, pdf_obj * f, pdf_obj * p, in pdf_obj *k = pdf_dict_gets(p, "K"); pdf_obj *eol = pdf_dict_gets(p, "EndOfLine"); pdf_obj *eba = pdf_dict_gets(p, "EncodedByteAlign"); - pdf_obj *columns = pdf_dict_gets(p, "Columns"); pdf_obj *rows = pdf_dict_gets(p, "Rows"); pdf_obj *eob = pdf_dict_gets(p, "EndOfBlock"); pdf_obj *bi1 = pdf_dict_gets(p, "BlackIs1"); @@ -80,7 +80,7 @@ build_filter(fz_stream *chain, pdf_document * xref, pdf_obj * f, pdf_obj * p, in params->u.fax.k = (k ? pdf_to_int(k) : 0); params->u.fax.end_of_line = (eol ? pdf_to_bool(eol) : 0); params->u.fax.encoded_byte_align = (eba ? pdf_to_bool(eba) : 0); - params->u.fax.columns = (columns ? pdf_to_int(columns) : 1728); + params->u.fax.columns = (columns_obj ? columns : 1728); params->u.fax.rows = (rows ? pdf_to_int(rows) : 0); params->u.fax.end_of_block = (eob ? pdf_to_bool(eob) : 1); params->u.fax.black_is_1 = (bi1 ? pdf_to_bool(bi1) : 0); @@ -90,7 +90,7 @@ build_filter(fz_stream *chain, pdf_document * xref, pdf_obj * f, pdf_obj * p, in k ? pdf_to_int(k) : 0, eol ? pdf_to_bool(eol) : 0, eba ? pdf_to_bool(eba) : 0, - columns ? pdf_to_int(columns) : 1728, + columns_obj ? columns : 1728, rows ? pdf_to_int(rows) : 0, eob ? pdf_to_bool(eob) : 1, bi1 ? pdf_to_bool(bi1) : 0); |