From bcf591abdbe0802e60ff3b56a617f87c0fbad428 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 28 Apr 2008 00:20:11 +0000 Subject: decl after statement, more zlib from vvv git-svn-id: svn://tug.org/texlive/trunk@7687 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfmx/src/Makefile.am | 2 +- Build/source/texk/dvipdfmx/src/Makefile.in | 4 ++-- Build/source/texk/dvipdfmx/src/pdfencoding.c | 3 +-- Build/source/texk/dvipdfmx/src/pdfobj.c | 17 ++++++++++------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Build/source/texk/dvipdfmx/src/Makefile.am b/Build/source/texk/dvipdfmx/src/Makefile.am index 9e10ee31e46..2f013ef2fc7 100644 --- a/Build/source/texk/dvipdfmx/src/Makefile.am +++ b/Build/source/texk/dvipdfmx/src/Makefile.am @@ -40,7 +40,7 @@ dvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) dvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP) dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@ -xbb_CPPFLAGS = @LIBPNGCPPFLAGS@ +xbb_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ xbb_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) xbb_DEPENDENCIES = $(LIBPNGDEP) $(ZLIBDEP) xbb_LDFLAGS = @dvipdfmx_LDFLAGS@ diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in index 849285b693c..3808e133f48 100644 --- a/Build/source/texk/dvipdfmx/src/Makefile.in +++ b/Build/source/texk/dvipdfmx/src/Makefile.in @@ -233,9 +233,9 @@ ZLIBSRCDIR = $(srcdir)/$(ZLIBDIR) dvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ dvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) dvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP) -xbb_CPPFLAGS = @LIBPNGCPPFLAGS@ +xbb_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ xbb_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) -xbb_DEPENDENCIES = $(LIBPNGDEP) $(LDZLIB) +xbb_DEPENDENCIES = $(LIBPNGDEP) $(ZLIBDEP) xbb_LDFLAGS = @dvipdfmx_LDFLAGS@ all: all-am diff --git a/Build/source/texk/dvipdfmx/src/pdfencoding.c b/Build/source/texk/dvipdfmx/src/pdfencoding.c index e95486473e0..75fbfc76991 100644 --- a/Build/source/texk/dvipdfmx/src/pdfencoding.c +++ b/Build/source/texk/dvipdfmx/src/pdfencoding.c @@ -120,11 +120,10 @@ pdf_init_encoding_struct (pdf_encoding *encoding) static pdf_obj * create_encoding_resource (pdf_encoding *encoding, pdf_encoding *baseenc) { + pdf_obj *differences; ASSERT(encoding); ASSERT(!encoding->resource); - pdf_obj *differences; - differences = make_encoding_differences(encoding->glyphs, baseenc ? baseenc->glyphs : NULL, encoding->is_used); diff --git a/Build/source/texk/dvipdfmx/src/pdfobj.c b/Build/source/texk/dvipdfmx/src/pdfobj.c index 645295ebb12..0c7227859df 100644 --- a/Build/source/texk/dvipdfmx/src/pdfobj.c +++ b/Build/source/texk/dvipdfmx/src/pdfobj.c @@ -402,13 +402,14 @@ dump_xref_stream (void) for (i = 0; i < next_label; i++) { unsigned j; + unsigned short f3; buf[0] = output_xref[i].type; pos = output_xref[i].field2; for (j = poslen; j--; ) { buf[1+j] = (unsigned char) pos; pos >>= 8; } - unsigned short f3 = output_xref[i].field3; + f3 = output_xref[i].field3; buf[poslen+1] = (unsigned char) (f3 >> 8); buf[poslen+2] = (unsigned char) (f3); pdf_add_stream(xref_stream, &buf, poslen+3); @@ -1866,25 +1867,27 @@ static void pdf_flush_objstm (pdf_objstm *objstm) { unsigned char pos = objstm->pos; - pdf_obj *stream_obj = objstm->stream; + pdf_obj *stream_obj = objstm->stream, *dict; + pdf_stream *stream; + unsigned char i, *old_buf; + unsigned long old_length; TYPECHECK(stream_obj, PDF_STREAM); - pdf_stream *stream = (pdf_stream *) stream_obj->data; + stream = (pdf_stream *) stream_obj->data; /* Precede stream data by offset table */ - unsigned char *old_buf = stream->stream; - unsigned long old_length = stream->stream_length; + old_buf = stream->stream; + old_length = stream->stream_length; /* Reserve 22 bytes for each entry (two 10 digit numbers plus two spaces) */ stream->stream = NEW(old_length + 22*pos, unsigned char); stream->stream_length = 0; - unsigned char i; for (i = 0; i < pos; i++) { long length = sprintf(format_buffer, "%lu %lu ", objstm->obj_label[i], objstm->obj_pos[i]); pdf_add_stream(stream_obj, format_buffer, length); } - pdf_obj *dict = pdf_stream_dict(stream_obj); + dict = pdf_stream_dict(stream_obj); pdf_add_dict(dict, pdf_new_name("Type"), pdf_new_name("ObjStm")); pdf_add_dict(dict, pdf_new_name("N"), pdf_new_number(pos)); pdf_add_dict(dict, pdf_new_name("First"), pdf_new_number(stream->stream_length)); -- cgit v1.2.3