diff options
Diffstat (limited to 'imdi')
-rwxr-xr-x[-rw-r--r--] | imdi/Jamfile | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/License.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/Makefile | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/Makefile.OSX | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/Makefile.UNIX | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/Makefile.WNT | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/Readme.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/afiles | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/cctiff.c | 13 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/cctiffo.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/cgen.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/ctest.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/greytiff.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/imdi.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/imdi.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/imdi_arch.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/imdi_gen.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/imdi_gen.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/imdi_make.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/imdi_tab.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/imdi_tab.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/imdi_utl.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/itest.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/refi.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/refi.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | imdi/ssort.c | 0 |
26 files changed, 12 insertions, 1 deletions
diff --git a/imdi/Jamfile b/imdi/Jamfile index 79b27fb..79b27fb 100644..100755 --- a/imdi/Jamfile +++ b/imdi/Jamfile diff --git a/imdi/License.txt b/imdi/License.txt index a871fcf..a871fcf 100644..100755 --- a/imdi/License.txt +++ b/imdi/License.txt diff --git a/imdi/Makefile b/imdi/Makefile index 5523893..5523893 100644..100755 --- a/imdi/Makefile +++ b/imdi/Makefile diff --git a/imdi/Makefile.OSX b/imdi/Makefile.OSX index 1e03a43..1e03a43 100644..100755 --- a/imdi/Makefile.OSX +++ b/imdi/Makefile.OSX diff --git a/imdi/Makefile.UNIX b/imdi/Makefile.UNIX index 37aab1a..37aab1a 100644..100755 --- a/imdi/Makefile.UNIX +++ b/imdi/Makefile.UNIX diff --git a/imdi/Makefile.WNT b/imdi/Makefile.WNT index 601e1f6..601e1f6 100644..100755 --- a/imdi/Makefile.WNT +++ b/imdi/Makefile.WNT diff --git a/imdi/Readme.txt b/imdi/Readme.txt index a12d649..a12d649 100644..100755 --- a/imdi/Readme.txt +++ b/imdi/Readme.txt diff --git a/imdi/afiles b/imdi/afiles index 81f6220..81f6220 100644..100755 --- a/imdi/afiles +++ b/imdi/afiles diff --git a/imdi/cctiff.c b/imdi/cctiff.c index 6c6f64f..32dc5e8 100644..100755 --- a/imdi/cctiff.c +++ b/imdi/cctiff.c @@ -130,6 +130,7 @@ void usage(char *diag, ...) { fprintf(stderr," -a Read and Write planes > 4 as alpha planes\n"); fprintf(stderr," -I Ignore any file or profile colorspace mismatches\n"); fprintf(stderr," -D Don't append or set the output TIFF or JPEG description\n"); + fprintf(stderr," -N Output uncompressed TIFF (default LZW)\n"); fprintf(stderr," -e profile.[%s | tiff | jpg] Optionally embed a profile in the destination TIFF or JPEG file.\n",ICC_FILE_EXT_ND); fprintf(stderr,"\n"); fprintf(stderr," Then for each profile in sequence:\n"); @@ -664,6 +665,7 @@ struct _profinfo { typedef struct { /* Overall parameters */ int verb; /* Non-zero if verbose */ + int compr; /* NZ to use TIFF LZW */ icColorSpaceSignature ins, outs; /* Input/Output spaces */ int iinv, oinv; /* Space inversion */ int id, od, md; /* Input/Output dimensions and max(id,od) */ @@ -1043,6 +1045,7 @@ main(int argc, char *argv[]) { /* Set defaults */ memset((void *)&su, 0, sizeof(sucntx)); + su.compr = 1; /* TIFF LZW by default */ next_intent = icmDefaultIntent; next_func = icmFwd; next_order = icmLuOrdNorm; @@ -1213,6 +1216,10 @@ main(int argc, char *argv[]) { else if (argv[fa][1] == 'D') nodesc = 1; + else if (argv[fa][1] == 'N') + su.compr = 0; + + /* Verbosity */ else if (argv[fa][1] == 'v' || argv[fa][1] == 'V') { su.verb = 1; @@ -1655,7 +1662,11 @@ main(int argc, char *argv[]) { TIFFSetField(wh, TIFFTAG_BITSPERSAMPLE, bitspersample); TIFFSetField(wh, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - TIFFSetField(wh, TIFFTAG_COMPRESSION, COMPRESSION_NONE); + if (su.compr) + TIFFSetField(wh, TIFFTAG_COMPRESSION, COMPRESSION_LZW); + else + TIFFSetField(wh, TIFFTAG_COMPRESSION, COMPRESSION_NONE); + if (resunits) { TIFFSetField(wh, TIFFTAG_RESOLUTIONUNIT, resunits); TIFFSetField(wh, TIFFTAG_XRESOLUTION, resx); diff --git a/imdi/cctiffo.c b/imdi/cctiffo.c index c155e03..c155e03 100644..100755 --- a/imdi/cctiffo.c +++ b/imdi/cctiffo.c diff --git a/imdi/cgen.c b/imdi/cgen.c index b186dd6..b186dd6 100644..100755 --- a/imdi/cgen.c +++ b/imdi/cgen.c diff --git a/imdi/ctest.c b/imdi/ctest.c index caf0692..caf0692 100644..100755 --- a/imdi/ctest.c +++ b/imdi/ctest.c diff --git a/imdi/greytiff.c b/imdi/greytiff.c index bcc7553..bcc7553 100644..100755 --- a/imdi/greytiff.c +++ b/imdi/greytiff.c diff --git a/imdi/imdi.c b/imdi/imdi.c index 8174c8e..8174c8e 100644..100755 --- a/imdi/imdi.c +++ b/imdi/imdi.c diff --git a/imdi/imdi.h b/imdi/imdi.h index 1e72b8c..1e72b8c 100644..100755 --- a/imdi/imdi.h +++ b/imdi/imdi.h diff --git a/imdi/imdi_arch.h b/imdi/imdi_arch.h index afceb73..afceb73 100644..100755 --- a/imdi/imdi_arch.h +++ b/imdi/imdi_arch.h diff --git a/imdi/imdi_gen.c b/imdi/imdi_gen.c index ab17ad3..ab17ad3 100644..100755 --- a/imdi/imdi_gen.c +++ b/imdi/imdi_gen.c diff --git a/imdi/imdi_gen.h b/imdi/imdi_gen.h index 8a7ced9..8a7ced9 100644..100755 --- a/imdi/imdi_gen.h +++ b/imdi/imdi_gen.h diff --git a/imdi/imdi_make.c b/imdi/imdi_make.c index 7990f53..7990f53 100644..100755 --- a/imdi/imdi_make.c +++ b/imdi/imdi_make.c diff --git a/imdi/imdi_tab.c b/imdi/imdi_tab.c index 4f448f0..4f448f0 100644..100755 --- a/imdi/imdi_tab.c +++ b/imdi/imdi_tab.c diff --git a/imdi/imdi_tab.h b/imdi/imdi_tab.h index 403fcaa..403fcaa 100644..100755 --- a/imdi/imdi_tab.h +++ b/imdi/imdi_tab.h diff --git a/imdi/imdi_utl.h b/imdi/imdi_utl.h index f1a3ff5..f1a3ff5 100644..100755 --- a/imdi/imdi_utl.h +++ b/imdi/imdi_utl.h diff --git a/imdi/itest.c b/imdi/itest.c index 515d2b1..515d2b1 100644..100755 --- a/imdi/itest.c +++ b/imdi/itest.c diff --git a/imdi/refi.c b/imdi/refi.c index 55fe449..55fe449 100644..100755 --- a/imdi/refi.c +++ b/imdi/refi.c diff --git a/imdi/refi.h b/imdi/refi.h index 26570c4..26570c4 100644..100755 --- a/imdi/refi.h +++ b/imdi/refi.h diff --git a/imdi/ssort.c b/imdi/ssort.c index f9a25fd..f9a25fd 100644..100755 --- a/imdi/ssort.c +++ b/imdi/ssort.c |