-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hello,
here you find the merge directive with the stdin input fix.
Regards,
Georg
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk4VTWsACgkQ5sLITM1qIaKbIwCeIRpEJ+4sH7hO47vFVsGtwKEM
hxYAoK3xiyQ2WzuMl9xGDjCZA9xZ37pY
=sSi3
-----END PGP SIGNATURE-----
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: georg.gottleu...@uni-ulm.de-20110707055623-\
# jue9246fo1a6o9gw
# target_branch: bzr://bzr.sv.gnu.org/pdf/libgnupdf/trunk/
# testament_sha1: f42362bac441d8c455639ba99a906af3c86c9397
# timestamp: 2011-07-07 07:58:02 +0200
# base_revision_id: aleksan...@gnu.org-20110701200744-y9dgfttimvua42wp
#
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog 2011-07-01 19:58:46 +0000
+++ ChangeLog 2011-07-07 05:56:23 +0000
@@ -1,3 +1,8 @@
+2011-07-07 Georg Gottleuber <georg.gottleu...@uni-ulm.de>
+
+ utils: samll fix for stdin bug in pdf-filter
+ * utils/pdf-filter.c
+
2011-07-01 Aleksander Morgado <aleksan...@gnu.org>
torture: fix compilation issues under mingw32
=== modified file 'utils/pdf-filter.c'
--- utils/pdf-filter.c 2011-06-24 16:18:43 +0000
+++ utils/pdf-filter.c 2011-07-06 14:59:44 +0000
@@ -347,14 +347,17 @@
}
written_bytes = 0;
- if (!pdf_stm_write (stm, buf, read_bytes, &written_bytes, &error) &&
- error)
+ if (read_bytes)
{
- pdf_error (pdf_error_get_status (error),
- stderr,
- "writing to stream: %s",
- pdf_error_get_message (error));
- exit (EXIT_FAILURE);
+ if (!pdf_stm_write (stm, buf, read_bytes, &written_bytes,
&error) &&
+ error)
+ {
+ pdf_error (pdf_error_get_status (error),
+ stderr,
+ "writing to stream: %s",
+ pdf_error_get_message (error));
+ exit (EXIT_FAILURE);
+ }
}
}
while (read_bytes == BUF_SIZE);
# Begin bundle
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
cKEgzHUcUg==
