summaryrefslogtreecommitdiff
path: root/Build/source/libs/xpdf/xpdf-3.02
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-04 10:12:24 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-04 10:12:24 +0000
commitf7af31e336714c75f6472757f24d0c99a7b5e7cf (patch)
treeac78cd023a822f8ed47752c16b62fe0210f18366 /Build/source/libs/xpdf/xpdf-3.02
parentd12182ae92e0bf23fd4c233931b8b8dbd5c741dc (diff)
reorganize libs/xpdf patches
git-svn-id: svn://tug.org/texlive/trunk@12919 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/xpdf/xpdf-3.02')
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/aclocal.m4274
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/goo/GString.cc44
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/goo/gfile.cc39
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h39
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc39
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h39
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h3
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.cc3
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.h39
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h55
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/XRef.cc54
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/XRef.h42
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/config.h55
13 files changed, 310 insertions, 415 deletions
diff --git a/Build/source/libs/xpdf/xpdf-3.02/aclocal.m4 b/Build/source/libs/xpdf/xpdf-3.02/aclocal.m4
new file mode 100644
index 00000000000..b3aeea2fda6
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.02/aclocal.m4
@@ -0,0 +1,274 @@
+# <<< smr.m4 from smr_macros 0.2.4 >>>
+
+dnl ####################### -*- Mode: M4 -*- ###########################
+dnl smr.m4 --
+dnl
+dnl Copyright (C) 1999 Matthew D. Langston <langston@SLAC.Stanford.EDU>
+dnl Copyright (C) 1998 Steve Robbins <stever@cs.mcgill.ca>
+dnl
+dnl This file is free software; you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This file is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this file; if not, write to:
+dnl
+dnl Free Software Foundation, Inc.
+dnl Suite 330
+dnl 59 Temple Place
+dnl Boston, MA 02111-1307, USA.
+dnl ####################################################################
+
+
+dnl NOTE: The macros in this file are extensively documented in the
+dnl accompanying `smr_macros.texi' Texinfo file. Please see the
+dnl Texinfo documentation for the definitive specification of how
+dnl these macros are supposed to work. If the macros work
+dnl differently than the Texinfo documentation says they should,
+dnl then the macros (and not the Texinfo documentation) has the
+dnl bug(s).
+
+dnl This is a convenient macro which translates illegal characters for
+dnl bourne shell variables into legal characters. It has the same
+dnl functionality as sed 'y%./+-:%__p__%'.
+AC_DEFUN([smr_safe_translation], [patsubst(patsubst([$1], [+], [p]), [./-:], [_])])
+
+AC_DEFUN(smr_SWITCH,
+[
+ dnl Define convenient aliases for the arguments since there are so
+ dnl many of them and I keep confusing myself whenever I have to edit
+ dnl this macro.
+ pushdef([smr_name], $1)
+ pushdef([smr_help_string], $2)
+ pushdef([smr_default], $3)
+ pushdef([smr_yes_define], $4)
+ pushdef([smr_no_define], $5)
+
+ dnl Do some sanity checking of the arguments.
+ ifelse([regexp(smr_default, [^\(yes\|no\)$])], -1, [AC_MSG_ERROR($0: third arg must be either yes or no)])
+
+ dnl Create the help string
+ pushdef([smr_lhs], [--ifelse(smr_default, yes, disable, enable)-smr_name])dnl
+ pushdef([smr_rhs], [ifelse(smr_default, yes, disable, enable) smr_help_string (default is smr_default)])dnl
+
+ dnl Add the option to `configure --help'. We don't need to supply the
+ dnl 4th argument to AC_ARG_ENABLE (i.e. the code to set the default
+ dnl value) because that is done below by AC_CACHE_CHECK.
+ AC_ARG_ENABLE([smr_name],
+ AC_HELP_STRING([smr_lhs], [smr_rhs]),
+ smr_cv_enable_[]smr_name=$enableval)
+
+ dnl We cache the result so that the user doesn't have to remember
+ dnl which flags they passed to `configure'.
+ AC_CACHE_CHECK([whether to enable smr_help_string],
+ smr_cv_enable_[]smr_name,
+ smr_cv_enable_[]smr_name=smr_default)
+
+ ifelse(smr_yes_define, , , test x"[$]smr_cv_enable_[]smr_name" = xyes && AC_DEFINE(smr_yes_define))
+ ifelse(smr_no_define, , , test x"[$]smr_cv_enable_[]smr_name" = xno && AC_DEFINE(smr_no_define))
+
+ dnl Sanity check the value assigned to smr_cv_enable_$1 to force it to
+ dnl be either `yes' or `no'.
+ if test ! x"[$]smr_cv_enable_[]smr_name" = xyes; then
+ if test ! x"[$]smr_cv_enable_[]smr_name" = xno; then
+ AC_MSG_ERROR([smr_lhs must be either yes or no])
+ fi
+ fi
+
+ popdef([smr_name])
+ popdef([smr_help_string])
+ popdef([smr_default])
+ popdef([smr_yes_define])
+ popdef([smr_no_define])
+ popdef([smr_lhs])
+ popdef([smr_rhs])
+])
+
+
+AC_DEFUN(smr_ARG_WITHLIB,
+[
+ dnl Define convenient aliases for the arguments since there are so
+ dnl many of them and I keep confusing myself whenever I have to edit
+ dnl this macro.
+ pushdef([smr_name], $1)
+ pushdef([smr_libname], ifelse($2, , smr_name, $2))
+ pushdef([smr_help_string], $3)
+ pushdef([smr_safe_name], smr_safe_translation(smr_name))
+
+ dnl Add the option to `configure --help'. We don't need to supply the
+ dnl 4th argument to AC_ARG_WITH (i.e. the code to set the default
+ dnl value) because that is done below by AC_CACHE_CHECK.
+ AC_ARG_WITH(smr_safe_name-library,
+ AC_HELP_STRING([--with-smr_safe_name-library[[=PATH]]],
+ [use smr_name library ifelse(smr_help_string, , , (smr_help_string))]),
+ smr_cv_with_[]smr_safe_name[]_library=$withval)
+
+ dnl We cache the result so that the user doesn't have to remember
+ dnl which flags they passed to `configure'.
+ AC_CACHE_CHECK([whether to use smr_name library],
+ smr_cv_with_[]smr_safe_name[]_library,
+ smr_cv_with_[]smr_safe_name[]_library=maybe)
+
+
+ case x"[$]smr_cv_with_[]smr_safe_name[]_library" in
+ xyes | xmaybe)
+ smr_safe_name[]_LIBS="-l[]smr_libname"
+ with_[]smr_safe_name=[$]smr_cv_with_[]smr_safe_name[]_library
+ ;;
+ xno)
+ smr_safe_name[]_LIBS=
+ with_[]smr_safe_name=no
+ ;;
+ *)
+ if test -f "[$]smr_cv_with_[]smr_safe_name[]_library"; then
+ smr_safe_name[]_LIBS=[$]smr_cv_with_[]smr_safe_name[]_library
+ elif test -d "[$]smr_cv_with_[]smr_safe_name[]_library"; then
+ smr_safe_name[]_LIBS="-L[$]smr_cv_with_[]smr_safe_name[]_library -l[]smr_libname"
+ else
+ AC_MSG_ERROR([argument must be boolean, file, or directory])
+ fi
+ with_[]smr_safe_name=yes
+ ;;
+ esac
+
+ popdef([smr_name])
+ popdef([smr_libname])
+ popdef([smr_help_string])
+ popdef([smr_safe_name])
+])
+
+
+AC_DEFUN(smr_ARG_WITHINCLUDES,
+[
+ dnl Define convenient aliases for the arguments since there are so
+ dnl many of them and I keep confusing myself whenever I have to edit
+ dnl this macro.
+ pushdef([smr_name], $1)
+ pushdef([smr_header], $2)
+ pushdef([smr_extra_flags], $3)
+ pushdef([smr_safe_name], smr_safe_translation(smr_name))
+
+ dnl Add the option to `configure --help'. We don't need to supply the
+ dnl 4th argument to AC_ARG_WITH (i.e. the code to set the default
+ dnl value) because that is done below by AC_CACHE_CHECK.
+ AC_ARG_WITH(smr_safe_name-includes,
+ AC_HELP_STRING([--with-smr_safe_name-includes[[=DIR]]],
+ [set directory for smr_name headers]),
+ smr_cv_with_[]smr_safe_name[]_includes=$withval)
+
+ dnl We cache the result so that the user doesn't have to remember
+ dnl which flags they passed to `configure'.
+ AC_CACHE_CHECK([where to find the smr_name header files],
+ smr_cv_with_[]smr_safe_name[]_includes,
+ smr_cv_with_[]smr_safe_name[]_includes=)
+
+ if test ! x"[$]smr_cv_with_[]smr_safe_name[]_includes" = x; then
+ if test -d "[$]smr_cv_with_[]smr_safe_name[]_includes"; then
+ smr_safe_name[]_CFLAGS="-I[$]smr_cv_with_[]smr_safe_name[]_includes"
+ else
+ AC_MSG_ERROR([argument must be a directory])
+ fi
+ else
+ smr_safe_name[]_CFLAGS=
+ fi
+
+ dnl This bit of logic comes from the autoconf AC_PROG_CC macro. We
+ dnl need to put the given include directory into CPPFLAGS temporarily,
+ dnl but then restore CPPFLAGS to its old value.
+ smr_test_CPPFLAGS="${CPPFLAGS+set}"
+ smr_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS [$]smr_safe_name[]_CFLAGS smr_extra_flags"
+
+ dnl If the header file smr_header exists, then define
+ dnl HAVE_[]smr_header (in all capitals).
+ AC_CHECK_HEADERS([smr_header],
+ smr_have_[]smr_safe_name[]_header=yes,
+ smr_have_[]smr_safe_name[]_header=no)
+
+ if test x"$smr_test_CPPFLAGS" = xset; then
+ CPPFLAGS=$smr_save_CPPFLAGS
+ else
+ unset CPPFLAGS
+ fi
+
+ popdef([smr_name])
+ popdef([smr_header])
+ popdef([smr_extra_flags])
+ popdef([smr_safe_name])
+])
+
+
+AC_DEFUN(smr_CHECK_LIB,
+[
+ dnl Define convenient aliases for the arguments since there are so
+ dnl many of them and I keep confusing myself whenever I have to edit
+ dnl this macro.
+ pushdef([smr_name], $1)
+ pushdef([smr_libname], ifelse($2, , smr_name, $2))
+ pushdef([smr_help_string], $3)
+ pushdef([smr_function], $4)
+ pushdef([smr_header], $5)
+ pushdef([smr_extra_libs], $6)
+ pushdef([smr_extra_flags], $7)
+ pushdef([smr_prototype], $8)
+ pushdef([smr_safe_name], smr_safe_translation(smr_name))
+
+ dnl Give the user (via "configure --help") an interface to specify
+ dnl whether we should use the library or not, and possibly where we
+ dnl should find it.
+ smr_ARG_WITHLIB([smr_name], [smr_libname], [smr_help_string])
+
+ if test ! x"$with_[]smr_safe_name" = xno; then
+
+ # If we got this far, then the user didn't explicitly ask not to use
+ # the library.
+
+ dnl If the caller of smr_CHECK_LIB specified a header file for this
+ dnl library, then give the user (via "configure --help") an
+ dnl interface to specify where this header file can be found (if it
+ dnl isn't found by the compiler by default).
+ ifelse(smr_header, , , [smr_ARG_WITHINCLUDES(smr_name, smr_header, smr_extra_flags)])
+
+ # We need only look for the library if the header has been found
+ # (or no header is needed).
+ if test [$]smr_have_[]smr_safe_name[]_header != no; then
+
+ AC_CHECK_LIB(smr_libname,
+ smr_function,
+ smr_have_[]smr_safe_name[]_library=yes,
+ smr_have_[]smr_safe_name[]_library=no,
+ [$]smr_safe_name[]_CFLAGS [smr_extra_flags] [$]smr_safe_name[]_LIBS [smr_extra_libs],
+ [ifelse(smr_prototype, , , [[#]include <smr_header>])],
+ smr_prototype)
+ fi
+
+ if test x"[$]smr_have_[]smr_safe_name[]_library" = xyes; then
+ AC_MSG_RESULT([using smr_name library])
+ else
+ smr_safe_name[]_LIBS=
+ smr_safe_name[]_CFLAGS=
+
+ if test x"$with_[]smr_safe_name" = xmaybe; then
+ AC_MSG_RESULT([not using smr_name library])
+ else
+ AC_MSG_WARN([requested smr_name library not found!])
+ fi
+ fi
+ fi
+
+ popdef([smr_name])
+ popdef([smr_libname])
+ popdef([smr_help_string])
+ popdef([smr_function])
+ popdef([smr_header])
+ popdef([smr_extra_libs])
+ popdef([smr_extra_flags])
+ popdef([smr_prototype])
+ popdef([smr_safe_name])
+])
diff --git a/Build/source/libs/xpdf/xpdf-3.02/goo/GString.cc b/Build/source/libs/xpdf/xpdf-3.02/goo/GString.cc
index b397cd5736e..4404985f64b 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/goo/GString.cc
+++ b/Build/source/libs/xpdf/xpdf-3.02/goo/GString.cc
@@ -7,47 +7,9 @@
// Copyright 1996-2003 Glyph & Cog, LLC
//
//========================================================================
-
-/* ------------------------------------------------------------------------
-* Changed by Martin Schröder <martin@pdftex.org>
-* $Id: GString.cc 421 2008-04-26 21:59:55Z oneiros $
-* Changelog:
-* ------------------------------------------------------------------------
-* r196 | oneiros | 2007-07-11 13:56:21 +0200 (Mi, 11 Jul 2007) | 2 lines
-*
-* Merge r195 (compilation problems on IRIX) into stable
-*
-* ------------------------------------------------------------------------
-* r194 | oneiros | 2007-07-10 19:47:01 +0200 (Di, 10 Jul 2007) | 2 lines
-*
-* Merge r193 (compilation problems on IRIX) into stable
-*
-* ------------------------------------------------------------------------
-* r151 | ms | 2007-06-25 18:53:17 +0200 (Mo, 25 Jun 2007) | 3 lines
-*
-* Merging xpdf 3.02 from HEAD into stable
-* svn merge -r149:150 --dry-run svn+ssh://svn/srv/svn/repos/pdftex/trunk/source/src/libs/xpdf .
-*
-* ------------------------------------------------------------------------
-* r38 | ms | 2005-08-21 14:00:00 +0200 (So, 21 Aug 2005) | 2 lines
-*
-* 1.30.1
-*
-* ------------------------------------------------------------------------
-* r6 | ms | 2003-10-06 14:01:00 +0200 (Mo, 06 Okt 2003) | 2 lines
-*
-* released v1.11b
-*
-* ------------------------------------------------------------------------
-* r4 | ms | 2003-10-05 14:00:00 +0200 (So, 05 Okt 2003) | 2 lines
-*
-* Moved sources to src
-*
-* ------------------------------------------------------------------------
-* r1 | ms | 2003-08-02 14:00:00 +0200 (Sa, 02 Aug 2003) | 1 line
-*
-* 1.11a
-*------------------------------------------------------------------------ */
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#include <aconf.h>
diff --git a/Build/source/libs/xpdf/xpdf-3.02/goo/gfile.cc b/Build/source/libs/xpdf/xpdf-3.02/goo/gfile.cc
index 7f59bcdc0d1..6b092a155b8 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/goo/gfile.cc
+++ b/Build/source/libs/xpdf/xpdf-3.02/goo/gfile.cc
@@ -7,42 +7,9 @@
// Copyright 1996-2003 Glyph & Cog, LLC
//
//========================================================================
-
-/* ------------------------------------------------------------------------
-* Changed by Martin Schröder <martin@pdftex.org>
-* $Id: gfile.cc 421 2008-04-26 21:59:55Z oneiros $
-* Changelog:
-* ------------------------------------------------------------------------
-* r151 | ms | 2007-06-25 18:53:17 +0200 (Mo, 25 Jun 2007) | 3 lines
-*
-* Merging xpdf 3.02 from HEAD into stable
-* svn merge -r149:150 --dry-run svn+ssh://svn/srv/svn/repos/pdftex/trunk/source/src/libs/xpdf .
-*
-* ------------------------------------------------------------------------
-* r50 | ms | 2006-02-16 13:00:00 +0100 (Do, 16 Feb 2006) | 2 lines
-*
-* 1.30.6
-*
-* ------------------------------------------------------------------------
-* r11 | ms | 2004-09-06 14:01:00 +0200 (Mo, 06 Sep 2004) | 2 lines
-*
-* 1.20a
-*
-* ------------------------------------------------------------------------
-* r6 | ms | 2003-10-06 14:01:00 +0200 (Mo, 06 Okt 2003) | 2 lines
-*
-* released v1.11b
-*
-* ------------------------------------------------------------------------
-* r4 | ms | 2003-10-05 14:00:00 +0200 (So, 05 Okt 2003) | 2 lines
-*
-* Moved sources to src
-*
-* ------------------------------------------------------------------------
-* r1 | ms | 2003-08-02 14:00:00 +0200 (Sa, 02 Aug 2003) | 1 line
-*
-* 1.11a
-* ------------------------------------------------------------------------ */
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#include <aconf.h>
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h
index c3ad5a5b6e7..14cdaacca7b 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Decrypt.h
@@ -5,42 +5,9 @@
// Copyright 1996-2003 Glyph & Cog, LLC
//
//========================================================================
-
-/* ------------------------------------------------------------------------
-* Changed by Martin Schröder <martin@pdftex.org>
-* $Id: Decrypt.h 421 2008-04-26 21:59:55Z oneiros $
-* Changelog:
-* ------------------------------------------------------------------------
-* r320 | oneiros | 2007-12-18 13:40:01 +0100 (Di, 18 Dez 2007) | 2 lines
-*
-* Import libpng 1.2.24 into stable
-*
-* ------------------------------------------------------------------------
-* r151 | ms | 2007-06-25 18:53:17 +0200 (Mo, 25 Jun 2007) | 3 lines
-*
-* Merging xpdf 3.02 from HEAD into stable
-* svn merge -r149:150 --dry-run svn+ssh://svn/srv/svn/repos/pdftex/trunk/source/src/libs/xpdf .
-*
-* ------------------------------------------------------------------------
-* r38 | ms | 2005-08-21 14:00:00 +0200 (So, 21 Aug 2005) | 2 lines
-*
-* 1.30.1
-*
-* ------------------------------------------------------------------------
-* r6 | ms | 2003-10-06 14:01:00 +0200 (Mo, 06 Okt 2003) | 2 lines
-*
-* released v1.11b
-*
-* ------------------------------------------------------------------------
-* r4 | ms | 2003-10-05 14:00:00 +0200 (So, 05 Okt 2003) | 2 lines
-*
-* Moved sources to src
-*
-* ------------------------------------------------------------------------
-* r1 | ms | 2003-08-02 14:00:00 +0200 (Sa, 02 Aug 2003) | 1 line
-*
-* 1.11a
-* ------------------------------------------------------------------------ */
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#ifndef DECRYPT_H
#define DECRYPT_H
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc b/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc
index c4ecd967806..ad63b7d69d0 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.cc
@@ -5,42 +5,9 @@
// Copyright 2001-2003 Glyph & Cog, LLC
//
//========================================================================
-
-/* ------------------------------------------------------------------------
-* Changed by Martin Schröder <martin@pdftex.org>
-* $Id: GlobalParams.cc 421 2008-04-26 21:59:55Z oneiros $
-* Changelog:
-* ------------------------------------------------------------------------
-* r151 | ms | 2007-06-25 18:53:17 +0200 (Mo, 25 Jun 2007) | 3 lines
-*
-* Merging xpdf 3.02 from HEAD into stable
-* svn merge -r149:150 --dry-run svn+ssh://svn/srv/svn/repos/pdftex/trunk/source/src/libs/xpdf .
-*
-* ------------------------------------------------------------------------
-* r38 | ms | 2005-08-21 14:00:00 +0200 (So, 21 Aug 2005) | 2 lines
-*
-* 1.30.1
-*
-* ------------------------------------------------------------------------
-* r11 | ms | 2004-09-06 14:01:00 +0200 (Mo, 06 Sep 2004) | 2 lines
-*
-* 1.20a
-*
-* ------------------------------------------------------------------------
-* r6 | ms | 2003-10-06 14:01:00 +0200 (Mo, 06 Okt 2003) | 2 lines
-*
-* released v1.11b
-*
-* ------------------------------------------------------------------------
-* r4 | ms | 2003-10-05 14:00:00 +0200 (So, 05 Okt 2003) | 2 lines
-*
-* Moved sources to src
-*
-* ------------------------------------------------------------------------
-* r1 | ms | 2003-08-02 14:00:00 +0200 (Sa, 02 Aug 2003) | 1 line
-*
-* 1.11a
-* ------------------------------------------------------------------------ */
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#include <aconf.h>
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h
index cd10e76b04c..3d19e4f4f4c 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/GlobalParams.h
@@ -5,42 +5,9 @@
// Copyright 2001-2003 Glyph & Cog, LLC
//
//========================================================================
-
-/* ------------------------------------------------------------------------
-* Changed by Martin Schröder <martin@pdftex.org>
-* $Id: GlobalParams.h 421 2008-04-26 21:59:55Z oneiros $
-* Changelog:
-* ------------------------------------------------------------------------
-* r151 | ms | 2007-06-25 18:53:17 +0200 (Mo, 25 Jun 2007) | 3 lines
-*
-* Merging xpdf 3.02 from HEAD into stable
-* svn merge -r149:150 --dry-run svn+ssh://svn/srv/svn/repos/pdftex/trunk/source/src/libs/xpdf .
-*
-* ------------------------------------------------------------------------
-* r38 | ms | 2005-08-21 14:00:00 +0200 (So, 21 Aug 2005) | 2 lines
-*
-* 1.30.1
-*
-* ------------------------------------------------------------------------
-* r11 | ms | 2004-09-06 14:01:00 +0200 (Mo, 06 Sep 2004) | 2 lines
-*
-* 1.20a
-*
-* ------------------------------------------------------------------------
-* r6 | ms | 2003-10-06 14:01:00 +0200 (Mo, 06 Okt 2003) | 2 lines
-*
-* released v1.11b
-*
-* ------------------------------------------------------------------------
-* r4 | ms | 2003-10-05 14:00:00 +0200 (So, 05 Okt 2003) | 2 lines
-*
-* Moved sources to src
-*
-* ------------------------------------------------------------------------
-* r1 | ms | 2003-08-02 14:00:00 +0200 (Sa, 02 Aug 2003) | 1 line
-*
-* 1.11a
-* ------------------------------------------------------------------------ */
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#ifndef GLOBALPARAMS_H
#define GLOBALPARAMS_H
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h
index b3b44e7306f..792d37ab18c 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/PDFDoc.h
@@ -5,6 +5,9 @@
// Copyright 1996-2003 Glyph & Cog, LLC
//
//========================================================================
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#ifndef PDFDOC_H
#define PDFDOC_H
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.cc b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.cc
index 2a7540b06c0..376edf04f1f 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.cc
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.cc
@@ -5,6 +5,9 @@
// Copyright 1996-2007 Glyph & Cog, LLC
//
//========================================================================
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#include <aconf.h>
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.h
index 1ed0431d5d7..ab2d296d424 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.h
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Page.h
@@ -5,42 +5,9 @@
// Copyright 1996-2003 Glyph & Cog, LLC
//
//========================================================================
-
-/* ------------------------------------------------------------------------
-* Changed by Martin Schröder <martin@pdftex.org>
-* $Id: Page.h 421 2008-04-26 21:59:55Z oneiros $
-* Changelog:
-* ------------------------------------------------------------------------
-* r151 | ms | 2007-06-25 18:53:17 +0200 (Mo, 25 Jun 2007) | 3 lines
-*
-* Merging xpdf 3.02 from HEAD into stable
-* svn merge -r149:150 --dry-run svn+ssh://svn/srv/svn/repos/pdftex/trunk/source/src/libs/xpdf .
-*
-* ------------------------------------------------------------------------
-* r38 | ms | 2005-08-21 14:00:00 +0200 (So, 21 Aug 2005) | 2 lines
-*
-* 1.30.1
-*
-* ------------------------------------------------------------------------
-* r11 | ms | 2004-09-06 14:01:00 +0200 (Mo, 06 Sep 2004) | 2 lines
-*
-* 1.20a
-*
-* ------------------------------------------------------------------------
-* r6 | ms | 2003-10-06 14:01:00 +0200 (Mo, 06 Okt 2003) | 2 lines
-*
-* released v1.11b
-*
-* ------------------------------------------------------------------------
-* r4 | ms | 2003-10-05 14:00:00 +0200 (So, 05 Okt 2003) | 2 lines
-*
-* Moved sources to src
-*
-* ------------------------------------------------------------------------
-* r1 | ms | 2003-08-02 14:00:00 +0200 (Sa, 02 Aug 2003) | 1 line
-*
-* 1.11a
-* ------------------------------------------------------------------------ */
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#ifndef PAGE_H
#define PAGE_H
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h
index 18f06362fe7..ef592eb0927 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Stream.h
@@ -5,58 +5,9 @@
// Copyright 1996-2003 Glyph & Cog, LLC
//
//========================================================================
-
-/* ------------------------------------------------------------------------
-* Changed by Martin Schröder <martin@pdftex.org>
-* $Id: Stream.h 421 2008-04-26 21:59:55Z oneiros $
-* Changelog:
-* ------------------------------------------------------------------------
-* r320 | oneiros | 2007-12-18 13:40:01 +0100 (Di, 18 Dez 2007) | 2 lines
-*
-* Import libpng 1.2.24 into stable
-*
-* ------------------------------------------------------------------------
-* r268 | oneiros | 2007-11-11 22:45:02 +0100 (So, 11 Nov 2007) | 3 lines
-*
-* Merge xpdf 3.02pl2
-* svn merge -r215:266 http://scm.foundry.supelec.fr/svn/pdftex/vendor/xpdf/current .
-*
-* ------------------------------------------------------------------------
-* r151 | ms | 2007-06-25 18:53:17 +0200 (Mo, 25 Jun 2007) | 3 lines
-*
-* Merging xpdf 3.02 from HEAD into stable
-* svn merge -r149:150 --dry-run svn+ssh://svn/srv/svn/repos/pdftex/trunk/source/src/libs/xpdf .
-*
-* ------------------------------------------------------------------------
-* r48 | ms | 2005-12-04 13:00:00 +0100 (So, 04 Dez 2005) | 2 lines
-*
-* 1.30.5
-*
-* ------------------------------------------------------------------------
-* r38 | ms | 2005-08-21 14:00:00 +0200 (So, 21 Aug 2005) | 2 lines
-*
-* 1.30.1
-*
-* ------------------------------------------------------------------------
-* r11 | ms | 2004-09-06 14:01:00 +0200 (Mo, 06 Sep 2004) | 2 lines
-*
-* 1.20a
-*
-* ------------------------------------------------------------------------
-* r6 | ms | 2003-10-06 14:01:00 +0200 (Mo, 06 Okt 2003) | 2 lines
-*
-* released v1.11b
-*
-* ------------------------------------------------------------------------
-* r4 | ms | 2003-10-05 14:00:00 +0200 (So, 05 Okt 2003) | 2 lines
-*
-* Moved sources to src
-*
-* ------------------------------------------------------------------------
-* r1 | ms | 2003-08-02 14:00:00 +0200 (Sa, 02 Aug 2003) | 1 line
-*
-* 1.11a
-* ------------------------------------------------------------------------ */
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#ifndef STREAM_H
#define STREAM_H
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/XRef.cc b/Build/source/libs/xpdf/xpdf-3.02/xpdf/XRef.cc
index e9b3b0274f8..6fbf8b5d032 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/XRef.cc
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/XRef.cc
@@ -5,57 +5,9 @@
// Copyright 1996-2003 Glyph & Cog, LLC
//
//========================================================================
-
-/* ------------------------------------------------------------------------
-* Changed by Martin Schröder <martin@pdftex.org>
-* $Id: XRef.cc 421 2008-04-26 21:59:55Z oneiros $
-* Changelog:
-* ------------------------------------------------------------------------
-* r151 | ms | 2007-06-25 18:53:17 +0200 (Mo, 25 Jun 2007) | 3 lines
-*
-* Merging xpdf 3.02 from HEAD into stable
-* svn merge -r149:150 --dry-run svn+ssh://svn/srv/svn/repos/pdftex/trunk/source/src/libs/xpdf .
-*
-* ------------------------------------------------------------------------
-* r77 | ms | 2007-01-01 13:01:00 +0100 (Mo, 01 Jan 2007) | 2 lines
-*
-* 1.40.0
-*
-* ------------------------------------------------------------------------
-* r38 | ms | 2005-08-21 14:00:00 +0200 (So, 21 Aug 2005) | 2 lines
-*
-* 1.30.1
-*
-* ------------------------------------------------------------------------
-* r24 | ms | 2005-02-04 13:01:00 +0100 (Fr, 04 Feb 2005) | 2 lines
-*
-* 1.21a
-*
-* ------------------------------------------------------------------------
-* r21 | ms | 2004-12-22 13:01:00 +0100 (Mi, 22 Dez 2004) | 2 lines
-*
-* 1.20b
-*
-* ------------------------------------------------------------------------
-* r11 | ms | 2004-09-06 14:01:00 +0200 (Mo, 06 Sep 2004) | 2 lines
-*
-* 1.20a
-*
-* ------------------------------------------------------------------------
-* r6 | ms | 2003-10-06 14:01:00 +0200 (Mo, 06 Okt 2003) | 2 lines
-*
-* released v1.11b
-*
-* ------------------------------------------------------------------------
-* r4 | ms | 2003-10-05 14:00:00 +0200 (So, 05 Okt 2003) | 2 lines
-*
-* Moved sources to src
-*
-* ------------------------------------------------------------------------
-* r1 | ms | 2003-08-02 14:00:00 +0200 (Sa, 02 Aug 2003) | 1 line
-*
-* 1.11a
-* ------------------------------------------------------------------------ */
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#include <aconf.h>
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/XRef.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/XRef.h
index 0db6cee36df..c8ecaaec436 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/XRef.h
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/XRef.h
@@ -5,45 +5,9 @@
// Copyright 1996-2003 Glyph & Cog, LLC
//
//========================================================================
-
-/* ------------------------------------------------------------------------
-* Changed by Martin Schröder <martin@pdftex.org>
-* $Id: XRef.h 421 2008-04-26 21:59:55Z oneiros $
-* Changelog:
-* ------------------------------------------------------------------------
-* r151 | ms | 2007-06-25 18:53:17 +0200 (Mo, 25 Jun 2007) | 3 lines
-*
-* Merging xpdf 3.02 from HEAD into stable
-* svn merge -r149:150 --dry-run svn+ssh://svn/srv/svn/repos/pdftex/trunk/source/src/libs/xpdf .
-*
-* ------------------------------------------------------------------------
-* r77 | ms | 2007-01-01 13:01:00 +0100 (Mo, 01 Jan 2007) | 2 lines
-*
-* 1.40.0
-*
-* ------------------------------------------------------------------------
-* r38 | ms | 2005-08-21 14:00:00 +0200 (So, 21 Aug 2005) | 2 lines
-*
-* 1.30.1
-* r11 | ms | 2004-09-06 14:01:00 +0200 (Mo, 06 Sep 2004) | 2 lines
-*
-* 1.20a
-*
-* ------------------------------------------------------------------------
-* r6 | ms | 2003-10-06 14:01:00 +0200 (Mo, 06 Okt 2003) | 2 lines
-*
-* released v1.11b
-*
-* ------------------------------------------------------------------------
-* r4 | ms | 2003-10-05 14:00:00 +0200 (So, 05 Okt 2003) | 2 lines
-*
-* Moved sources to src
-*
-* ------------------------------------------------------------------------
-* r1 | ms | 2003-08-02 14:00:00 +0200 (Sa, 02 Aug 2003) | 1 line
-*
-* 1.11a
-* ------------------------------------------------------------------------ */
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#ifndef XREF_H
#define XREF_H
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/config.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/config.h
index c81f7983546..49e72ad0eb3 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/config.h
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/config.h
@@ -5,58 +5,9 @@
// Copyright 1996-2007 Glyph & Cog, LLC
//
//========================================================================
-
-/* ------------------------------------------------------------------------
-* Changed by Martin Schröder <martin@pdftex.org>
-* $Id: config.h 421 2008-04-26 21:59:55Z oneiros $
-* Changelog:
-* ------------------------------------------------------------------------
-* r268 | oneiros | 2007-11-11 22:45:02 +0100 (So, 11 Nov 2007) | 3 lines
-*
-* Merge xpdf 3.02pl2
-* svn merge -r215:266 http://scm.foundry.supelec.fr/svn/pdftex/vendor/xpdf/current .
-*
-* ------------------------------------------------------------------------
-* r215 | oneiros | 2007-07-31 18:32:04 +0200 (Di, 31 Jul 2007) | 2 lines
-*
-* Merge changes from trunk into stable: 203-207,213-214
-*
-* ------------------------------------------------------------------------
-* r151 | ms | 2007-06-25 18:53:17 +0200 (Mo, 25 Jun 2007) | 3 lines
-*
-* Merging xpdf 3.02 from HEAD into stable
-* svn merge -r149:150 --dry-run svn+ssh://svn/srv/svn/repos/pdftex/trunk/source/src/libs/xpdf .
-*
-* ------------------------------------------------------------------------
-* r86 | ms | 2007-01-31 13:01:00 +0100 (Mi, 31 Jan 2007) | 2 lines
-*
-* 1.40.2
-*
-* ------------------------------------------------------------------------
-* r38 | ms | 2005-08-21 14:00:00 +0200 (So, 21 Aug 2005) | 2 lines
-*
-* 1.30.1
-*
-* ------------------------------------------------------------------------
-* r11 | ms | 2004-09-06 14:01:00 +0200 (Mo, 06 Sep 2004) | 2 lines
-*
-* 1.20a
-*
-* ------------------------------------------------------------------------
-* r6 | ms | 2003-10-06 14:01:00 +0200 (Mo, 06 Okt 2003) | 2 lines
-*
-* released v1.11b
-*
-* ------------------------------------------------------------------------
-* r4 | ms | 2003-10-05 14:00:00 +0200 (So, 05 Okt 2003) | 2 lines
-*
-* Moved sources to src
-*
-* ------------------------------------------------------------------------
-* r1 | ms | 2003-08-02 14:00:00 +0200 (Sa, 02 Aug 2003) | 1 line
-*
-* 1.11a
-* ------------------------------------------------------------------------ */
+// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+// See top-level ChangeLog for a list of all modifications
+//========================================================================
#ifndef CONFIG_H
#define CONFIG_H