Imported Debian patch 0.995-6debian/0.995-6

3 files changed, 58 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 38a5036..15b16d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xsane (0.995-6) unstable; urgency=low
+
+  * debian/patches/06_fix_pdf_xref.dpatch:
+    + Added; mark non-existent PDF objects as free in the xref table
+      (closes: #499104).
+
+ -- Julien BLACHE <jblache@debian.org>  Wed, 17 Sep 2008 21:40:10 +0200
+
 xsane (0.995-5) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/patches/00list b/debian/patches/00list
index 27fa422..3d24b66 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,5 +3,6 @@
 03_gimp_acquire_menu
 04_inhibit_clickthrough
 05_options_handling_fix
+06_fix_pdf_xref
 10_broken_links
 
diff --git a/debian/patches/06_fix_pdf_xref.dpatch b/debian/patches/06_fix_pdf_xref.dpatch
new file mode 100644
index 0000000..07ffad0
--- /dev/null
+++ b/debian/patches/06_fix_pdf_xref.dpatch
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_fix_pdf_xref.dpatch by  <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Mark non-existent objects as free in the xref table.
+
+@DPATCH@
+diff -urNad xsane-0.995~/src/xsane-multipage-project.c xsane-0.995/src/xsane-multipage-project.c
+--- xsane-0.995~/src/xsane-multipage-project.c	2007-05-17 14:57:31.000000000 +0200
++++ xsane-0.995/src/xsane-multipage-project.c	2008-09-17 21:54:28.871207862 +0200
+@@ -973,6 +973,10 @@
+     else if (output_format == XSANE_PDF)
+     {
+       xsane_save_pdf_create_document_header(outfile, &xref, pages, preferences.save_pdf_flatedecoded);
++
++      /* Objects 4 and 5 are unused and do not exist */
++      xref.obj[4] = 0;
++      xref.obj[5] = 0;
+     }
+   }
+ #ifdef HAVE_LIBTIFF
+diff -urNad xsane-0.995~/src/xsane-save.c xsane-0.995/src/xsane-save.c
+--- xsane-0.995~/src/xsane-save.c	2008-09-17 21:53:33.000000000 +0200
++++ xsane-0.995/src/xsane-save.c	2008-09-17 21:54:07.654207681 +0200
+@@ -4087,7 +4087,7 @@
+ 
+   for (i=1; i <= pages * 2 + 7; i++)
+   {
+-    fprintf(outfile, "%010lu 00000 n \n", xref->obj[i]);
++    fprintf(outfile, "%010lu 00000 %c \n", xref->obj[i], (xref->obj[i]) ? 'n' : 'f');
+   }
+ 
+   fprintf(outfile, "\n");
+@@ -4186,11 +4186,13 @@
+ 
+   xsane_save_pdf_create_document_header(outfile, &xref, 1, flatedecode);
+ 
+-  xref.obj[4] = ftell(outfile);
+-  xref.obj[5] = ftell(outfile);
++  /* Objects 4 and 5 are unused and do not exist */
++  xref.obj[4] = 0;
++  xref.obj[5] = 0;
+ 
+   if (apply_ICM_profile && (cms_function == XSANE_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE))
+   {
++    /* Use object 4 for ICM profile */
+     icc_object = 4;
+     xsane_embed_pdf_icm_profile(outfile, &xref, image_info->icm_profile, flatedecode, icc_object);
+   }