From 094535c010320967639e8e86f974d878e80baa72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Fri, 1 May 2015 16:13:57 +0200
Subject: Imported Upstream version 1.7.0

---
 imdi/Jamfile    |  7 ++++---
 imdi/cctiff.c   | 10 +++++++++-
 imdi/greytiff.c |  1 +
 imdi/itest.c    |  1 +
 4 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'imdi')

diff --git a/imdi/Jamfile b/imdi/Jamfile
index a2b3796..79b27fb 100644
--- a/imdi/Jamfile
+++ b/imdi/Jamfile
@@ -50,10 +50,11 @@ HDRS += ../icc ../rspl ../gamut ../cgats ../spectro ;
 LINKLIBS = $(LINKLIBS) libimdi ../icc/libicc ../numlib/libnum ;
 
 # imdi test code
-Main itest : itest.c refi.c : : : ../rspl : : ../rspl/librspl ../plot/libvrml ;
+Main itest : itest.c refi.c : : : ../rspl : : ../rspl/librspl ../plot/libplot
+                                              ../plot/libvrml ../numlib/libui ;
 
 # TIFF file color correction utlity
-Main cctiff : cctiff.c : : : ../xicc $(TIFFINC) $(JPEGINC) : : ../xicc/libxicc ../rspl/librspl ../cgats/libcgats ../plot/libvrml $(TIFFLIB) $(JPEGLIB) ;
+Main cctiff : cctiff.c : : : ../xicc $(TIFFINC) $(JPEGINC) : : ../xicc/libxicc ../rspl/librspl ../cgats/libcgats ../plot/libplot ../plot/libvrml ../numlib/libui $(TIFFLIB) $(JPEGLIB) ;
 
 # Old TIFF file color correction utlity
 #Main cctiffo : cctiffo.c : : : $(TIFFINC) : : $(TIFFLIB) ;
@@ -62,7 +63,7 @@ Main cctiff : cctiff.c : : : ../xicc $(TIFFINC) $(JPEGINC) : : ../xicc/libxicc .
 #Main greytiff : greytiff.c ;
 Main greytiff : greytiff.c : : : ../spectro ../xicc ../gamut ../rspl ../cgats $(TIFFINC)
               : : ../xicc/libxicc ../gamut/libgamut ../rspl/librspl ../cgats/libcgats
-                  ../plot/libplot ../plot/libvrml $(TIFFLIB) $(JPEGLIB) ;
+                  ../plot/libplot ../plot/libvrml ../numlib/libui $(TIFFLIB) $(JPEGLIB) ;
 
 # ssort generation code
 #Main ssort : ssort.c ;
diff --git a/imdi/cctiff.c b/imdi/cctiff.c
index bb6ee0d..6c6f64f 100644
--- a/imdi/cctiff.c
+++ b/imdi/cctiff.c
@@ -17,6 +17,10 @@
 
 /* TTBD:
 
+	Add dithered 8 bit output mode. Generate 16 bit
+	internally, then apply screening down to 8 bits
+	Use render/thrscreen to do the hard work.
+
 	Should special case jpeg noop used to embed profile
 	in output, using jpeg_read_coefficients()/jpeg_write_coefficients()
 	rather than jpeg_start_decompress(), jpeg_read_scanlines() etc.
@@ -92,6 +96,7 @@
 #include "icc.h"
 #include "xicc.h"
 #include "imdi.h"
+#include "ui.h"
 
 #undef DEBUG		/* Print detailed debug info */
 
@@ -1711,12 +1716,15 @@ main(int argc, char *argv[]) {
 		} else {
 
 			if (wphotometric == PHOTOMETRIC_SEPARATED) {
-				icc *c = su.profs[su.lclut].c; 
+				icc *c = NULL;
 				icmColorantTable *ct;
 				int iset;
 				int inlen;
 				char *inames = NULL;
 
+				if (su.lclut >= 0 && su.lclut < su.nprofs)
+					c = su.profs[su.lclut].c; 
+ 
 				iset = ColorSpaceSignature2TiffInkset(su.outs, &inlen, &inames);
 
 				/* Use ICC profile ink names if they are available */
diff --git a/imdi/greytiff.c b/imdi/greytiff.c
index af52013..bcc7553 100644
--- a/imdi/greytiff.c
+++ b/imdi/greytiff.c
@@ -42,6 +42,7 @@
 #include "numlib.h"
 #include "xicc.h"
 #include "imdi.h"
+#include "ui.h"
 
 #undef DO_CHECK		/* Do floating point check */
 
diff --git a/imdi/itest.c b/imdi/itest.c
index 8edcb8b..515d2b1 100644
--- a/imdi/itest.c
+++ b/imdi/itest.c
@@ -16,6 +16,7 @@
 #include "numlib.h"
 #include "imdi.h"
 #include "refi.h"
+#include "ui.h"
 
 /* Test parameters */
 #undef TEST1					/* Test just one combination */
-- 
cgit v1.2.3