avoid producing PDFs with bpp > 8

This commit is contained in:
Nils Philippsen 2013-09-09 17:35:54 +02:00
parent 0856fb12e4
commit a8194ec90c
2 changed files with 59 additions and 1 deletions

View File

@ -0,0 +1,51 @@
From c0686879ac66c1933aefbb62b69afb0c9a0db912 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Mon, 9 Sep 2013 17:13:15 +0200
Subject: [PATCH] patch: pdf-no-high-bpp
Squashed commit of the following:
commit 9f7d97e114389595481f6e9d3ac1038972f3f73b
Author: Nils Philippsen <nils@redhat.com>
Date: Mon Sep 9 17:08:38 2013 +0200
avoid producing PDFs with bpp > 8
---
src/xsane-save.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/xsane-save.c b/src/xsane-save.c
index 5461bf1..75e0a63 100644
--- a/src/xsane-save.c
+++ b/src/xsane-save.c
@@ -4205,6 +4205,18 @@ int xsane_save_pdf(FILE *outfile, FILE *imagefile, Image_info *image_info, float
*cancel_save = 0;
+ if (image_info->depth > 8)
+ {
+ char buf[TEXTBUFSIZE];
+
+ snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, "PDF doesn't allow bit depths > 8");
+ DBG(DBG_error, "%s\n", buf);
+ xsane_back_gtk_decision(ERR_HEADER_ERROR, (gchar **) error_xpm, buf, BUTTON_OK, NULL, TRUE /* wait */);
+ *cancel_save = 1;
+
+ goto bail_out;
+ }
+
xsane_save_pdf_create_document_header(outfile, &xref, 1, flatedecode);
if (apply_ICM_profile && (cms_function == XSANE_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE))
@@ -4232,6 +4244,8 @@ int xsane_save_pdf(FILE *outfile, FILE *imagefile, Image_info *image_info, float
*cancel_save = 1;
}
+bail_out:
+
return (*cancel_save);
}
--
1.8.3.1

View File

@ -20,7 +20,7 @@
Name: xsane
Summary: X Window System front-end for the SANE scanner interface
Version: 0.999
Release: 5%{?dist}
Release: 6%{?dist}
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
Source1: xsane-256x256.png
# use "xdg-open" instead of "netscape" to launch help browser
@ -60,6 +60,9 @@ Patch9: xsane-0.998-desktop-file.patch
# man page: update command line options
# submitted to upstream (Oliver Rauch) via email, 2013-07-08
Patch10: xsane-0.999-man-page.patch
# avoid producing PDFs with bpp > 8
# submitted to upstream (Oliver Rauch) via email, 2013-09-09
Patch11: xsane-0.999-pdf-no-high-bpp.patch
# autoconf-generated files
Patch100: xsane-0.999-1-autoconf.patch.bz2
License: GPLv2+
@ -123,6 +126,7 @@ done
%patch8 -p1 -b .wmclass
%patch9 -p1 -b .desktop-file
%patch10 -p1 -b .man-page
%patch11 -p1 -b .pdf-no-high-bpp
%patch100 -p1 -b .autoconf
@ -227,6 +231,9 @@ fi
%{_datadir}/sane/xsane
%changelog
* Mon Sep 09 2013 Nils Philippsen <nils@redhat.com> - 0.999-6
- avoid producing PDFs with bpp > 8
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.999-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild