Mon, 14 Dec 2009 15:51:53 +0000
Patched to add PNG and JP2 support.
Created-By: Daniel Glöckner <daniel-gl at gmx.net>
The attached patch adds PNG and JP2 support to tumble.
PNG:
As the deflated data is directly copied into the PDF, there are some
limitations to the list of supported images:
- bit depth <= 8
- no alpha channel
- no interlace
JP2:
The PDF Reference says JP2 is just a subset of the allowed JPX
format. I don't have a copy of the official standard, so I don't know
what to change to cover JPXes as well.
You'll need the Adobe Acrobat Reader 6 to display those images.
Xpdf and Ghostscript are missing the ColorSpace key in the image
dictionary, which is optional for JPXDecode and IMHO not just a matter
of a few lines of code.
One thing left to do is to change the PDF version to 1.5 if a JP2 file
has been given to tumble - maybe using the Version key in the Catalog
if seeking is not possible.
Using the resolution info in a JP2 (resc/resd boxes) is implemented but
untested. Jasper doesn't write those boxes.
I had to change the string handling to allow black in PNG palettes.
And there was a double free in tumble_input.c which happens when not
using control files.
Daniel
| eric@62 | 1 | /* |
| eric@125 | 2 | * tumble: build a PDF file from image files |
| eric@62 | 3 | * |
| eric@62 | 4 | * PDF routines |
| eric@131 | 5 | * $Id: pdf_private.h,v 1.8 2003/03/14 00:24:37 eric Exp $ |
| eric@62 | 6 | * Copyright 2001, 2002, 2003 Eric Smith <eric@brouhaha.com> |
| eric@62 | 7 | * |
| eric@62 | 8 | * This program is free software; you can redistribute it and/or modify |
| eric@62 | 9 | * it under the terms of the GNU General Public License version 2 as |
| eric@62 | 10 | * published by the Free Software Foundation. Note that permission is |
| eric@62 | 11 | * not granted to redistribute this program under the terms of any |
| eric@62 | 12 | * other version of the General Public License. |
| eric@62 | 13 | * |
| eric@62 | 14 | * This program is distributed in the hope that it will be useful, |
| eric@62 | 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| eric@62 | 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| eric@62 | 17 | * GNU General Public License for more details. |
| eric@62 | 18 | * |
| eric@62 | 19 | * You should have received a copy of the GNU General Public License |
| eric@62 | 20 | * along with this program; if not, write to the Free Software |
| eric@62 | 21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA |
| eric@62 | 22 | */ |
| eric@62 | 23 | |
| eric@62 | 24 | |
| eric@59 | 25 | struct pdf_page |
| eric@59 | 26 | { |
| eric@59 | 27 | pdf_file_handle pdf_file; |
| eric@59 | 28 | struct pdf_obj *page_dict; |
| eric@59 | 29 | struct pdf_obj *media_box; |
| eric@59 | 30 | struct pdf_obj *procset; |
| eric@59 | 31 | struct pdf_obj *resources; |
| eric@59 | 32 | |
| eric@59 | 33 | char last_XObject_name; |
| eric@59 | 34 | struct pdf_obj *XObject_dict; |
| eric@59 | 35 | }; |
| eric@59 | 36 | |
| eric@59 | 37 | |
| eric@59 | 38 | struct pdf_pages |
| eric@59 | 39 | { |
| eric@59 | 40 | struct pdf_obj *pages_dict; |
| eric@59 | 41 | struct pdf_obj *kids; |
| eric@59 | 42 | struct pdf_obj *count; |
| eric@59 | 43 | }; |
| eric@59 | 44 | |
| eric@59 | 45 | |
| eric@59 | 46 | struct pdf_file |
| eric@59 | 47 | { |
| eric@85 | 48 | FILE *f; |
| eric@85 | 49 | struct pdf_obj *first_ind_obj; |
| eric@85 | 50 | struct pdf_obj *last_ind_obj; |
| eric@85 | 51 | long int xref_offset; |
| eric@85 | 52 | struct pdf_obj *catalog; |
| eric@85 | 53 | struct pdf_obj *info; |
| eric@85 | 54 | struct pdf_pages *root; |
| eric@85 | 55 | struct pdf_bookmark *outline_root; |
| eric@85 | 56 | struct pdf_obj *trailer_dict; |
| eric@131 | 57 | struct pdf_name_tree *page_label_tree; |
| eric@85 | 58 | struct pdf_name_tree *name_tree_list; |
| eric@59 | 59 | }; |