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