summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--README2
-rw-r--r--README.maintainer2
-rw-r--r--configure.ac2
-rw-r--r--include/qpdf/Buffer.hh2
-rw-r--r--include/qpdf/Constants.h2
-rw-r--r--include/qpdf/DLL.h2
-rw-r--r--include/qpdf/Pipeline.hh2
-rw-r--r--include/qpdf/Pl_Buffer.hh2
-rw-r--r--include/qpdf/Pl_Count.hh2
-rw-r--r--include/qpdf/Pl_Discard.hh2
-rw-r--r--include/qpdf/Pl_Flate.hh2
-rw-r--r--include/qpdf/Pl_StdioFile.hh2
-rw-r--r--include/qpdf/PointerHolder.hh2
-rw-r--r--include/qpdf/QPDF.hh2
-rw-r--r--include/qpdf/QPDFExc.hh2
-rw-r--r--include/qpdf/QPDFObject.hh2
-rw-r--r--include/qpdf/QPDFObjectHandle.hh2
-rw-r--r--include/qpdf/QPDFTokenizer.hh2
-rw-r--r--include/qpdf/QPDFWriter.hh2
-rw-r--r--include/qpdf/QPDFXRefEntry.hh2
-rw-r--r--include/qpdf/QTC.hh2
-rw-r--r--include/qpdf/QUtil.hh2
-rw-r--r--include/qpdf/qpdf-c.h2
-rw-r--r--libqpdf/QPDF.cc2
-rw-r--r--libqpdf/build.mk2
-rw-r--r--manual/qpdf-manual.xml26
-rw-r--r--qpdf.spec2
-rw-r--r--qpdf/qpdf.cc2
29 files changed, 52 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 46afbfed..01e43879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/README b/README
index d9cb74b5..e13d476d 100644
--- a/README
+++ b/README
@@ -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
diff --git a/README.maintainer b/README.maintainer
index 71ccda26..134c0e9a 100644
--- 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:
diff --git a/configure.ac b/configure.ac
index 6352b81a..bbb5d19a 100644
--- 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])
diff --git a/include/qpdf/Buffer.hh b/include/qpdf/Buffer.hh
index 09d86996..31db93e2 100644
--- 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
diff --git a/include/qpdf/Constants.h b/include/qpdf/Constants.h
index 13446f92..97708362 100644
--- 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
diff --git a/include/qpdf/DLL.h b/include/qpdf/DLL.h
index 34f79870..384d4fb2 100644
--- 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
diff --git a/include/qpdf/Pipeline.hh b/include/qpdf/Pipeline.hh
index d35cb6ca..796bd0eb 100644
--- 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
diff --git a/include/qpdf/Pl_Buffer.hh b/include/qpdf/Pl_Buffer.hh
index 3a3128ae..a85a595d 100644
--- 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
diff --git a/include/qpdf/Pl_Count.hh b/include/qpdf/Pl_Count.hh
index b2e5515f..c2543f21 100644
--- 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
diff --git a/include/qpdf/Pl_Discard.hh b/include/qpdf/Pl_Discard.hh
index b7e197e6..c08afd88 100644
--- 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
diff --git a/include/qpdf/Pl_Flate.hh b/include/qpdf/Pl_Flate.hh
index fb4b2db8..5244377e 100644
--- 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
diff --git a/include/qpdf/Pl_StdioFile.hh b/include/qpdf/Pl_StdioFile.hh
index 340e8c78..b40f43bb 100644
--- 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
diff --git a/include/qpdf/PointerHolder.hh b/include/qpdf/PointerHolder.hh
index 6ff69117..b9bce8ee 100644
--- 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
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh
index a6ccc409..1ef353e7 100644
--- 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
diff --git a/include/qpdf/QPDFExc.hh b/include/qpdf/QPDFExc.hh
index 72e0d35c..3d04c601 100644
--- 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
diff --git a/include/qpdf/QPDFObject.hh b/include/qpdf/QPDFObject.hh
index b366c33f..46b4734a 100644
--- 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
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh
index a3d7fcce..3e4f633a 100644
--- 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
diff --git a/include/qpdf/QPDFTokenizer.hh b/include/qpdf/QPDFTokenizer.hh
index fc8d0fa2..122c193f 100644
--- 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
diff --git a/include/qpdf/QPDFWriter.hh b/include/qpdf/QPDFWriter.hh
index c117ce91..7a919b0d 100644
--- 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
diff --git a/include/qpdf/QPDFXRefEntry.hh b/include/qpdf/QPDFXRefEntry.hh
index 90fba8a3..a828a4ee 100644
--- 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
diff --git a/include/qpdf/QTC.hh b/include/qpdf/QTC.hh
index 8d0cd69c..862ef5d5 100644
--- 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
diff --git a/include/qpdf/QUtil.hh b/include/qpdf/QUtil.hh
index 5907ea85..7f5a38df 100644
--- 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
diff --git a/include/qpdf/qpdf-c.h b/include/qpdf/qpdf-c.h
index d83adcca..34c21bec 100644
--- 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
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 35d9b400..c8146eff 100644
--- 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)
diff --git a/libqpdf/build.mk b/libqpdf/build.mk
index 603830fb..fad3691d 100644
--- 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)
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index a855234d..9bdb95b3 100644
--- 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>
@@ -2075,6 +2075,26 @@ print "\n";
</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>
<itemizedlist>
diff --git a/qpdf.spec b/qpdf.spec
index 7f399ee0..4c16f57d 100644
--- 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
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index f8d3cedc..de611697 100644
--- 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
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-01 16:54:52 +0200