* Aadded Pixar tag support.
Contributed by Phil Beffery <phil@pixar.com> * Made one more change to tif_dir.c for removal of LZW compression. Also added notice when LZW compression invoked. * Changed default compression in tools to TIFF_PACKBITS, and changed usage description in tools to reflect removal of LZW compression
This commit is contained in:
Mike Welles
parent
c614caf006
commit
da558ffbe4
12
ChangeLog
12
ChangeLog
@ -1,9 +1,19 @@
|
||||
Tue Dec 21 11:04:45 EST 1999 Mike Welles <mike@onshore.com>
|
||||
|
||||
* Aadded Pixar tag support. Contributed by Phil Beffery <phil@pixar.com>
|
||||
|
||||
* Made one more change to tif_dir.c for removal of LZW compression. Also added notice
|
||||
when LZW compression invoked.
|
||||
|
||||
* Changed default compression in tools to TIFF_PACKBITS, and changed usage descriptions
|
||||
in tools to reflect removal of LZW compression
|
||||
|
||||
Mon Dec 20 18:39:02 EST 1999 Mike Welles <mike@onshore.com>
|
||||
|
||||
* Fixed bug that caused LZW (non) compression to segfault. Added
|
||||
warning about LZW compression removed being removed, and why.
|
||||
|
||||
* added nostrip to install in tools/Makefile.in so that debugging
|
||||
* Added nostrip to install in tools/Makefile.in so that debugging
|
||||
symbols are kept.
|
||||
|
||||
Tue Dec 7 12:04:47 EST 1999 Mike Welles <mike@onshore.com>
|
||||
|
||||
3
TODO
3
TODO
@ -1,5 +1,6 @@
|
||||
# $Header: /cvs/maptools/cvsroot/libtiff/TODO,v 1.1 1999-07-27 21:50:26 mike Exp $
|
||||
# $Header: /cvs/maptools/cvsroot/libtiff/TODO,v 1.2 1999-12-21 17:03:03 mwelles Exp $
|
||||
|
||||
o gif2tiff segaulting on selected images
|
||||
o tiffcmp read data by strip/tile instead of scanline
|
||||
o YCbCr sampling support
|
||||
o extracate colorspace conversion support
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_compress.c,v 1.3 1999-12-20 23:46:11 mwelles Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_compress.c,v 1.4 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -39,7 +39,7 @@ TIFFNoEncode(TIFF* tif, char* method)
|
||||
if (c) {
|
||||
if (! strncmp(c->name, "LZW", 3) ){
|
||||
TIFFError(tif->tif_name,
|
||||
"%s %s encoding is no longer implemented due to Unisys patent enforcement.",
|
||||
"%s %s encoding is no longer implemented due to Unisys patent enforcement",
|
||||
c->name, method);
|
||||
} else {
|
||||
TIFFError(tif->tif_name, "%s %s encoding is not implemented",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.c,v 1.5 1999-11-27 20:03:47 warmerda Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.c,v 1.6 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -167,8 +167,16 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
|
||||
/*
|
||||
* Setup new compression routine state.
|
||||
*/
|
||||
if ( ! tif->tif_mode == O_RDONLY ) {
|
||||
/* Handle removal of LZW compression */
|
||||
if ( v == COMPRESSION_LZW ) {
|
||||
TIFFError(tif->tif_name,
|
||||
"LZW compression no longer supported due to Unisys patent enforcement");
|
||||
v=COMPRESSION_NONE;
|
||||
}
|
||||
}
|
||||
if( (status = TIFFSetCompressionScheme(tif, v)) != 0 )
|
||||
td->td_compression = v;
|
||||
td->td_compression = v;
|
||||
break;
|
||||
case TIFFTAG_PHOTOMETRIC:
|
||||
td->td_photometric = (uint16) va_arg(ap, int);
|
||||
@ -350,6 +358,33 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
|
||||
goto badvaluedbl;
|
||||
td->td_stonits = d;
|
||||
break;
|
||||
|
||||
/* Begin Pixar Tags */
|
||||
case TIFFTAG_PIXAR_IMAGEFULLWIDTH:
|
||||
td->td_imagefullwidth = va_arg(ap, uint32);
|
||||
break;
|
||||
case TIFFTAG_PIXAR_IMAGEFULLLENGTH:
|
||||
td->td_imagefulllength = va_arg(ap, uint32);
|
||||
break;
|
||||
case TIFFTAG_PIXAR_TEXTUREFORMAT:
|
||||
_TIFFsetString(&td->td_textureformat, va_arg(ap, char*));
|
||||
break;
|
||||
case TIFFTAG_PIXAR_WRAPMODES:
|
||||
_TIFFsetString(&td->td_wrapmodes, va_arg(ap, char*));
|
||||
break;
|
||||
case TIFFTAG_PIXAR_FOVCOT:
|
||||
td->td_fovcot = (float) va_arg(ap, dblparam_t);
|
||||
break;
|
||||
case TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN:
|
||||
_TIFFsetFloatArray(&td->td_matrixWorldToScreen,
|
||||
va_arg(ap, float*), 16);
|
||||
break;
|
||||
case TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA:
|
||||
_TIFFsetFloatArray(&td->td_matrixWorldToCamera,
|
||||
va_arg(ap, float*), 16);
|
||||
break;
|
||||
/* End Pixar Tags */
|
||||
|
||||
#if SUBIFD_SUPPORT
|
||||
case TIFFTAG_SUBIFD:
|
||||
if ((tif->tif_flags & TIFF_INSUBIFD) == 0) {
|
||||
@ -784,6 +819,30 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
|
||||
*va_arg(ap, void**) = td->td_richtiffiptcData;
|
||||
break;
|
||||
#endif
|
||||
/* Begin Pixar Tags */
|
||||
case TIFFTAG_PIXAR_IMAGEFULLWIDTH:
|
||||
*va_arg(ap, uint32*) = td->td_imagefullwidth;
|
||||
break;
|
||||
case TIFFTAG_PIXAR_IMAGEFULLLENGTH:
|
||||
*va_arg(ap, uint32*) = td->td_imagefulllength;
|
||||
break;
|
||||
case TIFFTAG_PIXAR_TEXTUREFORMAT:
|
||||
*va_arg(ap, char**) = td->td_textureformat;
|
||||
break;
|
||||
case TIFFTAG_PIXAR_WRAPMODES:
|
||||
*va_arg(ap, char**) = td->td_wrapmodes;
|
||||
break;
|
||||
case TIFFTAG_PIXAR_FOVCOT:
|
||||
*va_arg(ap, float*) = td->td_fovcot;
|
||||
break;
|
||||
case TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN:
|
||||
*va_arg(ap, float**) = td->td_matrixWorldToScreen;
|
||||
break;
|
||||
case TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA:
|
||||
*va_arg(ap, float**) = td->td_matrixWorldToCamera;
|
||||
break;
|
||||
/* End Pixar Tags */
|
||||
|
||||
default:
|
||||
/*
|
||||
* This can happen if multiple images are open with
|
||||
@ -889,6 +948,12 @@ TIFFFreeDirectory(TIFF* tif)
|
||||
#endif
|
||||
CleanupField(td_stripoffset);
|
||||
CleanupField(td_stripbytecount);
|
||||
/* Begin Pixar Tags */
|
||||
CleanupField(td_textureformat);
|
||||
CleanupField(td_wrapmodes);
|
||||
CleanupField(td_matrixWorldToScreen);
|
||||
CleanupField(td_matrixWorldToCamera);
|
||||
/* End Pixar Tags */
|
||||
}
|
||||
#undef CleanupField
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.h,v 1.1 1999-07-27 21:50:27 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.h,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -110,6 +110,14 @@ typedef struct {
|
||||
uint32 td_richtiffiptcLength;
|
||||
void *td_richtiffiptcData;
|
||||
#endif
|
||||
/* Begin Pixar Tag values. */
|
||||
uint32 td_imagefullwidth, td_imagefulllength;
|
||||
char* td_textureformat;
|
||||
char* td_wrapmodes;
|
||||
float td_fovcot;
|
||||
float* td_matrixWorldToScreen;
|
||||
float* td_matrixWorldToCamera;
|
||||
/* End Pixar Tag Values. */
|
||||
} TIFFDirectory;
|
||||
|
||||
/*
|
||||
@ -185,8 +193,16 @@ typedef struct {
|
||||
#define FIELD_PHOTOSHOP 52
|
||||
#define FIELD_RICHTIFFIPTC 53
|
||||
#define FIELD_STONITS 54
|
||||
/* Begin PIXAR */
|
||||
#define FIELD_IMAGEFULLWIDTH 55
|
||||
#define FIELD_IMAGEFULLLENGTH 56
|
||||
#define FIELD_TEXTUREFORMAT 57
|
||||
#define FIELD_WRAPMODES 58
|
||||
#define FIELD_FOVCOT 59
|
||||
#define FIELD_MATRIX_WORLDTOSCREEN 60
|
||||
#define FIELD_MATRIX_WORLDTOCAMERA 61
|
||||
/* end of support for well-known tags; codec-private tags follow */
|
||||
#define FIELD_CODEC 55 /* base of codec-private tags */
|
||||
#define FIELD_CODEC 62 /* base of codec-private tags */
|
||||
/*
|
||||
* Pseudo-tags don't normally need field bits since they
|
||||
* are not written to an output file (by definition).
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirinfo.c,v 1.1 1999-07-27 21:50:27 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirinfo.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -237,6 +237,22 @@ static const TIFFFieldInfo tiffFieldInfo[] = {
|
||||
#endif
|
||||
{ TIFFTAG_STONITS, 1, 1, TIFF_DOUBLE, FIELD_STONITS,
|
||||
FALSE, FALSE, "StoNits" },
|
||||
/* begin Pixar tags */
|
||||
{ TIFFTAG_PIXAR_IMAGEFULLWIDTH, 1, 1, TIFF_LONG, FIELD_IMAGEFULLWIDTH,
|
||||
TRUE, FALSE, "ImageFullWidth" },
|
||||
{ TIFFTAG_PIXAR_IMAGEFULLLENGTH, 1, 1, TIFF_LONG, FIELD_IMAGEFULLLENGTH,
|
||||
TRUE, FALSE, "ImageFullLength" },
|
||||
{ TIFFTAG_PIXAR_TEXTUREFORMAT, -1,-1, TIFF_ASCII, FIELD_TEXTUREFORMAT,
|
||||
TRUE, FALSE, "TextureFormat" },
|
||||
{ TIFFTAG_PIXAR_WRAPMODES, -1,-1, TIFF_ASCII, FIELD_WRAPMODES,
|
||||
TRUE, FALSE, "TextureWrapModes" },
|
||||
{ TIFFTAG_PIXAR_FOVCOT, 1, 1, TIFF_FLOAT, FIELD_FOVCOT,
|
||||
TRUE, FALSE, "FieldOfViewCotan" },
|
||||
{ TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN, 16,16, TIFF_FLOAT,
|
||||
FIELD_MATRIX_WORLDTOSCREEN, TRUE, FALSE, "MatrixWorldToScreen" },
|
||||
{ TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA, 16,16, TIFF_FLOAT,
|
||||
FIELD_MATRIX_WORLDTOCAMERA, TRUE, FALSE, "MatrixWorldToCamera" },
|
||||
/* end Pixar tags */
|
||||
};
|
||||
#define N(a) (sizeof (a) / sizeof (a[0]))
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_print.c,v 1.1 1999-07-27 21:50:27 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_print.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -98,6 +98,42 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
|
||||
(u_long) td->td_imagedepth);
|
||||
fprintf(fd, "\n");
|
||||
}
|
||||
|
||||
/* Begin Pixar */
|
||||
if (TIFFFieldSet(tif,FIELD_IMAGEFULLWIDTH) ||
|
||||
TIFFFieldSet(tif,FIELD_IMAGEFULLLENGTH)) {
|
||||
fprintf(fd, " Pixar Full Image Width: %lu Full Image Length: %lu\n",
|
||||
(u_long) td->td_imagefullwidth,
|
||||
(u_long) td->td_imagefulllength);
|
||||
}
|
||||
if (TIFFFieldSet(tif,FIELD_TEXTUREFORMAT))
|
||||
_TIFFprintAsciiTag(fd, "Texture Format", td->td_textureformat);
|
||||
if (TIFFFieldSet(tif,FIELD_WRAPMODES))
|
||||
_TIFFprintAsciiTag(fd, "Texture Wrap Modes", td->td_wrapmodes);
|
||||
if (TIFFFieldSet(tif,FIELD_FOVCOT))
|
||||
fprintf(fd, " Field of View Cotangent: %g\n", td->td_fovcot);
|
||||
if (TIFFFieldSet(tif,FIELD_MATRIX_WORLDTOSCREEN)) {
|
||||
typedef float Matrix[4][4];
|
||||
Matrix* m = (Matrix*)td->td_matrixWorldToScreen;
|
||||
|
||||
fprintf(fd, " Matrix NP:\n\t%g %g %g %g\n\t%g %g %g %g\n\t%g %g %g %g\n\t%g %g %g %g\n",
|
||||
(*m)[0][0], (*m)[0][1], (*m)[0][2], (*m)[0][3],
|
||||
(*m)[1][0], (*m)[1][1], (*m)[1][2], (*m)[1][3],
|
||||
(*m)[2][0], (*m)[2][1], (*m)[2][2], (*m)[2][3],
|
||||
(*m)[3][0], (*m)[3][1], (*m)[3][2], (*m)[3][3]);
|
||||
}
|
||||
if (TIFFFieldSet(tif,FIELD_MATRIX_WORLDTOCAMERA)) {
|
||||
typedef float Matrix[4][4];
|
||||
Matrix* m = (Matrix*)td->td_matrixWorldToCamera;
|
||||
|
||||
fprintf(fd, " Matrix Nl:\n\t%g %g %g %g\n\t%g %g %g %g\n\t%g %g %g %g\n\t%g %g %g %g\n",
|
||||
(*m)[0][0], (*m)[0][1], (*m)[0][2], (*m)[0][3],
|
||||
(*m)[1][0], (*m)[1][1], (*m)[1][2], (*m)[1][3],
|
||||
(*m)[2][0], (*m)[2][1], (*m)[2][2], (*m)[2][3],
|
||||
(*m)[3][0], (*m)[3][1], (*m)[3][2], (*m)[3][3]);
|
||||
}
|
||||
/* End Pixar */
|
||||
|
||||
if (TIFFFieldSet(tif,FIELD_TILEDIMENSIONS)) {
|
||||
fprintf(fd, " Tile Width: %lu Tile Length: %lu",
|
||||
(u_long) td->td_tilewidth, (u_long) td->td_tilelength);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiff.h,v 1.3 1999-12-07 17:11:38 mwelles Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiff.h,v 1.4 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -151,7 +151,7 @@ typedef enum {
|
||||
#define COMPRESSION_CCITTRLE 2 /* CCITT modified Huffman RLE */
|
||||
#define COMPRESSION_CCITTFAX3 3 /* CCITT Group 3 fax encoding */
|
||||
#define COMPRESSION_CCITTFAX4 4 /* CCITT Group 4 fax encoding */
|
||||
#define COMPRESSION_LZW 5 /* Lempel-Ziv & Welch */
|
||||
#define COMPRESSION_LZW 5 /* Lempel-Ziv & Welch */
|
||||
#define COMPRESSION_OJPEG 6 /* !6.0 JPEG */
|
||||
#define COMPRESSION_JPEG 7 /* %JPEG DCT compression */
|
||||
#define COMPRESSION_NEXT 32766 /* NeXT 2-bit RLE */
|
||||
@ -326,6 +326,14 @@ typedef enum {
|
||||
*/
|
||||
#define TIFFTAG_PIXAR_IMAGEFULLWIDTH 33300 /* full image size in x */
|
||||
#define TIFFTAG_PIXAR_IMAGEFULLLENGTH 33301 /* full image size in y */
|
||||
/* Tags 33302-33306 are used to identify special image modes and data
|
||||
* used by Pixar's texture formats.
|
||||
*/
|
||||
#define TIFFTAG_PIXAR_TEXTUREFORMAT 33302 /* texture map format */
|
||||
#define TIFFTAG_PIXAR_WRAPMODES 33303 /* s & t wrap modes */
|
||||
#define TIFFTAG_PIXAR_FOVCOT 33304 /* cotan(fov) for env. maps */
|
||||
#define TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN 33305
|
||||
#define TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA 33306
|
||||
/* tag 33405 is a private tag registered to Eastman Kodak */
|
||||
#define TIFFTAG_WRITERSERIALNUMBER 33405 /* device serial number */
|
||||
/* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/gif2tiff.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/gif2tiff.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990-1997 Sam Leffler
|
||||
@ -70,6 +70,7 @@ char* stuff[] = {
|
||||
" -r # make each strip have no more than # rows",
|
||||
"",
|
||||
" -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding",
|
||||
" (no longer supported due to Unisys patent enforcement)",
|
||||
" -c zip[:opts] compress output with deflate encoding",
|
||||
" -c packbits compress output with packbits encoding",
|
||||
" -c none use no compression algorithm on output",
|
||||
@ -113,7 +114,7 @@ unsigned short green[COLSIZE];
|
||||
unsigned short blue[COLSIZE];
|
||||
char *filename, *imagename;
|
||||
|
||||
static uint16 compression = COMPRESSION_LZW;
|
||||
static uint16 compression = COMPRESSION_PACKBITS;
|
||||
static uint16 predictor = 0;
|
||||
static uint32 rowsperstrip = (uint32) -1;
|
||||
static int processCompressOptions(char*);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/pal2rgb.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/pal2rgb.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -362,6 +362,7 @@ char* stuff[] = {
|
||||
" -C 16 assume 16-bit colormap values",
|
||||
"",
|
||||
" -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding",
|
||||
" (no longer supported due to Unisys patent enforcement)",
|
||||
" -c zip[:opts] compress output with deflate encoding",
|
||||
" -c packbits compress output with packbits encoding",
|
||||
" -c none use no compression algorithm on output",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/ppm2tiff.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/ppm2tiff.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991-1997 Sam Leffler
|
||||
@ -40,7 +40,7 @@
|
||||
#define streq(a,b) (strcmp(a,b) == 0)
|
||||
#define strneq(a,b,n) (strncmp(a,b,n) == 0)
|
||||
|
||||
static uint16 compression = COMPRESSION_LZW;
|
||||
static uint16 compression = COMPRESSION_PACKBITS;
|
||||
static uint16 predictor = 0;
|
||||
static int quality = 75; /* JPEG quality */
|
||||
static int jpegcolormode = JPEGCOLORMODE_RGB;
|
||||
@ -215,6 +215,7 @@ char* stuff[] = {
|
||||
"",
|
||||
" -c jpeg[:opts] compress output with JPEG encoding",
|
||||
" -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding",
|
||||
" (no longer supported due to Unisys patent enforcement)",
|
||||
" -c zip[:opts] compress output with deflate encoding",
|
||||
" -c packbits compress output with packbits encoding",
|
||||
" -c none use no compression algorithm on output",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/ras2tiff.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/ras2tiff.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -236,6 +236,7 @@ char* stuff[] = {
|
||||
" -r # make each strip have no more than # rows",
|
||||
"",
|
||||
" -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding",
|
||||
" (no longer supported due to Unisys patent enforcement)",
|
||||
" -c zip[:opts] compress output with deflate encoding",
|
||||
" -c jpeg[:opts]compress output with JPEG encoding",
|
||||
" -c packbits compress output with packbits encoding",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/rgb2ycbcr.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/rgb2ycbcr.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991-1997 Sam Leffler
|
||||
@ -43,7 +43,7 @@
|
||||
#define LumaGreen ycbcrCoeffs[1]
|
||||
#define LumaBlue ycbcrCoeffs[2]
|
||||
|
||||
uint16 compression = COMPRESSION_LZW;
|
||||
uint16 compression = COMPRESSION_PACKBITS;
|
||||
uint32 rowsperstrip = (uint32) -1;
|
||||
|
||||
uint16 horizSubSampling = 2; /* YCbCr horizontal subsampling */
|
||||
@ -321,6 +321,7 @@ static char* usageMsg[] = {
|
||||
"where comp is one of the following compression algorithms:\n",
|
||||
" jpeg\t\tJPEG encoding\n",
|
||||
" lzw\t\tLempel-Ziv & Welch encoding\n",
|
||||
" (lzw no longer supported due to Unisys patent enforcement)",
|
||||
" packbits\tPackBits encoding\n",
|
||||
" none\t\tno compression\n",
|
||||
"and the other options are:\n",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/sgi2tiff.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/sgi2tiff.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991-1997 Sam Leffler
|
||||
@ -36,7 +36,7 @@
|
||||
#define strneq(a,b,n) (strncmp(a,b,n) == 0)
|
||||
|
||||
static short config = PLANARCONFIG_CONTIG;
|
||||
static uint16 compression = COMPRESSION_LZW;
|
||||
static uint16 compression = COMPRESSION_PACKBITS;
|
||||
static uint16 predictor = 0;
|
||||
static uint16 fillorder = 0;
|
||||
static uint32 rowsperstrip = (uint32) -1;
|
||||
@ -292,6 +292,7 @@ char* stuff[] = {
|
||||
" -f msb2lsb force msb-to-lsb FillOrder for output",
|
||||
"",
|
||||
" -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding",
|
||||
" (no longer supported due to Unisys patent enforcement)",
|
||||
" -c zip[:opts] compress output with deflate encoding",
|
||||
" -c jpeg[:opts]compress output with JPEG encoding",
|
||||
" -c packbits compress output with packbits encoding",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/sgisv.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/sgisv.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990-1997 Sam Leffler
|
||||
@ -40,7 +40,7 @@ typedef unsigned long u_long;
|
||||
#define strneq(a,b,n) (strncmp(a,b,n) == 0)
|
||||
|
||||
uint32 rowsperstrip = (uint32) -1;
|
||||
uint16 compression = COMPRESSION_LZW;
|
||||
uint16 compression = COMPRESSION_PACKBITS;
|
||||
uint16 config = PLANARCONFIG_CONTIG;
|
||||
uint16 predictor = 0;
|
||||
int xmaxscreen;
|
||||
@ -124,6 +124,7 @@ char* stuff[] = {
|
||||
" -r # make each strip have no more than # rows",
|
||||
"",
|
||||
" -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding",
|
||||
" (no longer supported due to Unisys patent enforcement)",
|
||||
" -c jpeg[:opts]compress output with JPEG encoding",
|
||||
" -c packbits compress output with packbits encoding",
|
||||
" -c none use no compression algorithm on output",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiff2bw.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiff2bw.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -375,6 +375,7 @@ char* stuff[] = {
|
||||
" -r # make each strip have no more than # rows",
|
||||
"",
|
||||
" -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding",
|
||||
" (no longer supported due to Unisys patent enforcement)",
|
||||
" -c zip[:opts] compress output with deflate encoding",
|
||||
" -c packbits compress output with packbits encoding",
|
||||
" -c g3[:opts] compress output with CCITT Group 3 encoding",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiffcp.c,v 1.2 1999-08-16 18:27:51 warmerda Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiffcp.c,v 1.3 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -265,6 +265,7 @@ char* stuff[] = {
|
||||
" -f msb2lsb force msb-to-lsb FillOrder for output",
|
||||
"",
|
||||
" -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding",
|
||||
" (no longer supported due to Unisys patent enforcement)",
|
||||
" -c zip[:opts] compress output with deflate encoding",
|
||||
" -c jpeg[:opts]compress output with JPEG encoding",
|
||||
" -c packbits compress output with packbits encoding",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiffdither.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiffdither.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988-1997 Sam Leffler
|
||||
@ -128,7 +128,7 @@ fsdither(TIFF* in, TIFF* out)
|
||||
_TIFFfree(outline);
|
||||
}
|
||||
|
||||
static uint16 compression = COMPRESSION_LZW;
|
||||
static uint16 compression = COMPRESSION_PACKBITS;
|
||||
static uint16 predictor = 0;
|
||||
static uint32 group3options = 0;
|
||||
|
||||
@ -282,6 +282,7 @@ char* stuff[] = {
|
||||
" -f lsb2msb force lsb-to-msb FillOrder for output",
|
||||
" -f msb2lsb force msb-to-lsb FillOrder for output",
|
||||
" -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding",
|
||||
" (no longer supported due to Unisys patent enforcement)",
|
||||
" -c zip[:opts] compress output with deflate encoding",
|
||||
" -c packbits compress output with packbits encoding",
|
||||
" -c g3[:opts] compress output with CCITT Group 3 encoding",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiffmedian.c,v 1.1 1999-07-27 21:50:28 mike Exp $ */
|
||||
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiffmedian.c,v 1.2 1999-12-21 17:03:03 mwelles Exp $ */
|
||||
|
||||
/*
|
||||
* Apply median cut on an image.
|
||||
@ -6,7 +6,8 @@
|
||||
* tiffmedian [-c n] [-f] input output
|
||||
* -C n - set colortable size. Default is 256.
|
||||
* -f - use Floyd-Steinberg dithering.
|
||||
* -c lzw - compress output with LZW
|
||||
* -c lzw - compress output with LZW
|
||||
* (no longer supported due to unisys patent enforcement)
|
||||
* -c none - use no compression on output
|
||||
* -c packbits - use packbits compression on output
|
||||
* -r n - create output with n rows/strip of data
|
||||
@ -313,6 +314,7 @@ char* stuff[] = {
|
||||
" -C # create a colormap with # entries",
|
||||
" -f use Floyd-Steinberg dithering",
|
||||
" -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding",
|
||||
" (no longer supported due to Unisys patent enforcement)",
|
||||
" -c zip[:opts] compress output with deflate encoding",
|
||||
" -c packbits compress output with packbits encoding",
|
||||
" -c none use no compression algorithm on output",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user