octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-11-18 10:25:12 +00:00
Code Issues Releases Wiki Activity
2,367 Commits 16 Branches 95 Tags 40 MiB
08ba21cf49
Commit Graph

1086 Commits

Author SHA1 Message Date
Jay Berkenbilt
a4fd4b91c6 Convert stream filtering errors to warnings 2017-07-27 18:43:07 -04:00
Jay Berkenbilt
40f00122b8 Convert object parsing errors to warnings 
QPDFObjectHandle::parseInternal now issues warnings instead of
throwing exceptions for all error conditions that it finds (except
internal logic errors) and has stronger recovery for things like
invalid tokens and malformed dictionaries. This should improve qpdf's
ability to recover from a wide range of broken files that currently
cause it to fail.
 2017-07-27 18:20:31 -04:00
Jay Berkenbilt
dd8dad74f4 Move lexer helper functions to QUtil 2017-07-27 13:59:56 -04:00
Jay Berkenbilt
0a745021e7 Remove PCRE from QPDFTokenizer 2017-07-27 13:59:56 -04:00
slurdge
8740b380fe Make windows includes lowercase (fixes #123) 
For cross compiling.
 2017-07-26 06:39:09 -04:00
Jay Berkenbilt
12db09898e Don't interpret word tokens in content streams (fixes #82) 2017-07-26 06:24:07 -04:00
Jay Berkenbilt
701b518d5c Detect recursion loops resolving objects (fixes #51) 
During parsing of an object, sometimes parts of the object have to be
resolved. An example is stream lengths. If such an object directly or
indirectly points to the object being parsed, it can cause an infinite
loop. Guard against all cases of re-entrant resolution of objects.
 2017-07-26 06:24:07 -04:00
Jay Berkenbilt
afe0242b26 Handle object ID 0 (fixes #99) 
This is CVE-2017-9208.

The QPDF library uses object ID 0 internally as a sentinel to
represent a direct object, but prior to this fix, was not blocking
handling of 0 0 obj or 0 0 R as a special case. Creating an object in
the file with 0 0 obj could cause various infinite loops. The PDF spec
doesn't allow for object 0. Having qpdf handle object 0 might be a
better fix, but changing all the places in the code that assumes objid
== 0 means direct would be risky.
 2017-07-26 06:24:07 -04:00
Jay Berkenbilt
315092dd98 Avoid xref reconstruction infinite loop (fixes #100) 
This is CVE-2017-9209.
 2017-07-26 06:24:07 -04:00
Jay Berkenbilt
603f222365 Fix infinite loop while reporting an error (fixes #101) 
This is CVE-2017-9210.

The description string for an error message included unparsing an
object, which is too complex of a thing to try to do while throwing an
exception. There was only one example of this in the entire codebase,
so it is not a pervasive problem. Fixing this eliminated one class of
infinite loop errors.
 2017-07-26 06:24:07 -04:00
Thorsten Schöning
b3c08f4f8d C++-Builder supports 64 Bit file functions 
The 64 Bit file functions are supported by C++-Builder as well and
need to be used, else fseek will error out on larger files than 4 GB
like used in the large file test.
 2016-01-24 12:07:20 -05:00
Jay Berkenbilt
b7302a9b72 Prepare 6.0.0 release 2015-11-10 12:48:52 -05:00
Jay Berkenbilt
1f4a67912c Bump library soname 
Also update maintainer documentation on binary compatibility testing.
 2015-11-10 12:42:37 -05:00
Jay Berkenbilt
e0e9d64674 Remove some ABI compatibility private methods 
Since we have to bump soname, remove some private methods that were
just there for binary compatibility
 2015-11-10 12:22:40 -05:00
Jay Berkenbilt
e5abc789a2 Prepare 5.2.0 release 2015-11-01 16:40:01 -05:00
Jay Berkenbilt
b62cbe2508 Tolerate some mangled xref tables 
If xref table entries lack the spec-required trailing whitespace or
contain a small amount of extra space, handle them anyway.
 2015-10-31 18:56:43 -04:00
Jay Berkenbilt
f0b85a1eb1 Remove trailing whitespace 2015-10-31 18:56:43 -04:00
Jay Berkenbilt
b029555909 Bump soname minor revision for ABI additions 2015-10-31 18:56:43 -04:00
Jay Berkenbilt
b8bdef0ad1 Implement deterministic ID 
For non-encrypted files, determinstic ID generation uses file contents
instead of timestamp and file name. At a small runtime cost, this
enables generation of the same /ID if the same inputs are converted in
the same way multiple times.
 2015-10-31 18:56:42 -04:00
Jay Berkenbilt
94e55394ed Prepare 5.1.3 release 2015-05-24 17:26:49 -04:00
Jay Berkenbilt
cf43882e9f Handle Microsoft crypt provider without prior keys 
As reported in issue #40, a call to CryptAcquireContext in
SecureRandomDataProvider fails in a fresh windows install prior to any
user keys being created in AppData\Roaming\Microsoft\Crypto\RSA.

Thanks michalrames.
 2015-05-24 16:52:42 -04:00
Jay Berkenbilt
a11549a566 Detect loops in /Pages structure 
Pushing inherited objects to pages and getting all pages were both
prone to stack overflow infinite loops if there were loops in the
Pages dictionary. There is a general weakness in the code in that any
part of the code that traverses the Pages structure would be prone to
this and would have to implement its own loop detection. A more robust
fix may provide some general method for handling the Pages structure,
but it's probably not worth doing.

Note: addition of *Internal2 private functions was done rather than
changing signatures of existing methods to avoid breaking
compatibility.
 2015-02-21 19:47:11 -05:00
Jay Berkenbilt
28a9df5119 Avoid buffer overrun copying digest 
Converting a password to an encryption key is supposed to copy up to a
certain number of bytes from a digest. Make sure never to copy more
than the size of the digest.
 2015-02-21 17:51:08 -05:00
Jay Berkenbilt
c729e07d55 Avoid resolving arguments to R 
When checking two objects preceding R while parsing, ensure that the
objects are direct. This avoids stuff like 1 0 obj containing 1 0 R 0 R
from causing an infinite loop in object resolution.
 2015-02-21 17:51:08 -05:00
Jay Berkenbilt
d8900c2255 Handle page tree node with no /Type 
Original reported here:
https://bugs.launchpad.net/ubuntu/+source/qpdf/+bug/1397413

The PDF specification says that the /Type key for nodes in the pages
dictionary (both /Page and /Pages) is required, but some PDF files
omit them. Use the presence of other keys to determine the type of
pages tree node this is if the type key is not found.
 2014-12-29 10:17:21 -05:00
Jay Berkenbilt
caab1b0e16 Handle pages with no /Contents from getPageContents() 
The spec allows /Contents to be omitted for pages that are blank, but
QPDFObjectHandle::getPageContents() was throwing an exception in this
case.
 2014-11-14 13:43:34 -05:00
Jay Berkenbilt
4071db59aa Prepare 5.1.2 release 2014-06-07 17:16:52 -04:00
Jay Berkenbilt
9f8aba1db7 Handle indirect stream filter/decode parameters 
QPDFWriter was trying to make /Filter and /DecodeParms direct in all
cases, but there are some cases where /DecodeParms may refer to a
stream, which can't be direct. QPDFWriter doesn't actually need
/DecodeParms to be direct in that case because it won't be able to
filter the stream. Until we can handle this type of stream, just don't
make /Filter and /DecodeParms direct if we can't filter the stream
anyway.

Fixes #34
 2014-06-07 16:31:03 -04:00
Jay Berkenbilt
b0a96ce6aa Fix calculation of xref stream stream columns 
Fix problem: if the last object in the first part of a linearized file
had an offset that was below 65536 by less than the size of the hint
stream, the xref stream was invalid and the resulting file is not
usable.
 2014-02-22 22:13:31 -05:00
Jay Berkenbilt
247d70efee Prepare 5.1.1 release 2014-01-14 15:45:35 -05:00
Jay Berkenbilt
c9a9fe9c2f Avoid traversing same object twice when copying objects 
This is a performance fix.  The output is unchanged.

Fixes #28.
 2013-12-26 11:51:50 -05:00
Jay Berkenbilt
0b6127558d Prepare 5.1.0 release 2013-12-17 15:26:07 -05:00
Jay Berkenbilt
6067608d93 Remove needless #ifdef _WIN32 from getWhoami 2013-12-16 16:21:28 -05:00
Jay Berkenbilt
235d8f28f8 Increase random data provider support 
Add a method to get the current random data provider, and document and
test the method for resetting it.
 2013-12-16 16:21:28 -05:00
Jay Berkenbilt
b802ca47e9 Comments about incremental update support 
Also remove some trivial, non-functional code.
 2013-12-14 15:17:36 -05:00
Jay Berkenbilt
30287d2d65 Allow OS-provided secure random to be disabled 2013-12-14 15:17:36 -05:00
Jay Berkenbilt
5e3bad2f86 Refactor random data generation 
Add new RandomDataProvider object and implement existing random number
generation in terms of that.  This enables end users to supply their
own random data providers.
 2013-12-14 15:17:35 -05:00
Jay Berkenbilt
e9a319fb95 Allow arbitrary whitespace, not just newline, after xref 
Fixes #27.
 2013-12-14 15:17:23 -05:00
Jay Berkenbilt
7393a03868 Update lastOffset when reading 2013-12-14 15:17:07 -05:00
Jay Berkenbilt
478c05fcab Allow -DNO_GET_ENVIRONMENT to avoid GetEnvironmentVariable 
If NO_GET_ENVIRONMENT is #defined at compile time on Windows, do not
call GetEnvironmentVariable.  QUtil::get_env will always return
false.  This option is not available through configure.  This was
added to support a specific user's requirements to avoid calling
GetEnvironmentVariable from the Windows API.  Nothing in qpdf outside
the test coverage system in qtest relies on QUtil::get_env.
 2013-11-30 15:58:32 -05:00
Jay Berkenbilt
dc9df97466 Include <algorithm> for std::min, std::max 2013-11-29 10:48:16 -05:00
Jay Berkenbilt
e1bd72b46c Prepare for 5.0.1 release 2013-10-18 13:51:30 -04:00
Jay Berkenbilt
a237e92445 Warn when -accessibility=n will be ignored 
Also accept -accessibility=n with 256 bit keys even though it will be
ignored.
 2013-10-18 10:45:15 -04:00
Jay Berkenbilt
ac9c1f0d56 Security: replace operator[] with at 
For std::string and std::vector, replace operator[] with at.  This was
done using an automated process.  See README.hardening for details.
 2013-10-18 10:45:14 -04:00
Jay Berkenbilt
4229457068 Security: use a secure random number generator 
If not available, give an error.  The user may also configure qpdf to
use an insecure random number generator.
 2013-10-18 10:45:12 -04:00
Jay Berkenbilt
e19eb579b2 Replace some assertions with std::logic_error 
Ideally, the library should never call assert outside of test code,
but it does in several places.  For some cases where the assertion
might conceivably fail because of a problem with the input data,
replace assertions with exceptions so that they can be trapped by the
calling application.  This commit surely misses some cases and
replaced some cases unnecessarily, but it should still be an
improvement.
 2013-10-09 20:57:14 -04:00
Jay Berkenbilt
0bfe902489 Security: avoid pre-allocating vectors based on file data 
In places where std::vector<T>(size_t) was used, either validate that
the size parameter is sane or refactor code to avoid the need to
pre-allocate the vector.
 2013-10-09 20:57:14 -04:00
Jay Berkenbilt
10bceb552f Security: sanitize /W in xref stream 
The /W array was not sanitized, possibly causing an integer overflow
in a multiplication. An analysis of the code suggests that there were
no possible exploits based on this since the problems were in checking
expected values but bounds checks were performed on actual values.
 2013-10-09 20:57:07 -04:00
Jay Berkenbilt
3eb4b066ab Security: better bounds checks for linearization data 
The faulty code was only used during explicit checks of linearization
data.  Those checks are not part of normal reading or writing of PDF
files.
 2013-10-09 19:50:09 -04:00
Jay Berkenbilt
b097d7a81b Security: handle empty name in normalizeName 2013-10-09 19:50:09 -04:00
Jay Berkenbilt
eb1b1264b4 Security: fix potential multiplication overflow 
Better sanity check inputs to bit stream reader
 2013-10-09 19:50:09 -04:00
Jay Berkenbilt
c2e91d8ec3 Security: keep cur_byte pointing into bytes array 2013-10-09 19:50:07 -04:00
Jay Berkenbilt
66e63b8667 Prepare 5.0.0 release 2013-07-10 12:29:13 -04:00
Jay Berkenbilt
cee2592ed1 Change API/ABI and withdraw 4.2.0 
4.2.0 was binary incompatible in spite of there being no deletions or
changes to any public methods.  As such, we have to bump the ABI and
are fixing some API breakage while we're at it.

Previous 4.3.0 target is now 5.1.0.
 2013-07-10 11:30:13 -04:00
Jay Berkenbilt
f31e526d67 Prepare 4.2.0 release 2013-07-07 19:43:16 -04:00
Jay Berkenbilt
b84f57e56d Ignore broken DecodeParms for stream with no filters 2013-07-07 19:43:16 -04:00
Jay Berkenbilt
88bacb6449 Fix QPDFObjGen constructor implementation 2013-07-07 19:43:01 -04:00
Jay Berkenbilt
212812d837 Fix errors reported by Coverity 
Thanks to Jiri Popelka from Red Hat for sending the output of a
Coverity run over qpdf.
 2013-07-07 15:36:51 -04:00
Jay Berkenbilt
a85007cb0d Handle more broken files 
Space rather than newline after xref, missing /ID in trailer for
encrypted file.  This enables qpdf to handle some files that xpdf can
handle.  Adobe reader can't necessarily handle them.
 2013-06-15 12:40:01 -04:00
Jay Berkenbilt
16051788ed Handle /Outlines dictionary being a direct object 
Even though this case is not valid according to the spec, it has been
seen, and caused an internal error.
 2013-06-14 21:36:04 -04:00
Jay Berkenbilt
eae8370cd9 Add optional /Length key in crypt filter dictionary 2013-06-14 20:42:39 -04:00
Jay Berkenbilt
a3576a7359 Bug fix: handle generation > 0 when generating object streams 
Rework QPDFWriter to always track old object IDs and QPDFObjGen
instead of int, thus not discarding the generation number.  Switch to
QPDF::getCompressibleObjGen() to properly handle the case of an old
object eligible for compression that has a generation of other than
zero.
 2013-06-14 14:58:09 -04:00
Jay Berkenbilt
96eb965115 Use QPDFObjectHandle::getObjGen() where appropriate 
In internal code and examples, replace calls to getObjectID() and
getGeneration() with calls to getObjGen() where possible.
 2013-06-14 14:58:09 -04:00
Jay Berkenbilt
5039da0b91 Add QPDFObjectHandle::getObjGen() 
This is safer than getObjectID() and getGeneration() for many uses.
 2013-06-14 14:58:09 -04:00
Jay Berkenbilt
d88231e01e Promote QPDF::ObjGen to top-level object QPDFObjGen 2013-06-14 14:58:08 -04:00
Jay Berkenbilt
690d6031db Remove duplicated comment 2013-06-08 18:58:31 -04:00
Jay Berkenbilt
f02c5f5e12 Final preparation for 4.1.0 release 2013-04-14 15:03:51 -04:00
Jay Berkenbilt
403bb68d33 Run spelling checker 2013-04-14 14:36:25 -04:00
Jay Berkenbilt
2d02b3cc3d Add explicit int to double cast 2013-04-04 14:13:31 -04:00
Jay Berkenbilt
8e636ea680 Protect gcc diagnostic pragmas with gcc version 
Versions prior to 4.6 didn't allow gcc diagnostic pragmas with push
and pop and to appear anywhere in the file.  Just let the warning be
there for those versions.
 2013-03-27 17:36:28 -04:00
Jay Berkenbilt
29f5830325 Fix getTypeCode and getTypeName work for indirect objects 
Remove const qualifier from getTypeCode and get getTypeName methods of
QPDFObjectHandle, make them work properly for indirect objects, and
exercise them much better in the test suite.
 2013-03-05 13:35:46 -05:00
Jay Berkenbilt
119f2a4b68 Add method to terminate content stream parsing 2013-03-05 13:35:46 -05:00
Jay Berkenbilt
fd64959398 Favor strerror_s and fopen_s on MSVC 
Make remaining calls to fopen and strerror use strerror_s and fopen_s
on MSVC.
 2013-03-05 13:35:46 -05:00
Jay Berkenbilt
ac4deac187 Call QUtil::safe_fopen in place of fopen 
fopen was previuosly called wrapped by QUtil::fopen_wrapper, but
QUtil::safe_fopen does this itself, which is less cumbersome.
 2013-03-05 13:35:46 -05:00
Jay Berkenbilt
7ccc9bd9d5 Remove all calls to strcpy 2013-03-05 13:35:46 -05:00
Jay Berkenbilt
a51ae10b8d Remove all calls to sprintf 2013-03-05 13:35:46 -05:00
Jay Berkenbilt
66c3c8fdf7 Use portable versions of some UNIX-specific calls 
Remove needless calls to open, close, and fileno; call remove instead
of unlink.
 2013-03-05 13:35:46 -05:00
Jay Berkenbilt
6b9297882e Mark secure CRT warnings with comment 
Put a specific comment marker next to every piece of code that MSVC
gives warning 4996 for.  This warning is generated for calls to
functions that Microsoft considers insecure or deprecated.  This
change is in preparation for fixing all these cases even though none
of them are actually incorrect or insecure as used in qpdf.  The
comment marker makes them easier to find so they can be fixed in
subsequent commits.
 2013-03-05 13:33:32 -05:00
Jay Berkenbilt
8be8277613 Rewrite QUtil::int_to_string and QUtil::double_to_string 
Make them safer by avoiding any internal limits and replacing sprintf
with std::ostringstream.
 2013-03-04 16:45:16 -05:00
Jay Berkenbilt
ed19516aa7 Fix unused local variable warnings 2013-03-04 16:45:16 -05:00
Jay Berkenbilt
30027481f7 Remove all old-style casts from C++ code 2013-03-04 16:45:16 -05:00
Jay Berkenbilt
32b62035ce Replace many calls to sprintf with QUtil::hex_encode 
Add QUtil::hex_encode to encode binary data has a hexadecimal string,
and use it in place of sprintf where possible.
 2013-03-04 16:45:15 -05:00
Jay Berkenbilt
6c7bf114dc Bug fix: properly handle overridden compressed objects 
When caching objects in an object stream, only cache objects that
still resolve to that stream.  See Changelog mod from this commit for
details.
 2013-02-23 17:51:17 -05:00
Jay Berkenbilt
a5d8783f67 Improve qpdf --check 
Fix exit status for case of errors without warnings, continue after
errors when possible, add test case for parsing a file with content
stream errors on some but not all pages.
 2013-01-25 11:08:50 -05:00
Jay Berkenbilt
bfda717749 Cosmetic changes to be closer to Adobe terminology 
Change object type Keyword to Operator, and place the order of the
object types in object_type_e in the same order as they are mentioned
in the PDF specification.

Note that this change only breaks backward compatibility with code
that has not yet been released.
 2013-01-23 09:38:05 -05:00
Jay Berkenbilt
913eb5ac35 Add getTypeCode() and getTypeName() 
Add virtual methods to QPDFObject, wrappers to QPDFObjectHandle, and
implementations to all the QPDF_Object types.
 2013-01-22 10:01:45 -05:00
Jay Berkenbilt
f81152311e Add QPDFObjectHandle::parseContentStream method 
This method allows parsing of the PDF objects in a content stream or
array of content streams.
 2013-01-20 15:35:39 -05:00
Jay Berkenbilt
1d88955fa6 Added new QPDFObjectHandle types Keyword and InlineImage 
These object types are to facilitate content stream parsing.
 2013-01-20 15:35:39 -05:00
Jay Berkenbilt
a844c2a3ab Set version to 4.1.a0 
Next released version will be 4.1.0 since new APIs are being added.
 2013-01-20 15:35:39 -05:00
Jay Berkenbilt
8708fd373d Prepare 4.0.1 release 2013-01-17 09:51:04 -05:00
Jay Berkenbilt
80fa4e01a1 Set version number to 4.0.0+ 2013-01-03 16:42:10 -05:00
Jay Berkenbilt
0e9949afde Update versions for 4.0.0 release 2012-12-31 11:43:27 -05:00
Jay Berkenbilt
3e96148aa5 Fix spelling errors 
Fixed spelling errors in previously published commits and update
spelling dictionary
 2012-12-31 10:32:32 -05:00
Jay Berkenbilt
f8306913ba Update "C" API with functions for new features 2012-12-31 10:32:32 -05:00
Jay Berkenbilt
9eb5982fa3 Avoid modifying trailer when writing 
When preparing the trailer for writing to the new file, trim a copy of
the trailer instead of the original file's trailer.
 2012-12-31 10:32:32 -05:00
Jay Berkenbilt
0ea70e5dae Update shared library major version to 10 
The upcoming 3.1 release contains non-compatible API changes, though
they only affect parts of the interface that are extremely unlikely to
have been used outside of qpdf itself.  The methods and data types
affected were used for communication between QPDFWriter and QPDF and
would have had no real use in end user code.
 2012-12-31 10:32:32 -05:00
Jay Berkenbilt
9a23c3dcb6 Remove /Crypt from stream filters unconditionally 
When writing a new stream, always remove /Crypt even if we are not
otherwise able to filter the stream.
 2012-12-31 10:32:32 -05:00
Jay Berkenbilt
4237a29c94 Refactor Dictionary writing code 
Original code was written before we could shallow copy objects, so all
the filtering was done by suppressing the output of certain keys and
replacing them with other keys.  Now we can simplify the code greatly
by modifying shallow copies of dictionaries in place.
 2012-12-31 10:32:32 -05:00
Jay Berkenbilt
e57c25814e Support for encryption with /V=5 and /R=5 and /R=6 
Read and write support is implemented for /V=5 with /R=5 as well as
/R=6.  /R=5 is the deprecated encryption method used by Acrobat IX.
/R=6 is the encryption method used by PDF 2.0 from ISO 32000-2.
 2012-12-31 10:32:32 -05:00
Jay Berkenbilt
93ac1695a4 Support files with only attachments encrypted 
Test cases added in a future commit since they depend on /R=6 support.
 2012-12-31 10:32:32 -05:00
Jay Berkenbilt
4eccb9d87b Add random number functions to QUtil 2012-12-31 10:32:32 -05:00
Jay Berkenbilt
16a23368e7 Fix infinite loop trimming passwords with ( in them 2012-12-31 10:32:31 -05:00
Jay Berkenbilt
0873e42300 SHA2 pipeline with support for 256, 384, and 512 bits 
Implemented pipeline around sph sha calls using standard test vectors
for full-byte values.  Did not test or support partial byte values.
 2012-12-31 05:36:51 -05:00
Jay Berkenbilt
c9da66a018 Incorporate sha2 code from sphlib 3.0 
Changes from upstream are limited to change #include paths so that I
can place header files and included "c" files in a subdirectory.  I
didn't keep the unit tests from sphlib but instead verified them by
running them manually.  I will implement the same tests using the
Pl_SHA2 pipeline except that sphlib's sha2 implementation supports
partial bytes, which I will not exercise in qpdf or our tests.
 2012-12-31 05:36:51 -05:00
Jay Berkenbilt
3680922ae5 Allow specification of AES initialization vector 2012-12-31 05:36:50 -05:00
Jay Berkenbilt
9b42f526df Update AES classes to work with 256-bit keys 2012-12-31 05:36:50 -05:00
Jay Berkenbilt
774584163f Add ExtensionLevel support to version handling 
All version operations are now fully aware of extension levels.
 2012-12-31 05:36:50 -05:00
Jay Berkenbilt
3101955ac0 Add V5 parameters to EncryptionData 2012-12-31 05:36:50 -05:00
Jay Berkenbilt
68447bb556 change EncryptionData 2012-12-31 05:36:50 -05:00
Jay Berkenbilt
04c203ae06 Eliminate flattenScalarReferences 2012-12-31 05:36:48 -05:00
Jay Berkenbilt
b4e7d6ed32 Improve memory safety of finding PDF header 2012-12-25 15:13:44 -05:00
Jay Berkenbilt
7f84239cad Find PDF header anywhere in the first 1024 bytes 2012-12-25 14:43:37 -05:00
Jay Berkenbilt
f256670eba Ignore objects with offset 0 2012-11-20 13:57:37 -05:00
Jay Berkenbilt
041397fdab Allow reading from InputSource and writing to Pipeline 
Allowing users to subclass InputSource and Pipeline to read and write
from/to arbitrary sources provides the maximum flexibility for users
who want to read and write from other than files or memory.
 2012-09-23 17:42:26 -04:00
Jay Berkenbilt
8c99e4a6c0 Indicate pre-release version 2012-09-23 17:41:08 -04:00
Jay Berkenbilt
b4dc0f072a Prepare 3.0.2 release 2012-09-06 15:47:58 -04:00
Jay Berkenbilt
7e4a079674 Update libtool data for API changes 2012-09-06 15:31:35 -04:00
Jay Berkenbilt
c1627d0438 Add QPDFWriter::setExtraHeaderText 2012-09-06 15:31:12 -04:00
Jay Berkenbilt
fc4c82a950 Reset state in QPDF::calculateLinearizationData 
This makes it possible to use two different writers to write
linearized files from the same QPDF object.
 2012-09-06 15:28:16 -04:00
Jay Berkenbilt
8d2b29ef98 Fix segmentation fault with use of QPDFWriter::setOutputMemory 2012-09-06 14:39:06 -04:00
Jay Berkenbilt
59432b5c70 Prepare 3.0.1 release 2012-08-11 13:41:18 -04:00
Jay Berkenbilt
29e9c34fe3 Bug fix: let EOF resolve literal token 
Previously only whitespace and comments did it.  This fix is needed
for object streams whose last object is a literal (name, integer,
real, string) not terminated by space or newline.
 2012-08-11 09:29:04 -04:00
Jay Berkenbilt
137dc7acb9 Refactor: move resolution of literal to its own method 2012-08-11 09:22:59 -04:00
Jay Berkenbilt
511e68758c Update version to 3.0.0 2012-08-02 06:52:33 -04:00
Jay Berkenbilt
32051283b9 Fix spelling errors 2012-07-29 14:44:12 -04:00
Jay Berkenbilt
2280c4f6d1 Update documentation and version numbers 
3.0.rc1
 2012-07-28 22:03:36 -04:00
Tobias Hoffmann
9c00874e77 added QPDFObjectHandle::replaceStreamData(std::string data). 2012-07-25 03:02:46 +02:00
Jay Berkenbilt
316328704b Windows compilation fixes 2012-07-21 20:51:56 -04:00
Jay Berkenbilt
6bbea4baa0 Implement QPDFObjectHandle::parse 
Move object parsing code from QPDF to QPDFObjectHandle and
parameterize the parts of it that are specific to a QPDF object.
Provide a version that can't handle indirect objects and that can be
called on an arbitrary string.

A side effect of this change is that the offset used when reporting
invalid stream length has changed, but since the new value seems like
a better value than the old one, the test suite has been updated
rather than making the code backward compatible.  This only effects
the offset reported for invalid streams that lack /Length or have an
invalid /Length key.

Updated some test code and exmaples to use QPDFObjectHandle::parse.

Supporting changes include adding a BufferInputSource constructor that
takes a string.
 2012-07-21 09:06:10 -04:00
Jay Berkenbilt
f3e267fce2 Move readToken from QPDF to QPDFTokenizer 2012-07-21 09:06:10 -04:00
Jay Berkenbilt
15eaed5c52 Refactor: pull *InputSource out of QPDF 
InputSource, FileInputSource, and BufferInputSource are now top-level
classes instead of privately nested inside QPDF.
 2012-07-21 09:06:06 -04:00
Jay Berkenbilt
8657c6f004 Prevent seeking before beginning of BufferInputSource 2012-07-18 09:50:05 -04:00
Jay Berkenbilt
a101533e0a Add command line option to copy encryption from other file 
Add --copy-encryption and --encryption-file-password options to qpdf.
Also strengthen test suite for copying encryption.  The strengthened
test suite would have caught the failure to preserve AES and the
failure to update the file version, which was invalidating the
encrypted data.
 2012-07-15 21:15:24 -04:00
Jay Berkenbilt
b26ce88ea1 Minor fixes to copyEncryptionParameters 
This fixes were to code added yesterday; the problems would not have
impacted any previously released code.  These are all changes related
to the possibility that copyEncryptionParameters may be called on
behalf a different QPDF than the one being written.
 2012-07-15 21:14:02 -04:00
Jay Berkenbilt
db95960ac1 Bug fix: preserve AES when copying encryption parameters 2012-07-15 19:07:59 -04:00
Jay Berkenbilt
b501251291 qpdf: push inherited attributes to page when showing images 
from qpdf command-line tool
 2012-07-15 16:22:28 -04:00
Jay Berkenbilt
0575d77d77 Add public QPDFWriter::copyEncryptionParameters 
Method to copy encryption parameters from another file.  Adapted from
existing code to copy encryption parameters from the original file.
 2012-07-14 09:14:41 -04:00
Jay Berkenbilt
1c944e4c89 Have QPDFWriter detect foreign objects while writing 
Throw an exception that directs the user to QPDF::copyForeignObject.
 2012-07-14 08:07:23 -04:00
Jay Berkenbilt
e7b8f297ba Support copying objects from another QPDF object 
This includes QPDF::copyForeignObject and supporting foreign objects
as arguments to addPage*.
 2012-07-11 15:54:33 -04:00
Jay Berkenbilt
8a217eb3a2 Add concept of reserved objects 
QPDFObjectHandle::{new,is,assert}Reserved, QPDF::replaceReserved
provide a mechanism to add objects to a PDF file when there are
circular references.  This is a prerequisite to copying objects from
one PDF to another.
 2012-07-10 23:34:32 -04:00
Jay Berkenbilt
1dc25c0217 Fix: make unparse virtual for Null and Real 2012-07-08 16:01:12 -04:00
Tobias Hoffmann
8720446b23 Added assertNumber and assertScalar to QPDFObjectHandle 2012-07-07 18:55:08 -04:00
Tobias Hoffmann
a8266ccb0e Added public assert{Type} methods to QPDFObjectHandle 2012-07-07 18:53:38 -04:00
Tobias Hoffmann
39bbaa86e3 Build this->all_pages while traversing with pushInheritedAttributesToPage 2012-07-07 17:45:10 -04:00
Jay Berkenbilt
e2dedde4bd Don't require stream data provider to know length in advance 
Breaking API change: length parameter has disappeared from the
StreamDataProvider version of QPDFObjectHandle::replaceStreamData
since it is no longer necessary to compute it in advance.  This
breaking change is justified by the fact that removing the length
parameter provides the caller an opportunity to simplify the calling
code.
 2012-07-07 17:33:45 -04:00
Jay Berkenbilt
8705e2e8fc Add QPDFWriter method to output to FILE* 2012-07-05 21:24:04 -04:00
Tobias Hoffmann
abb53ac369 Limited inheritance to the attributes explicitly listed in the PDF spec 
Previous versions of qpdf incorrectly passed arbitrary objects from
/Pages objects down to individual pages in direct contradition with
the PDF specification.  These are now left in /Pages.  When
intermediate /Pages nodes are being discarded as when the /Pages tree
is being flattened, a warning is issued when unknown keys are
encountered.
 2012-07-04 23:04:55 -04:00
Tobias Hoffmann
7770a1b036 Added public method QPDF::pushInheritedAttributesToPage 
Refactored optimizePagesTree to pushInheritedAttributesToPage and made
public
 2012-07-04 16:24:03 -04:00
Jay Berkenbilt
5f59c32f87 Add a few minor enhancements to recent work 
Test coverage case for new newStream method
Expose decimal_places argument for double-based newReal

All enhancements suggested by Tobias.
 2012-06-27 10:43:27 -04:00
Tobias Hoffmann
f07e3370f0 Add Pl_Concatenate filter 2012-06-27 10:20:38 -04:00
Tobias Hoffmann
43c404b45a Add QPDFObjectHandle::newStream(QPDF *, std::string const&) 
This makes the code simpler than having to create a buffer of a fixed
size and copy the string to it.
 2012-06-27 10:19:57 -04:00
Tobias Hoffmann
75054c0b94 Add QPDFObjectHandle::newReal(double) 2012-06-27 10:19:01 -04:00
Jay Berkenbilt
2266c6232b Rework InputSource::readLine to make it much more efficient 
This rework makes xref reconstruction run much faster and use much
less memory.
 2012-06-27 06:48:06 -04:00
Jay Berkenbilt
736bafbb9c Rename seek functions in QUtil 2012-06-26 23:10:10 -04:00
Jay Berkenbilt
0802ba275f Visual C++ and mingw32 fixes for large files 2012-06-26 23:05:59 -04:00
Jay Berkenbilt
5e3167e856 Set version to 3.0.a0 2012-06-25 21:35:30 -04:00
Jay Berkenbilt
1a3e88ca09 Fix large file support for 32-bit Linux 2012-06-25 10:51:44 -04:00
Jay Berkenbilt
c16db4106c Increase padding in linearized files 
With QPDF allowing integers to contain 64-bit quantities, this change
is necessary to be able to linearize files whose sizes might be larger
than 10 digits.
 2012-06-24 15:56:59 -04:00
Jay Berkenbilt
8318d81ada Fix and test support for files >= 4 GB 2012-06-24 15:56:50 -04:00
Jay Berkenbilt
781c313058 Change QPDF_Integer from int to long long 
This makes it possible to store offsets that are larger than 2 GB in
the trailer dictionary.
 2012-06-24 15:20:01 -04:00
Jay Berkenbilt
4f305488d8 Improve the FILE* version of QPDF::processFile 2012-06-23 18:23:06 -04:00
Tobias Hoffmann
7f95ad5b92 Fixed missing throw 2012-06-23 18:17:01 -04:00
Jay Berkenbilt
bf059a6001 Replace the 8-bit characters with \x.. in QPDFWriter.cc 
This just makes it safer to pull up this file in an editor.
 2012-06-23 09:05:06 -04:00
Jay Berkenbilt
6c0af0844c Switch some code to use empty newArray/newDictionary 2012-06-22 10:09:42 -04:00
Jay Berkenbilt
b6bdc0f595 Add factory methods for creating empty arrays and dictionaries. 
Also updated pdf_from_scratch test driver to use the new factories,
and made some cosmetic improvements and documentation updates for the
emptyPDF() method.
 2012-06-22 09:46:33 -04:00
Jay Berkenbilt
a0768e4190 Add QPDF::emptyPDF() and pdf_from_scratch test code 2012-06-21 23:09:05 -04:00
Jay Berkenbilt
81e8752362 Use qpdf_offset_t in place of off_t in public APIs. 
off_t is used internally only when needed to talk to standard
libraries.  This requires that the "long long" type be supported by
the compiler.
 2012-06-21 21:23:24 -04:00
Jay Berkenbilt
d1ebe30ff6 Add QPDFObjectHandle::shallowCopy() 2012-06-21 16:15:09 -04:00
Jay Berkenbilt
9689f4cdcf Use getRoot() instead of looking it up in the trailer 2012-06-21 16:15:09 -04:00
Jay Berkenbilt
11d33a45fa Iterate of /Info's keys, not trailer's keys, to seed /ID 
Thanks Tobias Hoffmann for noticing the error.
 2012-06-21 15:52:53 -04:00
Jay Berkenbilt
3844aedd93 Add testing for page APIs 2012-06-21 15:01:02 -04:00
Jay Berkenbilt
eb802cfa8c Implement page manipulation APIs 2012-06-21 15:01:02 -04:00
Jay Berkenbilt
e01ae1968b Split page handling APIs into a separate source file 2012-06-21 15:01:02 -04:00
Jay Berkenbilt
df493c352f Refactor optimizePagesTree 
Split optimizePagesTree into a simpler top-level routine and a
recursive internal routine.
 2012-06-21 15:01:02 -04:00
Tobias Hoffmann
5d3f93be29 Added first version of pages API. 2012-06-21 15:01:02 -04:00
Tobias Hoffmann
47a846a7e0 Added method to clear pages cache. 2012-06-21 15:01:02 -04:00
Jay Berkenbilt
3b413ca87c Fix typo in comment 2012-06-21 15:00:58 -04:00
Jay Berkenbilt
f59ff6fcc2 fix include order for off_t 2012-06-21 14:11:22 -04:00
Jay Berkenbilt
fbe68d63f0 fix doc comment 2012-06-21 10:59:33 -04:00
Jay Berkenbilt
bc1c4bb578 Add QPDF::processFile that takes an open FILE* 2012-06-21 08:00:35 -04:00
Tobias Hoffmann
db7474e0fa Added additional array mutators 
Added methods to append to arrays, insert items into arrays, and
replace array contents with a vector of items.
 2012-06-20 15:29:44 -04:00
Jay Berkenbilt
b2e6818935 Fix wording error in error message 2012-06-20 15:29:42 -04:00
Jay Berkenbilt
5d4cad9c02 ABI change: fix use of off_t, size_t, and integer types 
Significantly improve the code's use of off_t for file offsets, size_t
for memory sizes, and integer types in cases where there has to be
compatibility with external interfaces.  Rework sections of the code
that would have prevented qpdf from working on files larger than 2 (or
maybe 4) GB in size.
 2012-06-20 15:20:26 -04:00
Jay Berkenbilt
24e2b2b76f Fix gcc 4.7 warnings about C++11 2012-06-20 15:18:14 -04:00
Jay Berkenbilt
92c94e7df2 Add symbol versioning 
For ELF systems, turn on versioned symbols by default, and add a
configure option to enable or disable them.
 2012-06-20 15:18:12 -04:00
Jay Berkenbilt
01bcda8974 fix PCRE calls to remove use of deprecated API 
pcre_info -> pcre_fullinfo.  Closes issue 3489349.  Thanks Tim Harder.
 2012-04-06 21:47:46 -04:00
Jay Berkenbilt
8e9fe21316 Update for 2.3.1 2011-12-28 17:19:40 -05:00
Jay Berkenbilt
92f0207de8 fix MSVC 2010 issues 2011-12-28 16:40:33 -05:00
Jay Berkenbilt
11314a9551 Don't declare any PCRE objects static. 2011-12-28 14:32:33 -05:00
Jay Berkenbilt
1d1d21d3fe ready for 2.3.0 release 2011-08-11 15:34:41 -04:00
Jay Berkenbilt
788f6f7769 fix small logic error surrounding adding newlines; in practice, the logic error would probably never manifest itself without other code changes 2011-08-11 15:22:59 -04:00
Jay Berkenbilt
0abdf5381c fix memory error caught by valgrind 2011-08-11 14:11:27 -04:00
Jay Berkenbilt
76b1659177 enhance PointerHolder so that it can explicitly be told to use delete [] instead of delete, thus making it useful to run valgrind over qpdf during its test suite 2011-08-11 11:57:37 -04:00
Jay Berkenbilt
14fe2e6de3 qpdf_set_info_key, qpdf_get_info_key 2011-08-11 10:48:37 -04:00
Jay Berkenbilt
ce358f103e remove stray XXX comment 2011-08-11 10:17:24 -04:00
Jay Berkenbilt
9a1fad4077 comments 2011-08-10 20:57:52 -04:00
Jay Berkenbilt
a42a4068b5 preserve /EncryptMetadata when copying encryption parameters 2011-08-10 19:47:18 -04:00
Jay Berkenbilt
da39d2b1b1 2.3.a1 2011-08-10 16:48:00 -04:00
Jay Berkenbilt
759c56e1fe implement ability to save PDF to memory, also update ChangeLog 2011-08-10 16:34:29 -04:00
Jay Berkenbilt
655c55f848 implement methods to get dictionary and array contents as map and vector 2011-08-10 13:33:58 -04:00
Jay Berkenbilt
7dc197ef88 implement replace and swap 2011-08-10 12:42:48 -04:00
Jay Berkenbilt
9de1f4826b 2.2.4 
git-svn-id: svn+q:///qpdf/trunk@1062 71b93d88-0707-0410-a8cf-f5a4172ac649
 2011-06-25 18:39:05 +00:00
Jay Berkenbilt
f5ea42ee59 remove unused offset variable 
git-svn-id: svn+q:///qpdf/trunk@1056 71b93d88-0707-0410-a8cf-f5a4172ac649
 2011-05-07 13:36:13 +00:00
Jay Berkenbilt
aeb892f99b accept stream keyword with CR only 
git-svn-id: svn+q:///qpdf/trunk@1052 71b93d88-0707-0410-a8cf-f5a4172ac649
 2011-04-30 21:46:09 +00:00
Jay Berkenbilt
c551b972f6 update version to 2.2.3, update copyright to 2011 
git-svn-id: svn+q:///qpdf/trunk@1051 71b93d88-0707-0410-a8cf-f5a4172ac649
 2011-04-30 19:19:30 +00:00
Jay Berkenbilt
6405d3928f be less conservative when skipping over inline images in content normalization 
git-svn-id: svn+q:///qpdf/trunk@1050 71b93d88-0707-0410-a8cf-f5a4172ac649
 2011-04-30 18:20:35 +00:00
Jay Berkenbilt
a8f2248729 handle files with object 0 as a real object 
git-svn-id: svn+q:///qpdf/trunk@1049 71b93d88-0707-0410-a8cf-f5a4172ac649
 2011-01-31 14:59:42 +00:00
Jay Berkenbilt
c595fd7fbf 2.2.2 
git-svn-id: svn+q:///qpdf/trunk@1045 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-10-04 15:26:40 +00:00
Jay Berkenbilt
b36f62a326 add qpdf_read_memory to C API 
git-svn-id: svn+q:///qpdf/trunk@1044 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-10-04 15:24:10 +00:00
Jay Berkenbilt
df1fa5291c 2.2.1 
git-svn-id: svn+q:///qpdf/trunk@1037 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-10-01 11:07:12 +00:00
Jay Berkenbilt
a72ce95c92 setOutputStreams 
git-svn-id: svn+q:///qpdf/trunk@1035 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-10-01 11:02:35 +00:00
Jay Berkenbilt
9f444ffef3 add QPDF::processMemoryFile and API additions to support it 
git-svn-id: svn+q:///qpdf/trunk@1034 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-10-01 10:20:38 +00:00
Jay Berkenbilt
a7e269537d update code to new PointerHolder, and reintroduce change that was accidentally backed out 
git-svn-id: svn+q:///qpdf/trunk@1031 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-09-24 20:45:18 +00:00
Jay Berkenbilt
ce8b1ba6a5 convert file to a PointerHolder<InputSource> so it could be either a file or a buffer; also fix a bug in BufferInputSource::seek 
git-svn-id: svn+q:///qpdf/trunk@1030 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-09-24 19:10:08 +00:00
Jay Berkenbilt
047bcfcaa6 treat empty objects as null 
git-svn-id: svn+q:///qpdf/trunk@1027 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-09-06 02:17:55 +00:00
Jay Berkenbilt
b1e0dcff16 handle stream filter abbreviations from table H.1 
git-svn-id: svn+q:///qpdf/trunk@1025 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-09-05 15:00:44 +00:00
Jay Berkenbilt
6b4d231245 2.2.0 
git-svn-id: svn+q:///qpdf/trunk@1016 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-14 16:43:18 +00:00
Jay Berkenbilt
f7a18c42a0 remove stray + 
git-svn-id: svn+q:///qpdf/trunk@1012 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-14 15:55:17 +00:00
Jay Berkenbilt
bd7261da9b getRawStreamData() 
git-svn-id: svn+q:///qpdf/trunk@1010 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-09 23:33:40 +00:00
Jay Berkenbilt
1ff024fafc update version numbers 
git-svn-id: svn+q:///qpdf/trunk@1004 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-08 21:19:58 +00:00
Jay Berkenbilt
cf172cf550 some doc updates, shlib version 
git-svn-id: svn+q:///qpdf/trunk@1002 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-06 01:38:24 +00:00
Jay Berkenbilt
2dbc1006fb addPageContents 
git-svn-id: svn+q:///qpdf/trunk@995 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-05 21:06:49 +00:00
Jay Berkenbilt
6f2bd7eb3a newStream 
git-svn-id: svn+q:///qpdf/trunk@991 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-05 20:20:52 +00:00
Jay Berkenbilt
11df7809af add pipeline-based stream data replacement function 
git-svn-id: svn+q:///qpdf/trunk@990 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-05 19:04:22 +00:00
Jay Berkenbilt
998a6cbee9 remove stream_data_handler; it wouldn't work as designed. replacement data implemented but not tested 
git-svn-id: svn+q:///qpdf/trunk@988 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-02 22:40:52 +00:00
Jay Berkenbilt
9a06fc541c ready to implement replacement stream data 
git-svn-id: svn+q:///qpdf/trunk@987 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-02 22:17:01 +00:00
Jay Berkenbilt
cd1e46616a typo 
git-svn-id: svn+q:///qpdf/trunk@985 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-02 16:26:08 +00:00
Jay Berkenbilt
00ed5af502 remove use of float for version comparison 
git-svn-id: svn+q:///qpdf/trunk@984 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-08-02 16:18:46 +00:00
Jay Berkenbilt
6755a86734 comment on memory leak fix 
git-svn-id: svn+q:///qpdf/trunk@979 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-06-06 18:03:21 +00:00
Jay Berkenbilt
9496b2cb20 fix memory leak 
git-svn-id: svn+q:///qpdf/trunk@976 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-06-06 13:32:08 +00:00
Jay Berkenbilt
bf75e208e9 eliminate extraneous allocations by not calling makeDirect when we 
know an object is already direct


git-svn-id: svn+q:///qpdf/trunk@972 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-06-05 21:00:05 +00:00
Jay Berkenbilt
eef7154412 typo 
git-svn-id: svn+q:///qpdf/trunk@971 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-06-05 19:50:30 +00:00
Jay Berkenbilt
62c1b42328 detect degenerate case of empty xref table 
git-svn-id: svn+q:///qpdf/trunk@970 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-06-05 19:48:32 +00:00
Jay Berkenbilt
aa093bfabd Use a pointer holder in one place where we were previously just using 
a pointer.


git-svn-id: svn+q:///qpdf/trunk@968 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-05-31 17:04:55 +00:00
Jay Berkenbilt
f96c63cf3d 2.1.5 
git-svn-id: svn+q:///qpdf/trunk@962 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-04-25 15:05:11 +00:00
Jay Berkenbilt
fc8f93053d don't place restrictions on length of /ID strings 
git-svn-id: svn+q:///qpdf/trunk@961 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-04-25 14:55:36 +00:00
Jay Berkenbilt
349c80c895 2.1.4 
git-svn-id: svn+q:///qpdf/trunk@958 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-04-18 23:25:12 +00:00
Jay Berkenbilt
b71cef856b fix linearization padding bug for second xref stream as well as first, which was previously fixed 
git-svn-id: svn+q:///qpdf/trunk@957 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-04-18 23:19:54 +00:00
Jay Berkenbilt
84353451a3 refactor to isolate pad calculation 
git-svn-id: svn+q:///qpdf/trunk@956 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-04-18 23:01:31 +00:00
Jay Berkenbilt
81d922d6f8 soname 
git-svn-id: svn+q:///qpdf/trunk@950 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-03-27 16:03:35 +00:00
Jay Berkenbilt
117f690c8e update for 2.1.3 
git-svn-id: svn+q:///qpdf/trunk@949 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-03-27 16:03:04 +00:00
Jay Berkenbilt
218900d2c3 flatten scalar references for unreferenced objects 
git-svn-id: svn+q:///qpdf/trunk@946 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-03-27 15:42:17 +00:00
Jay Berkenbilt
028f106bee comment about flattenScalarReferences 
git-svn-id: svn+q:///qpdf/trunk@945 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-03-27 14:50:11 +00:00
Jay Berkenbilt
95114fe256 pad and hope for the best of AES input buffer is not a multiple of 16 
git-svn-id: svn+q:///qpdf/trunk@944 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-03-27 13:17:31 +00:00
Jay Berkenbilt
e5fbae0a37 typo 
git-svn-id: svn+q:///qpdf/trunk@940 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-01-25 02:57:58 +00:00
Jay Berkenbilt
1431c05304 update REVISION in shared library version 
git-svn-id: svn+q:///qpdf/trunk@936 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-01-25 01:25:52 +00:00
Jay Berkenbilt
375b494e57 update for 2.1.2 
git-svn-id: svn+q:///qpdf/trunk@934 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-01-25 01:21:06 +00:00
Jay Berkenbilt
05a6d9669d redo padding calculation for first half xref stream; old calculation 
failed to consider the effect of compressing the strema


git-svn-id: svn+q:///qpdf/trunk@932 71b93d88-0707-0410-a8cf-f5a4172ac649
 2010-01-24 22:05:16 +00:00
Jay Berkenbilt
8fbba4d48c 2.1.1 -- gcc 4.4 fixes 
git-svn-id: svn+q:///qpdf/trunk@925 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-12-14 02:35:31 +00:00
Jay Berkenbilt
91ce55a4e3 2.1 
git-svn-id: svn+q:///qpdf/trunk@913 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-30 23:58:19 +00:00
Jay Berkenbilt
a80d9d176d add C interface for getting software version 
git-svn-id: svn+q:///qpdf/trunk@903 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-24 13:23:20 +00:00
Jay Berkenbilt
ace2a031b5 prepare 2.1.rc1 for release 
git-svn-id: svn+q:///qpdf/trunk@901 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-24 04:47:17 +00:00
Jay Berkenbilt
b1702fb16c more tweaking of C error interface 
git-svn-id: svn+q:///qpdf/trunk@894 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-23 16:50:22 +00:00
Jay Berkenbilt
7f5d78c2d1 improve C error handling interface 
git-svn-id: svn+q:///qpdf/trunk@884 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-23 15:27:30 +00:00
Jay Berkenbilt
3c84d496f0 avoid having to include zlib.h in Pl_Flate.hh 
git-svn-id: svn+q:///qpdf/trunk@882 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-23 14:58:09 +00:00
Jay Berkenbilt
7d6d22db7b remove embedded external libs; replace with different mechanism 
git-svn-id: svn+q:///qpdf/trunk@868 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-23 03:20:03 +00:00
Jay Berkenbilt
f5d772773e make line buffering os-specific 
git-svn-id: svn+q:///qpdf/trunk@852 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-21 02:30:15 +00:00
Jay Berkenbilt
27ee889c0e tweak dll stuff again 
git-svn-id: svn+q:///qpdf/trunk@851 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-21 01:45:13 +00:00
Jay Berkenbilt
748ab301d4 go back to function-based DLL_EXPORT rather than class-based to avoid creation of export files with executables under msvc 
git-svn-id: svn+q:///qpdf/trunk@849 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-21 00:27:24 +00:00
Jay Berkenbilt
93ba34b17b qpdf-config 
git-svn-id: svn+q:///qpdf/trunk@847 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-20 02:46:41 +00:00
Jay Berkenbilt
bf6e4ecf00 remove off_t from C API 
git-svn-id: svn+q:///qpdf/trunk@846 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-20 02:40:08 +00:00
Jay Berkenbilt
e27ac3e982 static 
git-svn-id: svn+q:///qpdf/trunk@835 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-20 01:35:46 +00:00
Jay Berkenbilt
ad0ab25d66 fix bug in C API, test invalid password specifically 
git-svn-id: svn+q:///qpdf/trunk@832 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-20 00:59:38 +00:00
Jay Berkenbilt
8b073eed28 checkpoint 
git-svn-id: svn+q:///qpdf/trunk@831 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-20 00:46:26 +00:00
Jay Berkenbilt
398354b6f0 update C API for error retrieval 
git-svn-id: svn+q:///qpdf/trunk@830 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-20 00:24:44 +00:00
Jay Berkenbilt
3f8c4c2736 categorize all error messages and include object information if available 
git-svn-id: svn+q:///qpdf/trunk@829 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-19 23:09:19 +00:00
Jay Berkenbilt
b67a3c15e7 DLL.hh -> DLL.h, move public enumerated types into Constants.h and use them both for C and C++ interfaces 
git-svn-id: svn+q:///qpdf/trunk@828 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-19 20:17:14 +00:00
Jay Berkenbilt
734ac1e1d2 deal with stream-specific crypt filters 
git-svn-id: svn+q:///qpdf/trunk@827 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-19 01:58:31 +00:00
Jay Berkenbilt
a8715c495b add C API for R4 encryption 
git-svn-id: svn+q:///qpdf/trunk@825 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-19 00:36:51 +00:00
Jay Berkenbilt
09175e4578 more testing, bug fix for linearized aes encrypted files 
git-svn-id: svn+q:///qpdf/trunk@824 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-19 00:17:11 +00:00
Jay Berkenbilt
94131116a9 more notes, testing of cleartext metadata, some crypt filter fixes 
git-svn-id: svn+q:///qpdf/trunk@823 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-18 19:54:24 +00:00
Jay Berkenbilt
3356b6708d revert /Crypt filter support -- I seemed to have misinterpreted it 
git-svn-id: svn+q:///qpdf/trunk@822 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-18 19:50:03 +00:00
Jay Berkenbilt
f0211d954c use a simpler seed for the random number generator 
git-svn-id: svn+q:///qpdf/trunk@821 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-18 16:03:10 +00:00
Jay Berkenbilt
4ccc9330a8 only seed randon number generater once for aes-cbc, try to avoid compressing Metadata streams 
git-svn-id: svn+q:///qpdf/trunk@818 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-18 14:09:10 +00:00
Jay Berkenbilt
67e353e4e4 use StdCF to make adobe reader happy; handle EncryptMetadata properly when reading 
git-svn-id: svn+q:///qpdf/trunk@817 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-18 02:26:09 +00:00
Jay Berkenbilt
b873dc9c59 implemented writing R4/V4 encryption except that the output files don't open in Adobe reader 9.1.3. 
git-svn-id: svn+q:///qpdf/trunk@816 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-18 02:03:18 +00:00
Jay Berkenbilt
5c253d1c13 avoid low order bits of random just in case it's rand 
git-svn-id: svn+q:///qpdf/trunk@815 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-18 00:13:45 +00:00
Jay Berkenbilt
62c5fa6b48 use srand and rand instead of srandom and random of the latter are not available 
git-svn-id: svn+q:///qpdf/trunk@814 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-18 00:12:35 +00:00
Jay Berkenbilt
e25910b59a reading crypt filters is largely implemented but not fully tested 
git-svn-id: svn+q:///qpdf/trunk@812 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-17 23:37:55 +00:00
Jay Berkenbilt
c13bc66de8 checkpoint -- partially implemented /V=4 encryption 
git-svn-id: svn+q:///qpdf/trunk@811 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-17 18:54:51 +00:00
Jay Berkenbilt
27e8d4bbff tweak when we decide to use hex strings vs literal strings 
git-svn-id: svn+q:///qpdf/trunk@810 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-17 17:31:52 +00:00
Jay Berkenbilt
55e400376a got working aes128 implementation 
git-svn-id: svn+q:///qpdf/trunk@809 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-17 15:01:20 +00:00
Jay Berkenbilt
2c3b6a5c9b original rijndael as downloaded from http://www.efgh.com/software/rijndael.htm 
git-svn-id: svn+q:///qpdf/trunk@808 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-17 14:53:02 +00:00
Jay Berkenbilt
846c9f6bcc checkpoint -- started doing some R4 encryption support 
git-svn-id: svn+q:///qpdf/trunk@807 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-17 03:14:47 +00:00
Jay Berkenbilt
f71eb2af91 fix class-level DLL_EXPORT 
git-svn-id: svn+q:///qpdf/trunk@797 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-12 01:18:19 +00:00
Jay Berkenbilt
44cbd3d4b4 do DLL_EXPORT only in header files and only at the class or top-level function level 
git-svn-id: svn+q:///qpdf/trunk@796 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-12 01:15:55 +00:00
Jay Berkenbilt
2b5ac676ed generalize build 
git-svn-id: svn+q:///qpdf/trunk@776 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-11 00:24:22 +00:00
Jay Berkenbilt
3d5a7a26e2 handle external libs in autoconf 
git-svn-id: svn+q:///qpdf/trunk@764 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-10 17:32:34 +00:00
Jay Berkenbilt
c7be2041b8 include external-libs 
git-svn-id: svn+q:///qpdf/trunk@761 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-10 16:51:20 +00:00
Jay Berkenbilt
7398ef88b7 further refinements to build 
git-svn-id: svn+q:///qpdf/trunk@759 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-10 15:28:33 +00:00
Jay Berkenbilt
caa397ed15 generalize build rules, add experimental support for manual compilation without libtool 
git-svn-id: svn+q:///qpdf/trunk@753 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-10 14:15:09 +00:00
Jay Berkenbilt
c2023db265 Implement changes suggested by Zarko and our subsequent conversations: 
- Add a way to set the minimum PDF version
 - Add a way to force the PDF version
 - Have isEncrypted return true if an /Encrypt dictionary exists even
   when we can't read the file
 - Allow qpdf_init_write to be called multiple times
 - Update some comments in headers


git-svn-id: svn+q:///qpdf/trunk@748 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-05 00:42:48 +00:00
Jay Berkenbilt
c1e53f1480 bug fix: more gracefully handle xref stream with too many entries 
git-svn-id: svn+q:///qpdf/trunk@747 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-10-04 23:56:56 +00:00
Jay Berkenbilt
6bdac26369 finished testing C API 
git-svn-id: svn+q:///qpdf/trunk@734 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-27 20:33:17 +00:00
Jay Berkenbilt
8d7bb3ff50 add methods for getting encryption data 
git-svn-id: svn+q:///qpdf/trunk@733 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-27 20:05:38 +00:00
Jay Berkenbilt
fe6771e0e5 add many new tests to exercise C api 
git-svn-id: svn+q:///qpdf/trunk@727 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-27 16:01:45 +00:00
Jay Berkenbilt
84ec83e925 basic implementation of C API 
git-svn-id: svn+q:///qpdf/trunk@725 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-27 14:39:04 +00:00
Jay Berkenbilt
02333ba1e9 checkpoint -- first crack at C API, minor refactoring of encryption functions 
git-svn-id: svn+q:///qpdf/trunk@720 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-27 03:11:29 +00:00
Jay Berkenbilt
1285fa19d6 don't dll export inline functions 
git-svn-id: svn+q:///qpdf/trunk@716 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-27 02:06:09 +00:00
Jay Berkenbilt
f3d7c26de1 removed qexc; non-compatible ABI change 
git-svn-id: svn+q:///qpdf/trunk@709 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-26 18:36:04 +00:00
Jay Berkenbilt
33dbe43e4e include DLL.hh 
git-svn-id: svn+q:///qpdf/trunk@698 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-26 15:19:12 +00:00
Jay Berkenbilt
492db82f6f more dll exports 
git-svn-id: svn+q:///qpdf/trunk@697 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-26 15:15:33 +00:00
Jay Berkenbilt
b6af616dea dll-export functions for library test suite 
git-svn-id: svn+q:///qpdf/trunk@696 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-26 15:01:30 +00:00
Jay Berkenbilt
0ded90eff9 fix problems or otherwise improve code based on issues raised by Klocwork 
git-svn-id: svn+q:///qpdf/trunk@690 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-09-14 01:31:46 +00:00
Jay Berkenbilt
1e74c03acd stick DLL_EXPORT in front of every public method of every public class 
git-svn-id: svn+q:///qpdf/trunk@688 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-08-06 19:00:25 +00:00
Jay Berkenbilt
fe18385ffa clean up windows portability code, make remaining test suite pass 
git-svn-id: svn+q:///qpdf/trunk@686 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-07-15 04:26:32 +00:00
Jay Berkenbilt
a1c0aaf03a windows fixes 
git-svn-id: svn+q:///qpdf/trunk@684 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-07-15 03:47:44 +00:00
Jay Berkenbilt
7acc0498eb cast arg to isspace to unsigned char 
git-svn-id: svn+q:///qpdf/trunk@683 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-07-13 00:42:48 +00:00
Jay Berkenbilt
a9987ab570 Fix a few compiler errors reported correctly my MSVC 9.0. 
Fix libtests test suites to pass on Windows, mostly by dealing with
ascii vs. binary and NL vs. CRNL change ($td->NORMALIZE_NEWLINES).
Convert some test suites to use fread instead of read.
PCRE.hh: define PCRE_STATIC if on Windows.
Provide cross-platform function for getting current time instead of
using time(0).


git-svn-id: svn+q:///qpdf/trunk@678 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-07-12 22:52:13 +00:00
Jay Berkenbilt
a1fbb4bd97 update test suite 
git-svn-id: svn+q:///qpdf/trunk@675 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-05-03 20:03:21 +00:00
Jay Berkenbilt
8a66e7dbc0 filterable = false for stream with unknown decode parameters 
git-svn-id: svn+q:///qpdf/trunk@674 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-05-03 19:48:34 +00:00
Jay Berkenbilt
701e6db7b0 2.0.6 
git-svn-id: svn+q:///qpdf/trunk@673 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-05-03 16:38:04 +00:00
Jay Berkenbilt
88f44896a3 ignore /DecodeParms when it's not a dictionary 
git-svn-id: svn+q:///qpdf/trunk@672 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-05-03 16:31:16 +00:00
Jay Berkenbilt
9851f92c53 fix header symbol 
git-svn-id: svn+q:///qpdf/trunk@671 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-04-25 01:39:17 +00:00
Jay Berkenbilt
a89d11f59a change variable name for greater clarity 
git-svn-id: svn+q:///qpdf/trunk@668 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-03-10 16:25:07 +00:00
Jay Berkenbilt
c9bc8937e5 prepare for 2.0.5 release 
git-svn-id: svn+q:///qpdf/trunk@667 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-03-09 16:59:37 +00:00
Jay Berkenbilt
f62bec3ee5 update test suite to handle original object ID comments 
git-svn-id: svn+q:///qpdf/trunk@663 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-03-09 16:27:13 +00:00
Jay Berkenbilt
aa92e1ddb2 fix table full check again 
git-svn-id: svn+q:///qpdf/trunk@662 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-03-09 15:16:19 +00:00
Jay Berkenbilt
599daddb47 decode streams on check, always exit abnormally when warnings are detected 
git-svn-id: svn+q:///qpdf/trunk@660 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-03-08 19:00:19 +00:00
Jay Berkenbilt
779d668e17 write original object ID in a comment 
git-svn-id: svn+q:///qpdf/trunk@658 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-03-08 18:58:58 +00:00
Jay Berkenbilt
8bd0911281 push boundary of table full error out one more code -- seems 
consistent with other implementations and is required for one PDF file
in the test suite


git-svn-id: svn+q:///qpdf/trunk@656 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-03-08 18:58:22 +00:00
Jay Berkenbilt
5a42cc95ba update shared library version 
git-svn-id: svn+q:///qpdf/trunk@652 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-02-21 13:53:15 +00:00
Jay Berkenbilt
91cb7c0a58 fix many typos in comments and strings 
git-svn-id: svn+q:///qpdf/trunk@651 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-02-21 02:54:31 +00:00
Jay Berkenbilt
4499e04b57 better recovery for appended files with damaged cross-reference tables 
git-svn-id: svn+q:///qpdf/trunk@649 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-02-21 02:31:32 +00:00
Jay Berkenbilt
da7166bead fix problem with lzw decoder when run without early code change, now that we actually have test input 
git-svn-id: svn+q:///qpdf/trunk@646 71b93d88-0707-0410-a8cf-f5a4172ac649
 2009-02-20 02:27:36 +00:00
Jay Berkenbilt
07dc592182 gcc 4.4 fixes 
git-svn-id: svn+q:///qpdf/trunk@642 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-11-23 19:11:24 +00:00
Jay Berkenbilt
337b900708 handle UTF-16BE fully 
git-svn-id: svn+q:///qpdf/trunk@639 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-11-23 18:49:13 +00:00
Jay Berkenbilt
21bef28094 2.0.1 
git-svn-id: svn+q:///qpdf/trunk@624 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-05-06 15:32:07 +00:00
Jay Berkenbilt
7665fc3d81 conditionally include inttypes.h 
git-svn-id: svn+q:///qpdf/trunk@622 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-05-05 15:00:49 +00:00
Jay Berkenbilt
0ea47593f9 more 32/64-bit errors 
git-svn-id: svn+q:///qpdf/trunk@618 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-05-05 14:29:12 +00:00
Jay Berkenbilt
62bff4861f fix potential 64-bit issues 
git-svn-id: svn+q:///qpdf/trunk@613 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-05-05 02:22:40 +00:00
Jay Berkenbilt
bbdf4f4219 64-bit fix 
git-svn-id: svn+q:///qpdf/trunk@610 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-05-05 02:08:26 +00:00
Jay Berkenbilt
e5f08a7126 typo 
git-svn-id: svn+q:///qpdf/trunk@608 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-05-04 19:12:34 +00:00
Jay Berkenbilt
76bf91765e missing header files for gcc 4.3 
git-svn-id: svn+q:///qpdf/trunk@607 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-05-04 16:02:53 +00:00
Jay Berkenbilt
0ceb79cfdd missing strlen.h causes problems with gcc 4.3 
git-svn-id: svn+q:///qpdf/trunk@606 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-05-04 02:09:53 +00:00
Jay Berkenbilt
9a0b88bf77 update release date to actual date 
git-svn-id: svn+q:///qpdf/trunk@599 71b93d88-0707-0410-a8cf-f5a4172ac649
 2008-04-29 12:55:25 +00:00