cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Broad changes to tiff2ps by Bruce A. Mallett.

Browse Source 
Fixed PS_Lvl2page() code which outputs non-ASCII85 raw
    data.  Moved test for when to output a line break to
    *after* the output of a character.  This just serves
    to fix an eye-nuisance where the first line of raw
    data was one character shorter than subsequent lines.

    Added an experimental ASCII85 encoder which can be used
    only when there is a single buffer of bytes to be encoded.
    This version is much faster at encoding a straight-line
    buffer of data because it can avoid alot of the loop
    overhead of the byte-by-bye version.  To use this version
    you need to define EXP_ASCII85ENCODER (experimental ...).

    Added bug fix given by Michael Schmidt to PS_Lvl2page()
    in which an end-of-data marker ('>') was not being output
    when producing non-ASCII85 encoded PostScript Level 2
    data.

    Fixed PS_Lvl2colorspace() so that it no longer assumes that
    a TIFF having more than 2 planes is a CMYK.  This routine
    no longer looks at the samples per pixel but instead looks
    at the "photometric" value.  This change allows support of
    CMYK TIFFs.

    Modified the PostScript L2 imaging loop so as to test if
    the input stream is still open before attempting to do a
    flushfile on it.  This was done because some RIPs close
    the stream after doing the image operation.

    Got rid of the realloc() being done inside a loop in the
    PSRawDataBW() routine.  The code now walks through the
    byte-size array outside the loop to determine the largest
    size memory block that will be needed.

    Added "-m" switch to ask tiff2ps to, where possible, use the
    "imagemask" operator instead of the "image" operator.

    Added the "-i #" switch to allow interpolation to be disabled.

    Unrolled a loop or two to improve performance.
This commit is contained in:
Frank Warmerdam 2001-03-29 01:34:33 +00:00
parent f3bbcf1b9e
commit 7a1ad5e9d9
3 changed files with 437 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-03-28 Frank Warmerdam <warmerdam@pobox.com>
* tiff2ps.c/tiff2ps.1: Substantial changes to tiff2ps by
Bruce A. Mallett. See check message for detailed information
on all the changes, including a faster encoder, fixes for level
2 PostScript, and support for the imagemask operator.
2001-03-27 Frank Warmerdam <warmerdam@pobox.com> 2001-03-27 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tiffio.h: Changed "#if LOGLUV_PUBLIC" to * libtiff/tiffio.h: Changed "#if LOGLUV_PUBLIC" to

18
man/tiff2ps.1
View File

@ -1,4 +1,4 @@
.\" $Header: /cvs/maptools/cvsroot/libtiff/man/tiff2ps.1,v 1.1 1999-07-27 21:50:28 mike Exp $ .\" $Header: /cvs/maptools/cvsroot/libtiff/man/tiff2ps.1,v 1.2 2001-03-29 01:34:33 warmerda Exp $
.\" .\"
.\" Copyright (c) 1988-1997 Sam Leffler .\" Copyright (c) 1988-1997 Sam Leffler
.\" Copyright (c) 1991-1997 Silicon Graphics, Inc. .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
@ -113,6 +113,22 @@ Force the generation of Encapsulated \*(Ps.
.B \-h .B \-h
Specify the vertical size of the printed area (in inches). Specify the vertical size of the printed area (in inches).
.TP .TP
.B \-i
Enable/disable pixel interpolation. This option requires a
single numeric value: zero to disable pixel interpolation and
non-zero to enable. The default is enabled.
.TP
.B \-m
Where possible render using the
.B imagemask
\*(Ps operator instead of the image operator. When this option is specified
.I tiff2ps
will use
.B imagemask
for rendering 1 bit deep images. If this option is not specified
or if the image depth is greater than 1 then the image operator
is used.
.TP
.B \-o .B \-o
Set the initial Set the initial
.SM TIFF .SM TIFF

439
tools/tiff2ps.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiff2ps.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiff2ps.c,v 1.2 2001-03-29 01:34:33 warmerda Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -31,6 +31,66 @@
#include "tiffio.h" #include "tiffio.h"
/*
* Revision history
*
* 2001-Mar-21
* I (Bruce A. Mallett) added this revision history comment ;)
*
* Fixed PS_Lvl2page() code which outputs non-ASCII85 raw
* data. Moved test for when to output a line break to
* *after* the output of a character. This just serves
* to fix an eye-nuisance where the first line of raw
* data was one character shorter than subsequent lines.
*
* Added an experimental ASCII85 encoder which can be used
* only when there is a single buffer of bytes to be encoded.
* This version is much faster at encoding a straight-line
* buffer of data because it can avoid alot of the loop
* overhead of the byte-by-bye version. To use this version
* you need to define EXP_ASCII85ENCODER (experimental ...).
*
* Added bug fix given by Michael Schmidt to PS_Lvl2page()
* in which an end-of-data marker ('>') was not being output
* when producing non-ASCII85 encoded PostScript Level 2
* data.
*
* Fixed PS_Lvl2colorspace() so that it no longer assumes that
* a TIFF having more than 2 planes is a CMYK. This routine
* no longer looks at the samples per pixel but instead looks
* at the "photometric" value. This change allows support of
* CMYK TIFFs.
*
* Modified the PostScript L2 imaging loop so as to test if
* the input stream is still open before attempting to do a
* flushfile on it. This was done because some RIPs close
* the stream after doing the image operation.
*
* Got rid of the realloc() being done inside a loop in the
* PSRawDataBW() routine. The code now walks through the
* byte-size array outside the loop to determine the largest
* size memory block that will be needed.
*
* Added "-m" switch to ask tiff2ps to, where possible, use the
* "imagemask" operator instead of the "image" operator.
*
* Added the "-i #" switch to allow interpolation to be disabled.
*
* Unrolled a loop or two to improve performance.
*/
/*
* Define EXP_ASCII85ENCODER if you want to use an experimental
* version of the ASCII85 encoding routine. The advantage of
* using this routine is that tiff2ps will convert to ASCII85
* encoding at between 3 and 4 times the speed as compared to
* using the old (non-experimental) encoder. The disadvantage
* is that you will be using a new (and unproven) encoding
* routine. So user beware, you have been warned!
*/
#define EXP_ASCII85ENCODER
/* /*
* NB: this code assumes uint32 works with printf's %l[ud]. * NB: this code assumes uint32 works with printf's %l[ud].
*/ */
@ -48,6 +108,7 @@ int PSduplex = FALSE; /* enable duplex printing */
int PStumble = FALSE; /* enable top edge binding */ int PStumble = FALSE; /* enable top edge binding */
int PSavoiddeadzone = TRUE; /* enable avoiding printer deadzone */ int PSavoiddeadzone = TRUE; /* enable avoiding printer deadzone */
char *filename; /* input filename */ char *filename; /* input filename */
int useImagemask = FALSE; /* Use imagemask instead of image operator */
/* /*
* ASCII85 Encoding Support. * ASCII85 Encoding Support.
@ -71,6 +132,10 @@ void Ascii85Flush(FILE* fd);
void PSHead(FILE*, TIFF*, uint32, uint32, float, float, float, float); void PSHead(FILE*, TIFF*, uint32, uint32, float, float, float, float);
void PSTail(FILE*, int); void PSTail(FILE*, int);
#if defined( EXP_ASCII85ENCODER)
int Ascii85EncodeBlock( uint8 * ascii85_p, unsigned f_eod, const uint8 * raw_p, int raw_l );
#endif
static void usage(int); static void usage(int);
int int
@ -84,7 +149,7 @@ main(int argc, char* argv[])
extern int optind; extern int optind;
FILE* output = stdout; FILE* output = stdout;
while ((c = getopt(argc, argv, "h:w:d:o:O:aezps128DT")) != -1) while ((c = getopt(argc, argv, "h:i:w:d:o:O:aemzps128DT")) != -1)
switch (c) { switch (c) {
case 'd': case 'd':
dirnum = atoi(optarg); dirnum = atoi(optarg);
@ -92,6 +157,9 @@ main(int argc, char* argv[])
case 'D': case 'D':
PSduplex = TRUE; PSduplex = TRUE;
break; break;
case 'i':
interpolate = atoi(optarg) ? TRUE:FALSE;
break;
case 'T': case 'T':
PStumble = TRUE; PStumble = TRUE;
break; break;
@ -101,6 +169,9 @@ main(int argc, char* argv[])
case 'h': case 'h':
pageHeight = atof(optarg); pageHeight = atof(optarg);
break; break;
case 'm':
useImagemask = TRUE;
break;
case 'o': case 'o':
diroff = (uint32) strtoul(optarg, NULL, 0); diroff = (uint32) strtoul(optarg, NULL, 0);
break; break;
@ -375,6 +446,9 @@ TIFF2PS(FILE* fd, TIFF* tif, float pw, float ph)
case 3: case 3:
photometric = PHOTOMETRIC_RGB; photometric = PHOTOMETRIC_RGB;
break; break;
case 4:
photometric = PHOTOMETRIC_SEPARATED;
break;
} }
} }
if (checkImage(tif)) { if (checkImage(tif)) {
@ -495,6 +569,21 @@ PS_Lvl2colorspace(FILE* fd, TIFF* tif)
{ {
uint16 *rmap, *gmap, *bmap; uint16 *rmap, *gmap, *bmap;
int i, num_colors; int i, num_colors;
const char * colorspace_p;
switch ( photometric )
{
case PHOTOMETRIC_SEPARATED:
colorspace_p = "CMYK";
break;
case PHOTOMETRIC_RGB:
colorspace_p = "RGB";
break;
default:
colorspace_p = "Gray";
}
/* /*
* Set up PostScript Level 2 colorspace according to * Set up PostScript Level 2 colorspace according to
@ -505,9 +594,7 @@ PS_Lvl2colorspace(FILE* fd, TIFF* tif)
if (photometric == PHOTOMETRIC_YCBCR) { if (photometric == PHOTOMETRIC_YCBCR) {
/* MORE CODE HERE */ /* MORE CODE HERE */
} }
fprintf(fd, "/Device%s", fprintf(fd, "/Device%s setcolorspace\n", colorspace_p );
samplesperpixel > 2 ? "RGB" : "Gray");
fputs(" setcolorspace\n", fd);
return; return;
} }
@ -565,6 +652,10 @@ PS_Lvl2ImageDict(FILE* fd, TIFF* tif, uint32 w, uint32 h)
uint16 predictor, minsamplevalue, maxsamplevalue; uint16 predictor, minsamplevalue, maxsamplevalue;
int repeat_count; int repeat_count;
char im_h[64], im_x[64], im_y[64]; char im_h[64], im_x[64], im_y[64];
char * imageOp = "image";
if ( useImagemask && (bitspersample == 1) )
imageOp = "imagemask";
(void)strcpy(im_x, "0"); (void)strcpy(im_x, "0");
(void)sprintf(im_y, "%lu", (long) h); (void)sprintf(im_y, "%lu", (long) h);
@ -808,9 +899,10 @@ PS_Lvl2ImageDict(FILE* fd, TIFF* tif, uint32 w, uint32 h)
fputs(" dup", fd); fputs(" dup", fd);
fputs(" ]", fd); fputs(" ]", fd);
} }
fputs("\n >> image\n", fd);
fprintf( fd, "\n >> %s\n", imageOp );
if (ascii85) if (ascii85)
fputs(" im_stream flushfile\n", fd); fputs(" im_stream status { im_stream flushfile } if\n", fd);
if (repeat_count > 1) { if (repeat_count > 1) {
if (tile_width < w) { if (tile_width < w) {
fprintf(fd, " /im_x im_x %lu add def\n", fprintf(fd, " /im_x im_x %lu add def\n",
@ -857,6 +949,11 @@ PS_Lvl2page(FILE* fd, TIFF* tif, uint32 w, uint32 h)
unsigned char *buf_data, *cp; unsigned char *buf_data, *cp;
tsize_t chunk_size, byte_count; tsize_t chunk_size, byte_count;
#if defined( EXP_ASCII85ENCODER )
int ascii85_l; /* Length, in bytes, of ascii85_p[] data */
uint8 * ascii85_p = 0; /* Holds ASCII85 encoded data */
#endif
PS_Lvl2colorspace(fd, tif); PS_Lvl2colorspace(fd, tif);
use_rawdata = PS_Lvl2ImageDict(fd, tif, w, h); use_rawdata = PS_Lvl2ImageDict(fd, tif, w, h);
@ -890,6 +987,28 @@ PS_Lvl2page(FILE* fd, TIFF* tif, uint32 w, uint32 h)
return(FALSE); return(FALSE);
} }
#if defined( EXP_ASCII85ENCODER )
if ( ascii85 ) {
/*
* Allocate a buffer to hold the ASCII85 encoded data. Note
* that it is allocated with sufficient room to hold the
* encoded data (5*chunk_size/4) plus the EOD marker (+8)
* and formatting line breaks. The line breaks are more
* than taken care of by using 6*chunk_size/4 rather than
* 5*chunk_size/4.
*/
ascii85_p = _TIFFmalloc( (chunk_size+(chunk_size/2)) + 8 );
if ( !ascii85_p ) {
_TIFFfree( buf_data );
TIFFError( filename, "Cannot allocate ASCII85 encoding buffer." );
return ( FALSE );
}
}
#endif
TIFFGetFieldDefaulted(tif, TIFFTAG_FILLORDER, &fillorder); TIFFGetFieldDefaulted(tif, TIFFTAG_FILLORDER, &fillorder);
for (chunk_no = 0; chunk_no < num_chunks; chunk_no++) { for (chunk_no = 0; chunk_no < num_chunks; chunk_no++) {
if (ascii85) if (ascii85)
@ -921,24 +1040,48 @@ PS_Lvl2page(FILE* fd, TIFF* tif, uint32 w, uint32 h)
if (ascii85) if (ascii85)
Ascii85Put('\0', fd); Ascii85Put('\0', fd);
} }
for (cp = buf_data; byte_count > 0; byte_count--) {
if (ascii85) if (ascii85) {
#if defined( EXP_ASCII85ENCODER )
ascii85_l = Ascii85EncodeBlock(ascii85_p, 1, buf_data, byte_count );
if ( ascii85_l > 0 )
fwrite( ascii85_p, ascii85_l, 1, fd );
#else
for (cp = buf_data; byte_count > 0; byte_count--)
Ascii85Put(*cp++, fd); Ascii85Put(*cp++, fd);
else { #endif
}
else
{
for (cp = buf_data; byte_count > 0; byte_count--) {
putc(hex[((*cp)>>4)&0xf], fd);
putc(hex[(*cp)&0xf], fd);
cp++;
if (--breaklen <= 0) { if (--breaklen <= 0) {
putc('\n', fd); putc('\n', fd);
breaklen = 36; breaklen = 36;
} }
putc(hex[((*cp)>>4)&0xf], fd);
putc(hex[(*cp)&0xf], fd);
cp++;
} }
} }
if (ascii85)
Ascii85Flush(fd); if ( !ascii85 ) {
else if ( level2 )
putc( '>', fd );
putc('\n', fd); putc('\n', fd);
} }
#if !defined( EXP_ASCII85ENCODER )
else
Ascii85Flush(fd);
#endif
}
#if defined( EXP_ASCII85ENCODER )
if ( ascii85_p )
_TIFFfree( ascii85_p );
#endif
_TIFFfree(buf_data); _TIFFfree(buf_data);
fputs("%%EndData\n", fd); fputs("%%EndData\n", fd);
return(TRUE); return(TRUE);
@ -947,6 +1090,11 @@ PS_Lvl2page(FILE* fd, TIFF* tif, uint32 w, uint32 h)
void void
PSpage(FILE* fd, TIFF* tif, uint32 w, uint32 h) PSpage(FILE* fd, TIFF* tif, uint32 w, uint32 h)
{ {
char * imageOp = "image";
if ( useImagemask && (bitspersample == 1) )
imageOp = "imagemask";
if (level2 && PS_Lvl2page(fd, tif, w, h)) if (level2 && PS_Lvl2page(fd, tif, w, h))
return; return;
ps_bytesperrow = tf_bytesperrow; ps_bytesperrow = tf_bytesperrow;
@ -986,7 +1134,7 @@ PSpage(FILE* fd, TIFF* tif, uint32 w, uint32 h)
break; break;
case PHOTOMETRIC_MINISBLACK: case PHOTOMETRIC_MINISBLACK:
case PHOTOMETRIC_MINISWHITE: case PHOTOMETRIC_MINISWHITE:
PhotoshopBanner(fd, w, h, 1, 1, "image"); PhotoshopBanner(fd, w, h, 1, 1, imageOp);
fprintf(fd, "/scanLine %ld string def\n", fprintf(fd, "/scanLine %ld string def\n",
(long) ps_bytesperrow); (long) ps_bytesperrow);
fprintf(fd, "%lu %lu %d\n", fprintf(fd, "%lu %lu %d\n",
@ -995,7 +1143,7 @@ PSpage(FILE* fd, TIFF* tif, uint32 w, uint32 h)
(unsigned long) w, (unsigned long) h, (unsigned long) h); (unsigned long) w, (unsigned long) h, (unsigned long) h);
fprintf(fd, fprintf(fd,
"{currentfile scanLine readhexstring pop} bind\n"); "{currentfile scanLine readhexstring pop} bind\n");
fprintf(fd, "image\n"); fprintf(fd, "%s\n", imageOp);
PSDataBW(fd, tif, w, h); PSDataBW(fd, tif, w, h);
break; break;
} }
@ -1210,14 +1358,43 @@ PSDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
tsize_t stripsize = TIFFStripSize(tif); tsize_t stripsize = TIFFStripSize(tif);
tstrip_t s; tstrip_t s;
#if defined( EXP_ASCII85ENCODER )
int ascii85_l; /* Length, in bytes, of ascii85_p[] data */
uint8 * ascii85_p = 0; /* Holds ASCII85 encoded data */
#endif
(void) w; (void) h; (void) w; (void) h;
tf_buf = (unsigned char *) _TIFFmalloc(stripsize); tf_buf = (unsigned char *) _TIFFmalloc(stripsize);
if (tf_buf == NULL) { if (tf_buf == NULL) {
TIFFError(filename, "No space for scanline buffer"); TIFFError(filename, "No space for scanline buffer");
return; return;
} }
#if defined( EXP_ASCII85ENCODER )
if ( ascii85 ) {
/*
* Allocate a buffer to hold the ASCII85 encoded data. Note
* that it is allocated with sufficient room to hold the
* encoded data (5*stripsize/4) plus the EOD marker (+8)
* and formatting line breaks. The line breaks are more
* than taken care of by using 6*stripsize/4 rather than
* 5*stripsize/4.
*/
ascii85_p = _TIFFmalloc( (stripsize+(stripsize/2)) + 8 );
if ( !ascii85_p ) {
_TIFFfree( tf_buf );
TIFFError( filename, "Cannot allocate ASCII85 encoding buffer." );
return;
}
}
#endif
if (ascii85) if (ascii85)
Ascii85Init(); Ascii85Init();
for (s = 0; s < TIFFNumberOfStrips(tif); s++) { for (s = 0; s < TIFFNumberOfStrips(tif); s++) {
int cc = TIFFReadEncodedStrip(tif, s, tf_buf, stripsize); int cc = TIFFReadEncodedStrip(tif, s, tf_buf, stripsize);
if (cc < 0) { if (cc < 0) {
@ -1231,8 +1408,15 @@ PSDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
cp++; cp++;
} }
if (ascii85) { if (ascii85) {
#if defined( EXP_ASCII85ENCODER )
ascii85_l = Ascii85EncodeBlock( ascii85_p, 1, cp, cc );
if ( ascii85_l > 0 )
fwrite( ascii85_p, ascii85_l, 1, fd );
#else
while (cc-- > 0) while (cc-- > 0)
Ascii85Put(*cp++, fd); Ascii85Put(*cp++, fd);
#endif /* EXP_ASCII85_ENCODER */
} else { } else {
while (cc-- > 0) { while (cc-- > 0) {
unsigned char c = *cp++; unsigned char c = *cp++;
@ -1241,10 +1425,20 @@ PSDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
} }
} }
} }
if (ascii85)
Ascii85Flush(fd); if ( !ascii85 )
else if (level2) {
if ( level2 )
fputs(">\n", fd); fputs(">\n", fd);
}
#if !defined( EXP_ASCII85ENCODER )
else
Ascii85Flush(fd);
#else
if ( ascii85_p )
_TIFFfree( ascii85_p );
#endif
_TIFFfree(tf_buf); _TIFFfree(tf_buf);
} }
@ -1259,25 +1453,55 @@ PSRawDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
unsigned char *cp, c; unsigned char *cp, c;
tstrip_t s; tstrip_t s;
#if defined( EXP_ASCII85ENCODER )
int ascii85_l; /* Length, in bytes, of ascii85_p[] data */
uint8 * ascii85_p = 0; /* Holds ASCII85 encoded data */
#endif
(void) w; (void) h; (void) w; (void) h;
TIFFGetFieldDefaulted(tif, TIFFTAG_FILLORDER, &fillorder); TIFFGetFieldDefaulted(tif, TIFFTAG_FILLORDER, &fillorder);
TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &bc); TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &bc);
/*
* Find largest strip:
*/
bufsize = bc[0]; bufsize = bc[0];
for ( s = 0; ++s < tf_numberstrips; ) {
if ( bc[s] > bufsize )
bufsize = bc[s];
}
tf_buf = (unsigned char*) _TIFFmalloc(bufsize); tf_buf = (unsigned char*) _TIFFmalloc(bufsize);
if (tf_buf == NULL) { if (tf_buf == NULL) {
TIFFError(filename, "No space for strip buffer"); TIFFError(filename, "No space for strip buffer");
return; return;
} }
for (s = 0; s < tf_numberstrips; s++) {
if (bc[s] > bufsize) { #if defined( EXP_ASCII85ENCODER )
tf_buf = (unsigned char *) _TIFFrealloc(tf_buf, bc[s]); if ( ascii85 ) {
if (tf_buf == NULL) { /*
TIFFError(filename, * Allocate a buffer to hold the ASCII85 encoded data. Note
"No space for strip buffer"); * that it is allocated with sufficient room to hold the
* encoded data (5*bufsize/4) plus the EOD marker (+8)
* and formatting line breaks. The line breaks are more
* than taken care of by using 6*bufsize/4 rather than
* 5*bufsize/4.
*/
ascii85_p = _TIFFmalloc( (bufsize+(bufsize/2)) + 8 );
if ( !ascii85_p ) {
_TIFFfree( tf_buf );
TIFFError( filename, "Cannot allocate ASCII85 encoding buffer." );
return; return;
} }
bufsize = bc[s];
} }
#endif
for (s = 0; s < tf_numberstrips; s++) {
cc = TIFFReadRawStrip(tif, s, tf_buf, bc[s]); cc = TIFFReadRawStrip(tif, s, tf_buf, bc[s]);
if (cc < 0) { if (cc < 0) {
TIFFError(filename, "Can't read strip"); TIFFError(filename, "Can't read strip");
@ -1295,12 +1519,24 @@ PSRawDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
breaklen = MAXLINE; breaklen = MAXLINE;
} else { } else {
Ascii85Init(); Ascii85Init();
#if defined( EXP_ASCII85ENCODER )
ascii85_l = Ascii85EncodeBlock( ascii85_p, 1, tf_buf, cc );
if ( ascii85_l > 0 )
fwrite( ascii85_p, ascii85_l, 1, fd );
#else
for (cp = tf_buf; cc > 0; cc--) for (cp = tf_buf; cc > 0; cc--)
Ascii85Put(*cp++, fd); Ascii85Put(*cp++, fd);
Ascii85Flush(fd); Ascii85Flush(fd);
#endif /* EXP_ASCII85ENCODER */
} }
} }
_TIFFfree((char *) tf_buf); _TIFFfree((char *) tf_buf);
#if defined( EXP_ASCII85ENCODER )
if ( ascii85_p )
_TIFFfree( ascii85_p );
#endif
} }
void void
@ -1373,6 +1609,151 @@ Ascii85Flush(FILE* fd)
} }
fputs("~>\n", fd); fputs("~>\n", fd);
} }
#if defined( EXP_ASCII85ENCODER)
#define A85BREAKCNTR ascii85breaklen
#define A85BREAKLEN (2*MAXLINE)
/*****************************************************************************
*
* Name: Ascii85EncodeBlock( ascii85_p, f_eod, raw_p, raw_l )
*
* Description: This routine will encode the raw data in the buffer described
* by raw_p and raw_l into ASCII85 format and store the encoding
* in the buffer given by ascii85_p.
*
* Parameters: ascii85_p - A buffer supplied by the caller which will
* contain the encoded ASCII85 data.
* f_eod - Flag: Nz means to end the encoded buffer with
* an End-Of-Data marker.
* raw_p - Pointer to the buffer of data to be encoded
* raw_l - Number of bytes in raw_p[] to be encoded
*
* Returns: (int) < 0 Error, see errno
* >= 0 Number of bytes written to ascii85_p[].
*
* Notes: An external variable given by A85BREAKCNTR is used to
* determine when to insert newline characters into the
* encoded data. As each byte is placed into ascii85_p this
* external is decremented. If the variable is decrement to
* or past zero then a newline is inserted into ascii85_p
* and the A85BREAKCNTR is then reset to A85BREAKLEN.
* Note: for efficiency reasons the A85BREAKCNTR variable
* is not actually checked on *every* character
* placed into ascii85_p but often only for every
* 5 characters.
*
* THE CALLER IS RESPONSIBLE FOR ENSURING THAT ASCII85_P[] IS
* SUFFICIENTLY LARGE TO THE ENCODED DATA!
* You will need at least 5 * (raw_l/4) bytes plus space for
* newline characters and space for an EOD marker (if
* requested). A safe calculation is to use 6*(raw_l/4) + 8
* to size ascii85_p.
*
*****************************************************************************/
int Ascii85EncodeBlock( uint8 * ascii85_p, unsigned f_eod, const uint8 * raw_p, int raw_l )
{
char ascii85[5]; /* Encoded 5 tuple */
int ascii85_l; /* Number of bytes written to ascii85_p[] */
int rc; /* Return code */
uint32 val32; /* Unencoded 4 tuple */
ascii85_l = 0; /* Nothing written yet */
if ( raw_p )
{
--raw_p; /* Prepare for pre-increment fetches */
for ( ; raw_l > 3; raw_l -= 4 )
{
val32 = *(++raw_p) << 24;
val32 += *(++raw_p) << 16;
val32 += *(++raw_p) << 8;
val32 += *(++raw_p);
if ( val32 == 0 ) /* Special case */
{
ascii85_p[ascii85_l] = 'z';
rc = 1;
}
else
{
ascii85[4] = (val32 % 85) + 33;
val32 /= 85;
ascii85[3] = (val32 % 85) + 33;
val32 /= 85;
ascii85[2] = (val32 % 85) + 33;
val32 /= 85;
ascii85[1] = (val32 % 85) + 33;
ascii85[0] = (val32 / 85) + 33;
_TIFFmemcpy( &ascii85_p[ascii85_l], ascii85, sizeof(ascii85) );
rc = sizeof(ascii85);
}
ascii85_l += rc;
if ( (A85BREAKCNTR -= rc) <= 0 )
{
ascii85_p[ascii85_l] = '\n';
++ascii85_l;
A85BREAKCNTR = A85BREAKLEN;
}
}
/*
* Output any straggler bytes:
*/
if ( raw_l )
{
int len; /* Output this many bytes */
len = raw_l + 1;
val32 = *++raw_p << 24; /* Prime the pump */
if ( --raw_l ) val32 += *(++raw_p) << 16;
if ( --raw_l ) val32 += *(++raw_p) << 8;
val32 /= 85;
ascii85[3] = (val32 % 85) + 33;;
val32 /= 85;
ascii85[2] = (val32 % 85) + 33;;
val32 /= 85;
ascii85[1] = (val32 % 85) + 33;;
ascii85[0] = (val32 / 85) + 33;;
_TIFFmemcpy( &ascii85_p[ascii85_l], ascii85, len );
ascii85_l += len;
}
}
/*
* If requested add an ASCII85 End Of Data marker:
*/
if ( f_eod )
{
ascii85_p[ascii85_l++] = '~';
ascii85_p[ascii85_l++] = '>';
ascii85_p[ascii85_l++] = '\n';
}
return ( ascii85_l );
} /* Ascii85EncodeBlock() */
#endif /* EXP_ASCII85ENCODER */
char* stuff[] = { char* stuff[] = {
"usage: tiff2ps [options] input.tif ...", "usage: tiff2ps [options] input.tif ...",
@ -1384,6 +1765,8 @@ char* stuff[] = {
" -D enable duplex printing (two pages per sheet of paper)", " -D enable duplex printing (two pages per sheet of paper)",
" -e generate Encapsulated PostScript (EPS)", " -e generate Encapsulated PostScript (EPS)",
" -h # assume printed page height is # inches (default 11)", " -h # assume printed page height is # inches (default 11)",
" -i # enable/disable (Nz/0) pixel interpolation (default: enable)",
" -m use \"imagemask\" operator instead of \"image\"",
" -o # convert directory at file offset #", " -o # convert directory at file offset #",
" -O file write PostScript to file instead of standard output", " -O file write PostScript to file instead of standard output",
" -a convert all directories in file (default is first)", " -a convert all directories in file (default is first)",