update version to 2.2.3, update copyright to 2011

git-svn-id: svn+q:///qpdf/trunk@1051 71b93d88-0707-0410-a8cf-f5a4172ac649
2024-12-22 02:49:00 +00:00 · 2011-04-30 19:19:30 +00:00 · 2011-04-30 19:19:30 +00:00 · c551b972f6
commit c551b972f6
parent 6405d3928f
29 changed files with 52 additions and 30 deletions
--- a/2
+++ b/2
@ -1,5 +1,7 @@
 2011-04-30  Jay Berkenbilt  <ejb@ql.org>

+	* 2.2.3: release
+
 	* libqpdf/Pl_QPDFTokenizer.cc (processChar): When an inline image
 	is detected, suspend normalization only up to the end of the
 	inline image rather than for the remainder of the content stream.
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 This is the QPDF package.  Information about it can be found at
 http://qpdf.sourceforge.net.

-QPDF is copyright (c) 2005-2010 Jay Berkenbilt
+QPDF is copyright (c) 2005-2011 Jay Berkenbilt

 This software may be distributed under the terms of version 2 of the
 Artistic License which may be found in the source distribution as
--- a/README.maintainer
+++ b/README.maintainer
@ -27,7 +27,7 @@ Release Reminders
   done or retargeted.

 * Each year, update copyright notices.  Just search for Copyright.
-   Last updated: 2010.
+   Last updated: 2011.

 * To construct a source distribution from a pristine checkout,
   make_dist does the following:
--- a/configure.ac
+++ b/configure.ac
@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl This config.in requires autoconf 2.5 or greater.

 AC_PREREQ(2.60)
-AC_INIT(qpdf,2.2.2)
+AC_INIT(qpdf,2.2.3)

 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
--- a/include/qpdf/Buffer.hh
+++ b/include/qpdf/Buffer.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/Constants.h
+++ b/include/qpdf/Constants.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2010 Jay Berkenbilt
+/* Copyright (c) 2005-2011 Jay Berkenbilt
 *
 * This file is part of qpdf.  This software may be distributed under
 * the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/DLL.h
+++ b/include/qpdf/DLL.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2010 Jay Berkenbilt
+/* Copyright (c) 2005-2011 Jay Berkenbilt
 *
 * This file is part of qpdf.  This software may be distributed under
 * the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/Pipeline.hh
+++ b/include/qpdf/Pipeline.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/Pl_Buffer.hh
+++ b/include/qpdf/Pl_Buffer.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/Pl_Count.hh
+++ b/include/qpdf/Pl_Count.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/Pl_Discard.hh
+++ b/include/qpdf/Pl_Discard.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/Pl_Flate.hh
+++ b/include/qpdf/Pl_Flate.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/Pl_StdioFile.hh
+++ b/include/qpdf/Pl_StdioFile.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/PointerHolder.hh
+++ b/include/qpdf/PointerHolder.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/QPDF.hh
+++ b/include/qpdf/QPDF.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/QPDFExc.hh
+++ b/include/qpdf/QPDFExc.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/QPDFObject.hh
+++ b/include/qpdf/QPDFObject.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/QPDFObjectHandle.hh
+++ b/include/qpdf/QPDFObjectHandle.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/QPDFTokenizer.hh
+++ b/include/qpdf/QPDFTokenizer.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/QPDFWriter.hh
+++ b/include/qpdf/QPDFWriter.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/QPDFXRefEntry.hh
+++ b/include/qpdf/QPDFXRefEntry.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/QTC.hh
+++ b/include/qpdf/QTC.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/QUtil.hh
+++ b/include/qpdf/QUtil.hh
@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Jay Berkenbilt
+// Copyright (c) 2005-2011 Jay Berkenbilt
 //
 // This file is part of qpdf.  This software may be distributed under
 // the terms of version 2 of the Artistic License which may be found
--- a/include/qpdf/qpdf-c.h
+++ b/include/qpdf/qpdf-c.h
@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2010 Jay Berkenbilt
+/* Copyright (c) 2005-2011 Jay Berkenbilt
 *
 * This file is part of qpdf.  This software may be distributed under
 * the terms of version 2 of the Artistic License which may be found
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@ -15,7 +15,7 @@
 #include <qpdf/QPDF_Null.hh>
 #include <qpdf/QPDF_Dictionary.hh>

-std::string QPDF::qpdf_version = "2.2.2";
+std::string QPDF::qpdf_version = "2.2.3";

 void
 QPDF::InputSource::setLastOffset(off_t offset)
--- a/libqpdf/build.mk
+++ b/libqpdf/build.mk
@ -72,4 +72,4 @@ $(OBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.$(LOBJ): libqpdf/%.cc
 # * Otherwise, increment REVISION

 $(TARGETS_libqpdf): $(OBJS_libqpdf)
-	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),6,0,3)
+	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),6,1,3)
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@ -5,8 +5,8 @@
 <!ENTITY mdash "&#x2014;">
 <!ENTITY ndash "&#x2013;">
 <!ENTITY nbsp "&#xA0;">
-<!ENTITY swversion "2.2.2">
-<!ENTITY lastreleased "October 4, 2010">
+<!ENTITY swversion "2.2.3">
+<!ENTITY lastreleased "April 30, 2011">
 ]>
 <book>
 <bookinfo>
@ -16,7 +16,7 @@
   <firstname>Jay</firstname><surname>Berkenbilt</surname>
  </author>
  <copyright>
-   <year>2005&ndash;2010</year>
+   <year>2005&ndash;2011</year>
   <holder>Jay Berkenbilt</holder>
  </copyright>
 </bookinfo>
@ -2074,6 +2074,26 @@ print "\n";
   <filename>ChangeLog</filename> in the source distribution.
  </para>
  <variablelist>
+   <varlistentry>
+    <term>2.2.3: April 30, 2011</term>
+    <listitem>
+     <itemizedlist>
+      <listitem>
+       <para>
+        Improve handling of inline images when normalizing content
+        streams.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Enhance error recovery to properly handle files that use
+        object 0 as a regular object, which is specifically disallowed
+        by the spec.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </varlistentry>
   <varlistentry>
    <term>2.2.2: October 4, 2010</term>
    <listitem>
--- a/qpdf.spec
+++ b/qpdf.spec
@ -1,6 +1,6 @@
 Summary: Command-line tools and library for transforming PDF files
 Name: qpdf
-Version: 2.2.2
+Version: 2.2.3
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@ -556,7 +556,7 @@ int main(int argc, char* argv[])
 	//      12345678901234567890123456789012345678901234567890123456789012345678901234567890
 	std::cout
 	    << whoami << " version " << QPDF::QPDFVersion() << std::endl
-	    << "Copyright (c) 2005-2010 Jay Berkenbilt"
+	    << "Copyright (c) 2005-2011 Jay Berkenbilt"
 	    << std::endl
 	    << "This software may be distributed under the terms of version 2 of the"
 	    << std::endl