From c0b89ac5bfb90835ef01573267020e42d4fe070c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 23 Aug 2015 12:17:05 +0200 Subject: Imported Upstream version 1.8.0 --- imdi/Jamfile | 0 imdi/License.txt | 0 imdi/Makefile | 0 imdi/Makefile.OSX | 0 imdi/Makefile.UNIX | 0 imdi/Makefile.WNT | 0 imdi/Readme.txt | 0 imdi/afiles | 0 imdi/cctiff.c | 13 ++++++++++++- imdi/cctiffo.c | 0 imdi/cgen.c | 0 imdi/ctest.c | 0 imdi/greytiff.c | 0 imdi/imdi.c | 0 imdi/imdi.h | 0 imdi/imdi_arch.h | 0 imdi/imdi_gen.c | 0 imdi/imdi_gen.h | 0 imdi/imdi_make.c | 0 imdi/imdi_tab.c | 0 imdi/imdi_tab.h | 0 imdi/imdi_utl.h | 0 imdi/itest.c | 0 imdi/refi.c | 0 imdi/refi.h | 0 imdi/ssort.c | 0 26 files changed, 12 insertions(+), 1 deletion(-) mode change 100644 => 100755 imdi/Jamfile mode change 100644 => 100755 imdi/License.txt mode change 100644 => 100755 imdi/Makefile mode change 100644 => 100755 imdi/Makefile.OSX mode change 100644 => 100755 imdi/Makefile.UNIX mode change 100644 => 100755 imdi/Makefile.WNT mode change 100644 => 100755 imdi/Readme.txt mode change 100644 => 100755 imdi/afiles mode change 100644 => 100755 imdi/cctiff.c mode change 100644 => 100755 imdi/cctiffo.c mode change 100644 => 100755 imdi/cgen.c mode change 100644 => 100755 imdi/ctest.c mode change 100644 => 100755 imdi/greytiff.c mode change 100644 => 100755 imdi/imdi.c mode change 100644 => 100755 imdi/imdi.h mode change 100644 => 100755 imdi/imdi_arch.h mode change 100644 => 100755 imdi/imdi_gen.c mode change 100644 => 100755 imdi/imdi_gen.h mode change 100644 => 100755 imdi/imdi_make.c mode change 100644 => 100755 imdi/imdi_tab.c mode change 100644 => 100755 imdi/imdi_tab.h mode change 100644 => 100755 imdi/imdi_utl.h mode change 100644 => 100755 imdi/itest.c mode change 100644 => 100755 imdi/refi.c mode change 100644 => 100755 imdi/refi.h mode change 100644 => 100755 imdi/ssort.c (limited to 'imdi') diff --git a/imdi/Jamfile b/imdi/Jamfile old mode 100644 new mode 100755 diff --git a/imdi/License.txt b/imdi/License.txt old mode 100644 new mode 100755 diff --git a/imdi/Makefile b/imdi/Makefile old mode 100644 new mode 100755 diff --git a/imdi/Makefile.OSX b/imdi/Makefile.OSX old mode 100644 new mode 100755 diff --git a/imdi/Makefile.UNIX b/imdi/Makefile.UNIX old mode 100644 new mode 100755 diff --git a/imdi/Makefile.WNT b/imdi/Makefile.WNT old mode 100644 new mode 100755 diff --git a/imdi/Readme.txt b/imdi/Readme.txt old mode 100644 new mode 100755 diff --git a/imdi/afiles b/imdi/afiles old mode 100644 new mode 100755 diff --git a/imdi/cctiff.c b/imdi/cctiff.c old mode 100644 new mode 100755 index 6c6f64f..32dc5e8 --- 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 old mode 100644 new mode 100755 diff --git a/imdi/cgen.c b/imdi/cgen.c old mode 100644 new mode 100755 diff --git a/imdi/ctest.c b/imdi/ctest.c old mode 100644 new mode 100755 diff --git a/imdi/greytiff.c b/imdi/greytiff.c old mode 100644 new mode 100755 diff --git a/imdi/imdi.c b/imdi/imdi.c old mode 100644 new mode 100755 diff --git a/imdi/imdi.h b/imdi/imdi.h old mode 100644 new mode 100755 diff --git a/imdi/imdi_arch.h b/imdi/imdi_arch.h old mode 100644 new mode 100755 diff --git a/imdi/imdi_gen.c b/imdi/imdi_gen.c old mode 100644 new mode 100755 diff --git a/imdi/imdi_gen.h b/imdi/imdi_gen.h old mode 100644 new mode 100755 diff --git a/imdi/imdi_make.c b/imdi/imdi_make.c old mode 100644 new mode 100755 diff --git a/imdi/imdi_tab.c b/imdi/imdi_tab.c old mode 100644 new mode 100755 diff --git a/imdi/imdi_tab.h b/imdi/imdi_tab.h old mode 100644 new mode 100755 diff --git a/imdi/imdi_utl.h b/imdi/imdi_utl.h old mode 100644 new mode 100755 diff --git a/imdi/itest.c b/imdi/itest.c old mode 100644 new mode 100755 diff --git a/imdi/refi.c b/imdi/refi.c old mode 100644 new mode 100755 diff --git a/imdi/refi.h b/imdi/refi.h old mode 100644 new mode 100755 diff --git a/imdi/ssort.c b/imdi/ssort.c old mode 100644 new mode 100755 -- cgit v1.2.3