Merge lp:~noskcaj/ubuntu/trusty/argyll/merge into lp:ubuntu/trusty/argyll

[Jackson Doak]

Merge from debian

[Michael Terry (mterry)]

Looks good, except that drop-usb-db.patch isn't droppable. The patched file moved to usb/55-Argyll.rules, but it's still there.

review: Needs Fixing

[Jackson Doak (noskcaj)]

Is there any chance you could check the patch? I don't know how it works
and it no longer applies even with the different target

On Wed, Jan 15, 2014 at 3:03 AM, Michael Terry
<email address hidden>wrote:

> Review: Needs Fixing
>
> Looks good, except that drop-usb-db.patch isn't droppable. The patched
> file moved to usb/55-Argyll.rules, but it's still there.
> --
>
> https://code.launchpad.net/~noskcaj/ubuntu/trusty/argyll/merge/+merge/199879
> You are the owner of lp:~noskcaj/ubuntu/trusty/argyll/merge.
>

Unmerged revisions

29. By Jackson Doak on 2013-12-20

* Merge from debian. Remaining changes:
  - drop obsolete consolekit Recommends
  - Build-depend on libtiff-dev rather than libtiff4-dev
  - 06_fix_udev_rule.patch: Fix udev rules to actually work;
    ENV{ACL_MANAGE} has stopped working ages ago, and with logind
    it's now the "uaccess" tag.
* Drop 05_ftbfs-underlinkage.diff, not needed
* Drop drop-usb-db.patch, fixed in debian

28. By Jackson Doak on 2013-12-20

Merging shared upstream rev into target branch.

=== removed directory '.pc/01_autotools-support.diff'
=== removed file '.pc/01_autotools-support.diff/Makefile.am'
=== removed file '.pc/01_autotools-support.diff/Makefile.shared'
=== removed file '.pc/01_autotools-support.diff/aclocal.m4'
=== removed directory '.pc/01_autotools-support.diff/cgats'
=== removed file '.pc/01_autotools-support.diff/cgats/Makefile.am'
=== removed file '.pc/01_autotools-support.diff/config.guess'
=== removed file '.pc/01_autotools-support.diff/config.h.in'
=== removed file '.pc/01_autotools-support.diff/config.sub'
=== removed file '.pc/01_autotools-support.diff/configure'
=== removed file '.pc/01_autotools-support.diff/configure.ac'
=== removed file '.pc/01_autotools-support.diff/depcomp'
=== removed directory '.pc/01_autotools-support.diff/doc'
=== removed file '.pc/01_autotools-support.diff/doc/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/gamut'
=== removed file '.pc/01_autotools-support.diff/gamut/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/h'
=== removed file '.pc/01_autotools-support.diff/h/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/icc'
=== removed file '.pc/01_autotools-support.diff/icc/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/imdi'
=== removed file '.pc/01_autotools-support.diff/imdi/Makefile.am'
=== removed file '.pc/01_autotools-support.diff/imdi/imdi_k.h'
=== removed file '.pc/01_autotools-support.diff/install-sh'
=== removed directory '.pc/01_autotools-support.diff/jcnf'
=== removed file '.pc/01_autotools-support.diff/jcnf/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/jcnf/yajl'
=== removed file '.pc/01_autotools-support.diff/jcnf/yajl/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/link'
=== removed file '.pc/01_autotools-support.diff/link/Makefile.am'
=== removed file '.pc/01_autotools-support.diff/ltmain.sh'
=== removed directory '.pc/01_autotools-support.diff/m4'
=== removed file '.pc/01_autotools-support.diff/m4/libtool.m4'
=== removed file '.pc/01_autotools-support.diff/m4/ltoptions.m4'
=== removed file '.pc/01_autotools-support.diff/m4/ltsugar.m4'
=== removed file '.pc/01_autotools-support.diff/m4/ltversion.m4'
=== removed file '.pc/01_autotools-support.diff/m4/lt~obsolete.m4'
=== removed file '.pc/01_autotools-support.diff/missing'
=== removed directory '.pc/01_autotools-support.diff/numlib'
=== removed file '.pc/01_autotools-support.diff/numlib/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/plot'
=== removed file '.pc/01_autotools-support.diff/plot/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/profile'
=== removed file '.pc/01_autotools-support.diff/profile/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/ref'
=== removed file '.pc/01_autotools-support.diff/ref/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/render'
=== removed file '.pc/01_autotools-support.diff/render/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/rspl'
=== removed file '.pc/01_autotools-support.diff/rspl/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/scanin'
=== removed file '.pc/01_autotools-support.diff/scanin/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/spectro'
=== removed file '.pc/01_autotools-support.diff/spectro/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/target'
=== removed file '.pc/01_autotools-support.diff/target/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/tweak'
=== removed file '.pc/01_autotools-support.diff/tweak/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/ucmm'
=== removed file '.pc/01_autotools-support.diff/ucmm/Makefile.am'
=== removed directory '.pc/01_autotools-support.diff/xicc'
=== removed file '.pc/01_autotools-support.diff/xicc/Makefile.am'
=== removed directory '.pc/02_firmware-package-builder.diff'
=== removed directory '.pc/02_firmware-package-builder.diff/firmware-package-builder'
=== removed directory '.pc/02_firmware-package-builder.diff/firmware-package-builder/argyll-firmware-spyder2'
=== removed directory '.pc/02_firmware-package-builder.diff/firmware-package-builder/argyll-firmware-spyder2/debian'
=== removed file '.pc/02_firmware-package-builder.diff/firmware-package-builder/argyll-firmware-spyder2/debian/changelog'
=== removed file '.pc/02_firmware-package-builder.diff/firmware-package-builder/argyll-firmware-spyder2/debian/compat'
=== removed file '.pc/02_firmware-package-builder.diff/firmware-package-builder/argyll-firmware-spyder2/debian/control'
=== removed file '.pc/02_firmware-package-builder.diff/firmware-package-builder/argyll-firmware-spyder2/debian/copyright'
=== removed file '.pc/02_firmware-package-builder.diff/firmware-package-builder/argyll-firmware-spyder2/debian/install'
=== removed file '.pc/02_firmware-package-builder.diff/firmware-package-builder/argyll-firmware-spyder2/debian/rules'
=== removed directory '.pc/03_kfreebsd.diff'
=== removed directory '.pc/03_kfreebsd.diff/spectro'
=== removed file '.pc/03_kfreebsd.diff/spectro/usbio.c'
--- .pc/03_kfreebsd.diff/spectro/usbio.c	2012-04-24 07:49:03 +0000
+++ .pc/03_kfreebsd.diff/spectro/usbio.c	1970-01-01 00:00:00 +0000
@@ -1,1806 +0,0 @@
-
- /* General USB I/O support */
-
-/* 
- * Argyll Color Correction System
- *
- * Author: Graeme W. Gill
- * Date:   2006/22/4
- *
- * Copyright 2006 - 2010 Graeme W. Gill
- * All rights reserved.
- *
- * This material is licenced under the GNU GENERAL PUBLIC LICENSE Version 2 or later :-
- * see the License2.txt file for licencing details.
- */
-
-/* These routines supliement the class code in ntio.c and unixio.c */
-/* with common and USB specific routines */
-/* Rename to icoms.c ?? */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <signal.h>
-#if defined(UNIX)
-#include <termios.h>
-#include <errno.h>
-#include <unistd.h>
-#endif
-#ifndef SALONEINSTLIB
-#include "copyright.h"
-#include "aconfig.h"
-#endif
-#include "numsup.h"
-#include "xspect.h"
-#include "insttypes.h"
-#include "icoms.h"
-#include "conv.h"
-#include "usbio.h"
-#include "hidio.h"
-
-#ifdef USE_LIBUSB1
-# include "libusb.h"
-#else
-# include "usb.h"
-#endif
-
-#ifdef ENABLE_USB
-
-/* To simplify error messages: */
-#ifdef USE_LIBUSB1
-# define USB_STRERROR(RV) libusb_strerror(RV)
-#else
-# define USB_STRERROR(RV) usb_strerror()
-#endif
-
-/* Check a USB Vendor and product ID, and add the device */
-/* to the icoms path if it is supported. Return nz if it was added. */
-static int usb_check_and_add(
-struct _icoms *p,
-struct usb_device *dev
-) {
-	instType itype;
-	struct usb_device_descriptor descriptor;
-
-#ifdef USE_LIBUSB1
-	if (libusb_get_device_descriptor(dev, &descriptor) != LIBUSB_SUCCESS)
-		return 1;
-#else
-	descriptor = dev->descriptor;	/* Copy */
-#endif
-	if (p->debug) fprintf(stderr,"usb_check_and_add() called with VID 0x%x, PID 0x%x\n",descriptor.idVendor, descriptor.idProduct);
-
-#ifdef USE_LIBUSB1
-#if defined(NT) || defined(__APPLE__)
-	/* Ignore libusb1 HID driver capability */
-	{
-		struct libusb_config_descriptor *config = NULL;
-
-		if (descriptor.bDeviceClass != LIBUSB_CLASS_HID
-		  && libusb_get_config_descriptor(dev, 0, &config) != LIBUSB_SUCCESS) {
-			if (p->debug) fprintf(stderr,"Get config desc. 0 failed\n");
-			return 1;
-		}
-
-		if (descriptor.bDeviceClass == LIBUSB_CLASS_HID
-		 || (config->bNumInterfaces > 0
-		  && config->interface[0]. num_altsetting > 0
-		  && config->interface[0].altsetting[0].bInterfaceClass == LIBUSB_CLASS_HID)) {
-			int i;
-			/* See if this devices is already in the list via the HID interface */
-			/* (This may not be 100% correct in the face of multiple instances
-			   of the same device, if Windows allows different drivers for different
-			   instances of the same device type.) */
-			for (i = 0; i < p->npaths; i++) {
-				if (p->paths[i]->vid == descriptor.idVendor
-				 && p->paths[i]->pid == descriptor.idProduct)
-					break;		/* Yes */
-			}
-			if (i < p->npaths) {
-				if (p->debug) fprintf(stderr,"Is an HID device and already added\n");
-				if (config != NULL)
-					libusb_free_config_descriptor(config);
-				return 0;
-			}
-		}
-		if (config != NULL)
-			libusb_free_config_descriptor(config);
-	}
-#endif
-#endif
-	if ((itype = inst_usb_match(descriptor.idVendor, descriptor.idProduct))
-	                                                                != instUnknown) {
-		char pname[400];
-
-		if (p->debug) fprintf(stderr,"usb_check_and_add() found known instrument\n");
-
-		/* Create a path/identification */
-		/* (devnum doesn't seem valid ?) */
-#ifdef USE_LIBUSB1
-		libusb_ref_device(dev);		/* Keep it */
-		sprintf(pname,"usb:/bus%d/dev%d/ (%s)",libusb_get_bus_number(dev),libusb_get_device_address(dev), inst_name(itype));
-#else
-# if defined(UNIX)
-		sprintf(pname,"usb:/bus%d/dev%d (%s)",dev->bus->location >> 24, dev->devnum, inst_name(itype));
-# else
-		sprintf(pname,"usb:/bus%lu/dev%d (%s)",dev->bus->location, dev->devnum, inst_name(itype));
-# endif
-#endif
-
-		/* Add the path to the list */
-		if (p->paths == NULL) {
-			if ((p->paths = (icompath **)calloc(sizeof(icompath *), 1 + 1)) == NULL)
-				error("icoms: calloc failed!");
-		} else {
-			if ((p->paths = (icompath **)realloc(p->paths,
-			                     sizeof(icompath *) * (p->npaths + 2))) == NULL)
-				error("icoms: realloc failed!");
-			p->paths[p->npaths+1] = NULL;
-		}
-		if ((p->paths[p->npaths] = malloc(sizeof(icompath))) == NULL)
-			error("icoms: malloc failed!");
-		p->paths[p->npaths]->vid = descriptor.idVendor;
-		p->paths[p->npaths]->pid = descriptor.idProduct;
-		p->paths[p->npaths]->dev = dev;
-		p->paths[p->npaths]->hev = NULL;
-		p->paths[p->npaths]->itype = itype;
-		if ((p->paths[p->npaths]->path = strdup(pname)) == NULL)
-			error("icoms: strdup failed!");
-		p->npaths++;
-		p->paths[p->npaths] = NULL;
-		return 1;
-	}
-
-	return 0;
-}
-
-#endif /* ENABLE_USB */
-
-#ifdef USE_LIBUSB1
-
-/* Add paths to USB connected instruments, to the existing */
-/* icompath paths in the icoms structure. */
-void usb_get_paths(
-struct _icoms *p 
-) {
-#ifdef ENABLE_USB
-	ssize_t i, nlist;
-	struct libusb_device **list;
-
-	/* Scan the USB busses for instruments we recognise */
-	/* We're not expecting any of our instruments to be an interface on a device. */
-
-	if (p->ctx == NULL) {
-		int rv;
-	   	if ((rv = libusb_init(&p->ctx)) != 0) {
-			error("libusb_init() failed with %d",rv);
-		}
-	}
-
-	if (p->debug > 8)
-		libusb_set_debug(p->ctx, p->debug);
-
-	nlist = libusb_get_device_list(NULL, &list);
-    
-	if (p->debug) fprintf(stderr,"usb_get_paths about to look through devices:\n");
-
-	for (i = 0; i < nlist; i++) {
-		usb_check_and_add(p, list[i]);
-   	}
-
-	libusb_free_device_list(list,  1);
-#endif /* ENABLE_USB */
-}
-
-#else /* !USE_LIBUSB1 */
-
-/* Add paths to USB connected instruments, to the existing */
-/* icompath paths in the icoms structure. */
-void usb_get_paths(
-struct _icoms *p 
-) {
-#ifdef ENABLE_USB
-	struct usb_bus *bus;
-
-	/* Check that we've got an up to date version of libusb */
-	if (usb_argyll_patched() < 2)
-		error("usblib isn't up to date to work with this version of Argyll");
-
-	if (p->debug > 8)
-		usb_set_debug(p->debug);
-
-	/* Scan the USB busses for instruments we recognise */
-	/* We're not expecting any of our unstruments to be an interface on a device. */
-
-   	usb_init();
-   	usb_find_busses();
-   	usb_find_devices();
-    
-	if (p->debug) fprintf(stderr,"usb_get_paths about to look through buses:\n");
-
-   	for (bus = usb_get_busses(); bus != NULL; bus = bus->next) {
-		struct usb_device *dev;
-		if (p->debug) fprintf(stderr,"usb_get_paths about to look through devices:\n");
-   		for (dev = bus->devices; dev != NULL; dev = dev->next) {
-			usb_check_and_add(p, dev);
-		}
-   	}
-#endif /* ENABLE_USB */
-}
-#endif /* !USE_LIBUSB1 */
-
-
-/* Cleanup and then free a usb dev entry */
-void usb_del_usb_device(struct usb_device *dev) {
-
-	if (dev == NULL)
-		return;
-
-#ifdef USE_LIBUSB1
-	libusb_unref_device(dev);
-#endif
-}
-
-/* Cleanup any USB specific icoms */
-void usb_del_usb(icoms *p) {
-
-#ifdef USE_LIBUSB1
-	if (p->ctx != NULL) {
-	   	libusb_exit(p->ctx);
-		p->ctx = NULL;
-	}
-#endif /* USE_LIBUSB1 */
-}
-
-/* Return the instrument type if the port number is USB, */
-/* and instUnknown if it is not. */
-instType usb_is_usb_portno(
-	icoms *p, 
-	int port		/* Enumerated port number, 1..n */
-) {
-	
-	if (p->paths == NULL)
-		p->get_paths(p);
-
-	if (port <= 0 || port > p->npaths)
-		error("icoms - usb_is_usb_portno: port number %d out of range %d - %d",port,1,p->npaths);
-
-#ifdef ENABLE_USB
-	if (p->paths[port-1]->dev != NULL)
-		return p->paths[port-1]->itype;
-#endif /* ENABLE_USB */
-
-	return instUnknown;
-}
-
-
-
-/*  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#ifdef ENABLE_USB
-
-/* Static list so that all open USB/HID connections can be closed on a SIGKILL */
-static icoms *icoms_list = NULL;
-
-/* Counter set when we're in a USB read or write */
-/* Note - this isn't perfectly thread safe */
-static int in_usb_rw = 0;
-
-/* Clean up any open USB ports ready for exit */
-static void icoms_cleanup() {
-	icoms *pp, *np;
-//printf("~1 icoms_cleanipandexit invoked\n");
-
-#if defined(UNIX)
-	/* This is a bit of a hack to compensate for the fact */
-	/* that a ^C will kill the program while ICANON is off. */
-	/* It's really better to restore the original attributes, */
-	/* even when USB is not compiled in. */
-	struct termios news;
-	if (tcgetattr(STDIN_FILENO, &news) >= 0) {
-		news.c_lflag |= (ICANON | ECHO);
-		tcsetattr(STDIN_FILENO,TCSANOW, &news);
-	}
-#endif
-
-	for (pp = icoms_list; pp != NULL; pp = np) { 
-		np = pp->next;
-//printf("~1 closing usb port 0x%x\n",pp);
-		/* There's a problem here if have more than one USB port */
-		/* open - win32 doesn't return from the system call. */
-		/* Should we depend on usb read/write routines to call cleanup ? */
-		if (pp->is_usb)
-			usb_close_port(pp);
-		else if (pp->is_hid)
-			hid_close_port(pp);
-	}
-}
-
-#ifdef NT
-void (__cdecl *usbio_int)(int sig) = SIG_DFL;
-void (__cdecl *usbio_term)(int sig) = SIG_DFL;
-#endif
-#ifdef UNIX
-void (*usbio_hup)(int sig) = SIG_DFL;
-void (*usbio_int)(int sig) = SIG_DFL;
-void (*usbio_term)(int sig) = SIG_DFL;
-#endif
-
-/* On something killing our process, deal with USB cleanup */
-static void icoms_sighandler(int arg) {
-//printf("~1 signal handler invoked\n");
-	if (in_usb_rw != 0)
-		in_usb_rw = -1;
-	icoms_cleanup();
-#ifdef UNIX
-	if (arg == SIGHUP && usbio_hup != SIG_DFL && usbio_hup != SIG_IGN) 
-		usbio_hup(arg);
-#endif /* UNIX */
-	if (arg == SIGINT && usbio_int != SIG_DFL && usbio_int != SIG_IGN) 
-		usbio_int(arg);
-	if (arg == SIGTERM && usbio_term != SIG_DFL && usbio_term != SIG_IGN) 
-		usbio_term(arg);
-	exit(0);
-}
-
-#ifdef USE_LIBUSB1
-
-/* Callback functions */
-static void bulk_transfer_cb(struct libusb_transfer *transfer)
-{
-	int *completed = transfer->user_data;
-	*completed = 1;
-	/* caller interprets results and frees transfer */
-}
-
-/* Version of libusb1 sync to async code that returns the pointer */
-/* to the transfer structure so that the transfer can be cancelled */
-/* by another thread. */
-/* Note that this isn't perfectly thread safe - there are race windows. */
-/* Accessing the libusb_transfer * should at least be protected by a lock. */
-/* (For Argyll use this problem is unlikely) */
-static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle,
-	void **hcancel, unsigned char endpoint, unsigned char *buffer, int length,
-	int *transferred, unsigned int timeout, unsigned char type)
-{
-	struct libusb_transfer *transfer = libusb_alloc_transfer(0);
-	int completed = 0;
-	int r;
-
-	if (!transfer)
-		return LIBUSB_ERROR_NO_MEM;
-
-	libusb_fill_bulk_transfer(transfer, dev_handle, endpoint, buffer, length,
-		bulk_transfer_cb, &completed, timeout);
-	transfer->type = type;
-
-	r = libusb_submit_transfer(transfer);
-	if (r < 0) {
-		libusb_free_transfer(transfer);
-		return r;
-	}
-
-	if (hcancel != NULL)
-		*hcancel = (void *)transfer;
-
-	while (!completed) {
-		r = libusb_handle_events_check(NULL, &completed);
-		if (r < 0) {
-			if (r == LIBUSB_ERROR_INTERRUPTED)
-				continue;
-			libusb_cancel_transfer(transfer);
-			while (!completed) {
-				if (libusb_handle_events_check(NULL, &completed) < 0)
-					break;
-			}
-			if (hcancel != NULL)
-				*hcancel = NULL;
-			libusb_free_transfer(transfer);
-			return r;
-		}
-	}
-
-	*transferred = transfer->actual_length;
-	switch (transfer->status) {
-	case LIBUSB_TRANSFER_COMPLETED:
-		r = 0;
-		break;
-	case LIBUSB_TRANSFER_TIMED_OUT:
-		r = LIBUSB_ERROR_TIMEOUT;
-		break;
-	case LIBUSB_TRANSFER_STALL:
-		r = LIBUSB_ERROR_PIPE;
-		break;
-	case LIBUSB_TRANSFER_OVERFLOW:
-		r = LIBUSB_ERROR_OVERFLOW;
-		break;
-	case LIBUSB_TRANSFER_NO_DEVICE:
-		r = LIBUSB_ERROR_NO_DEVICE;
-		break;
-	default:
-		r = LIBUSB_ERROR_OTHER;
-	}
-
-	if (hcancel != NULL)
-		*hcancel = NULL;
-	libusb_free_transfer(transfer);
-
-	return r;
-}
-#endif	/* USE_LIBUSB1 */
-
-// !!! should fix all these to separate error from length transferred !!!
-// !!! to take advantage of libus1 !!!
-
-/* Our versions of usblib read/write, that exit if a signal was caught */
-/* This is so that MSWindows works properly */
-static int icoms_usb_interrupt_write(usb_dev_handle *dev, void **hcancel, int ep, unsigned char *bytes, int size, int timeout) {
-#ifdef USE_LIBUSB1
-	int tsize;
-#endif
-	int rv;
-
-	in_usb_rw++;
-#ifdef USE_LIBUSB1
-	rv = do_sync_bulk_transfer(dev, hcancel, (unsigned char)ep, bytes, size, &tsize, timeout, LIBUSB_TRANSFER_TYPE_INTERRUPT);
-	if (rv == LIBUSB_SUCCESS)
-		rv = tsize;
-#else
-	if (hcancel != NULL) *hcancel = (void *)ep;
-	rv = usb_interrupt_write(dev, ep, (char *)bytes, size, timeout);
-#endif
-	if (in_usb_rw < 0)
-		exit(0);
-
-	in_usb_rw--;
-	return rv;
-}
-
-static int icoms_usb_interrupt_read(usb_dev_handle *dev, void **hcancel, int ep, unsigned char *bytes, int size, int timeout) {
-#ifdef USE_LIBUSB1
-	int tsize;
-#endif
-	int rv;
-
-	in_usb_rw++;
-#ifdef USE_LIBUSB1
-	rv = do_sync_bulk_transfer(dev, hcancel, (unsigned char)ep, bytes, size, &tsize, timeout, LIBUSB_TRANSFER_TYPE_INTERRUPT);
-	if (rv == LIBUSB_SUCCESS)
-		rv = tsize;
-#else
-	if (hcancel != NULL) *hcancel = (void *)ep;
-	rv = usb_interrupt_read(dev, ep, (char *)bytes, size, timeout);
-#endif
-	if (in_usb_rw < 0)
-		exit(0);
-
-	in_usb_rw--;
-	return rv;
-}
-
-static int icoms_usb_bulk_write(usb_dev_handle *dev, void **hcancel, int ep, unsigned char *bytes, int size, int timeout) {
-#ifdef USE_LIBUSB1
-	int tsize;
-#endif
-	int rv;
-
-	in_usb_rw++;
-#ifdef USE_LIBUSB1
-	rv = do_sync_bulk_transfer(dev, hcancel, (unsigned char)ep, bytes, size, &tsize, timeout, LIBUSB_TRANSFER_TYPE_BULK);
-	if (rv == LIBUSB_SUCCESS)
-		rv = tsize;
-#else
-	if (hcancel != NULL) *hcancel = (void *)ep;
-	rv = usb_bulk_write(dev, ep, (char *)bytes, size, timeout);
-#endif
-	if (in_usb_rw < 0)
-		exit(0);
-
-	in_usb_rw--;
-	return rv;
-}
-
-static int icoms_usb_bulk_read(usb_dev_handle *dev, void **hcancel, int ep, unsigned char *bytes, int size, int timeout) {
-#ifdef USE_LIBUSB1
-	int tsize;
-#endif
-	int rv;
-
-	in_usb_rw++;
-#ifdef USE_LIBUSB1
-	rv = do_sync_bulk_transfer(dev, hcancel, (unsigned char)ep, bytes, size, &tsize, timeout, LIBUSB_TRANSFER_TYPE_BULK);
-	if (rv == LIBUSB_SUCCESS)
-		rv = tsize;
-#else
-	if (hcancel != NULL) *hcancel = (void *)ep;
-	rv = usb_bulk_read(dev, ep, (char *)bytes, size, timeout);
-#endif
-	if (in_usb_rw < 0)
-		exit(0);
-
-	in_usb_rw--;
-	return rv;
-}
-
-
-static int icoms_usb_control_msg(
-usb_dev_handle *dev, int requesttype, int request,
-int value, int index, unsigned char *bytes, int size, 
-int timeout) {
-	int rv;
-
-	in_usb_rw++;
-#ifdef USE_LIBUSB1
-	rv = libusb_control_transfer(dev, (uint8_t)requesttype, (uint8_t)request, (uint16_t)value, (uint16_t)index, bytes, (uint16_t)size, timeout);
-#else
-	rv = usb_control_msg(dev, requesttype, request, value, index, (char *)bytes, size, timeout);
-#endif
-	if (in_usb_rw < 0)
-		exit(0);
-
-	in_usb_rw--;
-	return rv;
-}
-
-#endif /* ENABLE_USB */
-
-/*  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-/* Install the cleanup signal handlers */
-void usb_install_signal_handlers(icoms *p) {
-	if (icoms_list == NULL) {
-//printf("~1 installing signal handler\n");
-#if defined(UNIX)
-		usbio_hup = signal(SIGHUP, icoms_sighandler);
-#endif /* UNIX */
-		usbio_int = signal(SIGINT, icoms_sighandler);
-		usbio_term = signal(SIGTERM, icoms_sighandler);
-	}
-
-	/* Add it to our static list, to allow automatic cleanup on signal */
-	p->next = icoms_list;
-	icoms_list = p;
-}
-
-/* Delete an icoms from our static signal cleanup list */
-void usb_delete_from_cleanup_list(icoms *p) {
-
-	/* Find it and delete it from our static cleanup list */
-	if (icoms_list != NULL) {
-		if (icoms_list == p) {
-			icoms_list = p->next;
-			if (icoms_list == NULL) {
-//printf("~1 removing signal handler\n");
-#if defined(UNIX)
-				signal(SIGHUP, usbio_hup);
-#endif /* UNIX */
-				signal(SIGINT, usbio_int);
-				signal(SIGTERM, usbio_term);
-			}
-		} else {
-			icoms *pp;
-			for (pp = icoms_list; pp != NULL; pp = pp->next) { 
-				if (pp->next == p) {
-					pp->next = p->next;
-					break;
-				}
-			}
-		}
-	}
-}
-
-/*  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-/* Close an open USB port */
-/* If we don't do this, the port and/or the device may be left in an unusable state. */
-void usb_close_port(icoms *p) {
-
-#ifdef ENABLE_USB
-	if (p->debug) fprintf(stderr,"usb_close_port() called\n");
-
-	if (p->is_open && p->usbh != NULL) {
-		int iface;
-
-		for (iface = 0; iface < p->nifce; iface++)
-#ifdef USE_LIBUSB1
-			libusb_release_interface(p->usbh, iface);
-#else
-			usb_release_interface(p->usbh, iface);
-#endif
-
-		/* Workaround for some bugs */
-		if (p->uflags & icomuf_reset_before_close) {
-#ifdef USE_LIBUSB1
-			libusb_reset_device(p->usbh);
-#else
-			usb_reset(p->usbh);
-#endif
-		}
-
-		/* Close as well, othewise we can't re-open */
-		{
-#ifdef USE_LIBUSB1
-			libusb_close(p->usbh);
-#else
-			usb_close(p->usbh);
-#endif
-		}
-		p->usbh = NULL;
-
-		if (p->debug) fprintf(stderr,"usb port has been released and closed\n");
-	}
-	p->is_open = 0;
-	if (p->ppath != NULL) {
-		if (p->ppath->path != NULL)
-			free(p->ppath->path);
-		free(p->ppath);
-		p->ppath = NULL;
-	}
-
-	/* Find it and delete it from our static cleanup list */
-	usb_delete_from_cleanup_list(p);
-
-#endif /* ENABLE_USB */
-}
-
-/* Open a USB port for all our uses. */
-static void usb_open_port(
-icoms *p,
-int    port,		/* USB com port, 1 - N, 0 for no change. */
-int    config,		/* Configuration number */
-int    wr_ep,		/* Write end point */
-int    rd_ep,		/* Read end point */
-icomuflags usbflags,/* Any special handling flags */
-int retries,		/* > 0 if we should retry set_configuration (100msec) */ 
-char **pnames		/* List of process names to try and kill before opening */
-) {
-	int tries = 0;
-	if (p->debug) fprintf(stderr,"icoms: About to open the USB port, tries %d\n",retries);
-
-	if (port >= 1) {
-		if (p->is_open && port != p->port) {	/* If port number changes */
-			p->close_port(p);
-		}
-	}
-
-	/* Make sure the port is open */
-	if (!p->is_open) {
-		struct usb_device_descriptor descriptor;
-#ifdef USE_LIBUSB1
-		const struct libusb_interface_descriptor *ifd;
-	    struct libusb_config_descriptor *confdesc;
-#else
-		struct usb_interface_descriptor *ifd;
-#endif
-		int rv, i, iface;
-		kkill_nproc_ctx *kpc = NULL;
-
-		if (p->debug) fprintf(stderr,"icoms: USB port needs opening\n");
-
-		/* Do open retries */
-		for (tries = 0; retries >= 0; retries--, tries++) {
-
-			if (p->ppath != NULL) {
-				if (p->ppath->path != NULL)
-					free(p->ppath->path);
-				free(p->ppath);
-			}
-	
-			if (p->paths == NULL || tries > 0)
-				p->get_paths(p);
-	
-			if (port <= 0 || port > p->npaths)
-				error("icoms - usb_open_port: port number out of range!");
-	
-			if (p->paths[port-1]->dev == NULL)
-				error("icoms - usb_open_port: Not a USB port!");
-	
-			if ((p->ppath = malloc(sizeof(icompath))) == NULL)
-				error("malloc() failed on com port path");
-			*p->ppath = *p->paths[port-1];				/* Structure copy */
-			if ((p->ppath->path = strdup(p->paths[port-1]->path)) == NULL)
-				error("strdup() failed on com port path");
-			p->port = port;
-	
-			if (p->debug) fprintf(stderr,"icoms: About to open USB port '%s'\n",p->ppath->path);
-
-			if (tries > 0) {
-				//msec_sleep(i_rand(50,100));
-				msec_sleep(77);
-			}
-			if (tries > 0 && pnames != NULL && kpc == NULL) {
-#if defined(__APPLE__) 
-				if ((kpc = kkill_nprocess(pnames, p->debug)) == NULL) {
-					if (p->debug) fprintf(stderr,"kkill_nprocess returned error!\n");
-				}
-#endif /* !__APPLE__ */
-			}
-
-#ifdef USE_LIBUSB1
-			if ((rv = libusb_open(p->ppath->dev, &p->usbh)) != LIBUSB_SUCCESS)
-#else
-			if ((p->usbh = usb_open(p->ppath->dev)) == NULL)
-#endif
-			{
-				if (p->debug)
-					fprintf(stderr, "Opening USB port '%s' config %d failed (%s) (Permissions ?)",p->ppath->path,config,USB_STRERROR(rv));
-				if (retries <= 0) {
-					if (kpc != NULL)
-						kpc->del(kpc); 
-					error("Opening USB port '%s' config %d failed (%s) (Permissions ?)",p->ppath->path,config,USB_STRERROR(rv));
-				}
-				continue;
-			} else if (p->debug)
-				fprintf(stderr,"open() of USB port '%s' suceeded\n",p->ppath->path);
-
-			/* Get a copy of the device descriptor so we can see device params */
-#ifdef USE_LIBUSB1
-			if (libusb_get_device_descriptor(p->ppath->dev, &descriptor) != LIBUSB_SUCCESS)
-				error("Get device descriptor on USB port '%s' failed with %d (%s)",p->ppath->path,rv,libusb_strerror(rv));
-#else
-			descriptor = dev->descriptor;	/* Copy */
-#endif
-
-			p->vid = p->ppath->vid;
-			p->pid = p->ppath->pid;
-			p->usbd = p->ppath->dev;
-
-			p->cnfg = config;
-			p->uflags = usbflags;
-
-#ifdef USE_LIBUSB1
-			if (p->uflags & icomuf_detach) {
-				if (libusb_kernel_driver_active(p->usbh, 0) == 1) {
-					if (p->debug) fprintf(stderr,"icoms: detaching '%s'\n",p->ppath->path);
-					if (libusb_detach_kernel_driver(p->usbh, 0) != LIBUSB_SUCCESS) {
-						if (kpc != NULL)
-							kpc->del(kpc); 
-						error("Detach kernel driver on USB port '%s' failed with %d (%s)",p->ppath->path,rv,libusb_strerror(rv));
-					}
-				}
-			}
-#else
-#if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP == 1
-			if (p->uflags & icomuf_detach) {
-				usb_detach_kernel_driver_np(p->usbh, 0);
-			}
-#endif
-#endif
-
-			if (p->debug > 1) fprintf(stderr, "Number of configurations = %d\n",
-			                          descriptor.bNumConfigurations);
-#if defined(UNIX) && !defined(__APPLE__)
-			/* only call set_configuration on Linux if the device has more than one */
-			/* possible configuration, because Linux does a set_configuration by default, */
-			/* and two of them mess up instruments like the Spyder2 */
-
-			if (descriptor.bNumConfigurations > 1) {
-#endif
-
-			/* Can't skip this, as it is needed to setup the interface and end points on OS X */
-#ifdef USE_LIBUSB1
-			if ((rv = libusb_set_configuration(p->usbh, p->cnfg)) < 0)
-#else
-			if ((rv = usb_set_configuration(p->usbh, p->cnfg)) < 0)
-#endif
-			{
-				if (p->debug)
-					fprintf(stderr,"Configuring USB port '%s' to %d failed with %d (%s)",p->ppath->path,config,rv,USB_STRERROR(rv));
-				if (retries <= 0) {
-					if (kpc != NULL)
-						kpc->del(kpc); 
-					error("Configuring USB port '%s' to %d failed with %d (%s)",p->ppath->path,config,rv,USB_STRERROR(rv));
-				}
-#ifdef USE_LIBUSB1
-				libusb_reset_device(p->usbh); // ~~999 ?????
-				libusb_close(p->usbh);
-#else
-				usb_reset(p->usbh);
-				usb_close(p->usbh);
-#endif
-				continue;
-			}
-#if defined(UNIX) && !defined(__APPLE__)
-			}		/* End of if bNumConfigurations > 1 */
-#endif
-
-			/* We're done */
-			break;
-		}
-
-		if (kpc != NULL)
-			kpc->del(kpc); 
-
-		/* Claim all interfaces of this configuration */
-#ifdef USE_LIBUSB1
-		if ((rv = libusb_get_active_config_descriptor(p->usbd, &confdesc)) != LIBUSB_SUCCESS) {
-			error("Getting config descriptor for USB port '%s' failed with %d (%s)",p->ppath->path,rv,libusb_strerror(rv));
-		}
-		p->nifce = confdesc->bNumInterfaces;
-#else
-		p->nifce = p->usbd->config->bNumInterfaces;
-#endif
-
-//printf("~1 Number of interfaces = %d\n",p->nifce);
-
-		/* Claim all the interfaces */
-		for (iface = 0; iface < p->nifce; iface++) {
-			/* (Second parameter is bInterfaceNumber) */
-
-#ifdef USE_LIBUSB1
-			/* Should we do a libusb_kernel_driver_active() first ? */
-			if ((rv = libusb_claim_interface(p->usbh, iface)) < 0) {
-				/* Detatch the existing interface. */
-				if (p->uflags & icomuf_detach) {
-					libusb_detach_kernel_driver (p->usbh, iface);
-					if ((rv = libusb_claim_interface(p->usbh, iface)) < 0) {
-						error("Claiming USB port '%s' interface %d failed with %d",p->ppath->path,iface,rv);
-					}
-				}
-			}
-#else
-			if ((rv = usb_claim_interface(p->usbh, iface)) < 0) {
-#if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP == 1
-				/* Detatch the existing interface. */
-				if (p->uflags & icomuf_detach) {
-					usb_detach_kernel_driver_np(p->usbh, iface);
-					if ((rv = usb_claim_interface(p->usbh, iface)) < 0) {
-						error("Claiming USB port '%s' interface %d failed with %d",p->ppath->path,iface,rv);
-					}
-				}
-#else
-				error("Claiming USB port '%s' interface %d failed with %d",p->ppath->path,iface,rv);
-#endif
-			}
-#endif
-	
-			/* Fill in the end point details */
-#ifdef USE_LIBUSB1
-			ifd = &confdesc->interface[iface].altsetting[0];
-#else
-			ifd = &p->usbd->config[p->cnfg-1].interface[iface].altsetting[0];
-#endif
-//printf("~1 Number of endpoints on iface %d = %d\n",iface, ifd->bNumEndpoints);
-			for (i = 0; i < ifd->bNumEndpoints; i++) {
-				int ad = ifd->endpoint[i].bEndpointAddress;
-				p->EPINFO(ad).valid = 1;
-				p->EPINFO(ad).addr = ad;
-				p->EPINFO(ad).packetsize = ifd->endpoint[i].wMaxPacketSize;
-				p->EPINFO(ad).type = ifd->endpoint[i].bmAttributes & USB_ENDPOINT_TYPE_MASK;
-				/* Some I/F seem to hang if we do this, some seem to hang if we don't ! */
-				if (!(p->uflags & icomuf_no_open_clear))
-#ifdef USE_LIBUSB1
-					libusb_clear_halt(p->usbh, (unsigned char)ad);
-#else
-					usb_clear_halt(p->usbh, ad);
-#endif
-//printf("~1 %d: endpoint addr %02x pktsze %d, type %d\n",i,ad,ifd->endpoint[i].wMaxPacketSize,p->EPINFO(ad).type);
-			}
-
-#ifdef NEVER
-			/* Get the serial number */
-			{
-				int rv;
-				struct usb_device_descriptor descriptor;
-
-				if (p->debug) fprintf(stderr,"About to get device serial number\n");
-#ifdef USE_LIBUSB1
-				if ((rv = libusb_get_device_descriptor(p->usbd, &descriptor)) != LIBUSB_SUCCESS)
-					error("get_device_descriptor failed with %d USB port '%s'",rv,p->ppath->path);
-#else
-				descriptor = dev->descriptor;	/* Copy */
-#endif
-				if ((rv = libusb_get_string_descriptor_ascii(p->usbh, descriptor.iSerialNumber, p->serialno, 32)) <= 0) {
-					if (p->debug) fprintf(stderr,"Failed to get device serial number %d\n",rv);
-					p->serialno[0] = '\000';
-				}
-				if (p->debug) fprintf(stderr,"Device serial number = '%s'\n",p->serialno);
-			}
-#endif /* NEVER */
-		}
-
-		/* Set "serial" coms values */
-		p->wr_ep = wr_ep;
-		p->rd_ep = rd_ep;
-		p->rd_qa = p->EPINFO(rd_ep).packetsize;
-//printf("~1 read quanta = packet size = %d\n",p->rd_qa);
-		if (p->rd_qa == 0)
-			p->rd_qa = 8;
-
-		p->is_usb = 1;
-		p->is_open = 1;
-		if (p->debug) fprintf(stderr,"icoms: USB port is now open\n");
-	}
-
-	if (p->debug) fprintf(stderr,"icoms: Clearing any USB errors\n");
-
-	/* Install the cleanup signal handlers, and add to our cleanup list */
-	usb_install_signal_handlers(p);
-}
-
-/* ========================================================= */
-/* USB write/read "serial" imitation */
-
-/* Write the characters in the buffer out */
-/* Data will be written up to the terminating nul */
-/* Return relevant error status bits */
-static int
-icoms_usb_ser_write(
-icoms *p,
-char *wbuf,
-double tout)
-{
-	int c, len, wbytes;
-	long toc, i, top;		/* Timout count, counter, timeout period */
-	int ep = p->wr_ep;		/* End point */
-	int bulk = 0;			/* nz if bulk rather than interrupt read */
-
-	if (p->debug) fprintf(stderr,"icoms: About to write '%s' ",icoms_fix(wbuf));
-
-	if (!p->is_open)
-		error("icoms_ser_write: not initialised");
-
-	if (p->EPINFO(ep).valid == 0)
-		error("icoms_ser_write invalid end point 0x%02x",ep);
-
-	if (p->EPINFO(ep).type != ICOM_EP_TYPE_BULK
-	 && p->EPINFO(ep).type != ICOM_EP_TYPE_INTERRUPT)
-		error("icoms_ser_write unhandled end point type %d",p->EPINFO(ep).type);
-
-	if (p->EPINFO(ep).type == ICOM_EP_TYPE_BULK)
-		bulk = 1;
-
-	len = strlen(wbuf);
-	tout *= 1000.0;		/* Timout in msec */
-	p->lerr = 0;
-
-	top = (int)(tout + 0.5);		/* Timeout period in msecs */
-	toc = (int)(tout/top + 0.5);	/* Number of timout periods in timeout */
-	if (toc < 1)
-		toc = 1;
-
-#ifdef ENABLE_USB
-
-	/* Until data is all written, we time out, or the user aborts */
-	for (i = toc; i > 0 && len > 0;) {
-//printf("~1 write: attempting to write %d bytes to usb top = %d, i = %d\n",len,top,i);
-
-		if (bulk)
-			wbytes = icoms_usb_bulk_write(p->usbh, NULL, ep, (unsigned char *)wbuf, len, top);
-		else
-			wbytes = icoms_usb_interrupt_write(p->usbh, NULL, ep, (unsigned char *)wbuf, len, top);
-		if (wbytes < 0) {
-//printf("~1 usb_interrupt_write failed with %d = '%s'\n",wbytes,usb_strerror());
-#ifdef USE_LIBUSB1
-			if (wbytes != LIBUSB_ERROR_TIMEOUT)	/* Not a timeout */
-#else
-#if defined(UNIX)
-			if (wbytes != 0 && wbytes != -ETIMEDOUT)      /* Not a timeout } */
-#else
-			if (wbytes != -116)		/* Not a timeout */
-#endif /* UNIX */
-#endif
-			{
-				p->lerr |= ICOM_USBW; 
-				break;
-			}
-			i--;		/* timeout */
-		} else if (wbytes > 0) {	/* Account for bytes written */
-//printf("~1 wrote %d bytes\n",wbytes);
-			i = toc;
-			wbuf += wbytes;
-			len -= wbytes;
-		}
-		/* Check for user interrupt */
-		if ((c = poll_con_char()) != 0 && p->uih[c] != ICOM_OK) {
-			p->cut = c;
-			p->lerr |= p->uih[c];
-		}
-	}
-	if (i <= 0)		/* Must have timed out */
-		p->lerr |= ICOM_TO; 
-
-#else /* !ENABLE_USB */
-	p->lerr = ICOM_NOTS;
-#endif /* !ENABLE_USB */
-
-	if (p->debug) fprintf(stderr,"ICOM err 0x%x\n",p->lerr);
-	return p->lerr;
-}
-
-
-/* Read characters into the buffer */
-/* Return string will be terminated with a nul */
-/* Read only in paket sized chunks, and retry if */
-/* the bytes requested aren'r read, untill we get a */
-/* timeout or a terminating char is read */
-static int
-icoms_usb_ser_read(icoms *p,
-char *rbuf,			/* Buffer to store characters read */
-int bsize,			/* Buffer size */
-char tc,			/* Terminating characer */
-int ntc,			/* Number of terminating characters */
-double tout)		/* Time out in seconds */
-{
-	int c, j, rbytes;
-	long toc, i, top;		/* Timout count, counter, timeout period */
-	char *rrbuf = rbuf;		/* Start of return buffer */
-	int ep = p->rd_ep;		/* End point */
-	int bulk = 0;			/* nz if bulk rather than interrupt read */
-
-	if (p->debug) fprintf(stderr,"icoms: Read called\n");
-
-#ifdef QUIET_MEMCHECKERS
-	memset(rbuf, 0, bsize);
-#endif
-
-	if (!p->is_open)
-		error("icoms_usb_ser_read: not initialised");
-
-	if (p->EPINFO(ep).valid == 0)
-		error("icoms_usb_ser_read invalid end point 0x%02x",ep);
-
-	if (p->EPINFO(ep).type != ICOM_EP_TYPE_BULK
-	 && p->EPINFO(ep).type != ICOM_EP_TYPE_INTERRUPT)
-		error("icoms_usb_ser_read unhandled end point type %d",p->EPINFO(ep).type);
-
-	if (p->EPINFO(ep).type == ICOM_EP_TYPE_BULK)
-		bulk = 1;
-
-	if (bsize < 3)
-		error("icoms_usb_ser_read given too small a buffer");
-
-for (i = 0; i < bsize; i++) rbuf[i] = 0;
- 
-	p->lerr = 0;
-	tout *= 1000.0;		/* Timout in msec */
-	bsize--;	/* Allow space for null */
-
-	/* Have to do this in one go, because libusb has no way */
-	/* of timing out and returning the number of characters read */
-	/* up to the timeout, and it looses characters. */
-	top = (int)(tout + 0.5);		/* Timeout period in msecs */
-	toc = (int)(tout/top + 0.5);	/* Number of timout periods in timeout */
-	if (toc < 1)
-		toc = 1;
-
-#ifdef ENABLE_USB
-//printf("~1 usb read end point 0x%x, read quanta %d\n",p->rd_ep,p->rd_qa);
-	/* Until data is all read, we time out, or the user aborts */
-	for (i = toc, j = 0; i > 0 && bsize > 1 && j < ntc ;) {
-		int rsize = p->rd_qa < bsize ? p->rd_qa : bsize; 
-
-//printf("~1 read: attempting to read %d bytes from usb, top = %d, i = %d, j = %d\n",bsize > p->rd_qa ? p->rd_qa : bsize,top,i,j);
-		/* We read one read quanta at a time (usually 8 bytes), to avoid */
-		/* problems with libusb loosing characters whenever it times out. */
-		if (bulk)
-			rbytes = icoms_usb_bulk_read(p->usbh, NULL, ep, (unsigned char *)rbuf, rsize, top);
-		else
-			rbytes = icoms_usb_interrupt_read(p->usbh, NULL, ep, (unsigned char *)rbuf, rsize, top);
-		if (rbytes < 0) {
-//printf("~1 usb_interrupt_read failed with %d = '%s'\n",rbytes,usb_strerror());
-//printf("~1 rbuf = '%s'\n",icoms_fix(rrbuf));
-#ifdef USE_LIBUSB1
-			if (rbytes != LIBUSB_ERROR_TIMEOUT)	/* Not a timeout */
-#else
-#if defined(UNIX)
-			if (rbytes != 0 && rbytes != -ETIMEDOUT)     /* Not a timeout } */
-#else
-			if (rbytes != -116)		/* Not a timeout */
-#endif /* UNIX */
-#endif
-			{
-				p->lerr |= ICOM_USBR; 
-				break;
-			}
-			i--;	/* Timeout */
-		} else if (rbytes >= 0) {	/* Account for bytes read */
-//printf("~1 rbuf = '%s'\n",icoms_fix(rrbuf));
-//printf("~1 read %d bytes,",rbytes);
-			i = toc;
-			bsize -= rbytes;
-			while(rbytes) {	/* Count termination characters */
-				if (*rbuf++ == tc)
-					j++;
-				rbytes--;
-			}
-//printf(" j = %d\n",j);
-		}
-		/* Check for user abort */
-		if ((c = poll_con_char()) != 0 && p->uih[c] != ICOM_OK) {
-			p->cut = c;
-			p->lerr |= p->uih[c];
-		}
-	}
-
-	if (i <= 0)		/* Must have timed out */
-		p->lerr |= ICOM_TO; 
-
-#endif /* ENABLE_USB */
-
-	*rbuf = '\000';
-
-	if (p->debug) fprintf(stderr,"icoms: About to return read '%s' ICOM err 0x%x\n",icoms_fix(rrbuf),p->lerr);
-
-	return p->lerr;
-}
-
-/* - - - - - - - - - - - - - */
-/* USB control message - thread friendly */
-static int
-icoms_usb_control_th(
-icoms *p,
-int requesttype,		/* 8 bit request type (USB bmRequestType) */
-int request,			/* 8 bit request code (USB bRequest) */
-int value,				/* 16 bit value (USB wValue) */
-int index,				/* 16 bit index (USB wIndex) */
-unsigned char *rwbuf,	/* Write or read buffer */
-int rwsize, 			/* Bytes to read or write */
-double tout,			/* Timeout in seconds */
-int debug,				/* debug flag value */
-int *cut,				/* Character that caused termination */
-int checkabort) {		/* Check for abort from keyboard */
-	int lerr;			/* Last error */
-	int c, rwbytes;		/* Data bytes read or written */
-	long top;			/* timeout in msec */
-
-	if (debug) {
-		fprintf(stderr,"icoms: About to do control  %02x, %02x %04x %04x %04x\n",
-	                      requesttype, request, value, index, rwsize);
-		if ((requesttype & USB_ENDPOINT_IN) == 0) {
-			fprintf(stderr,"icoms: Writing control data %s\n",icoms_tohex(rwbuf, rwsize));
-		}
-	}
-
-	if (!p->is_open)
-		error("icoms_read: not initialised");
-
-	lerr = 0;
-	top = (int)(tout * 1000.0 + 0.5);		/* Timout in msec */
-
-#ifdef QUIET_MEMCHECKERS
-	if (requesttype & USB_ENDPOINT_IN)
-		memset(rwbuf, 0, rwsize);
-#endif
-
-#ifdef ENABLE_USB
-	rwbytes = icoms_usb_control_msg(p->usbh, requesttype, request, value, index,
-	                                    rwbuf, rwsize, top);
-	if (rwbytes < 0) {
-#ifdef USE_LIBUSB1
-		if (rwbytes != LIBUSB_ERROR_TIMEOUT)	/* Not a timeout */
-#else
-#if defined(UNIX)
-		if (rwbytes != 0 && rwbytes != -ETIMEDOUT)     /* Not a timeout */
-#else
-		if (rwbytes != -116)		/* Not a timeout */
-#endif /* UNIX */
-#endif
-		{
-			lerr |= ICOM_USBW; 
-		} else {
-			lerr |= ICOM_TO; 
-		}
-	} else if (rwbytes != rwsize) {
-		if (requesttype & USB_ENDPOINT_IN)	/* Device to host */
-			lerr |= ICOM_USBR;				/* Read error */ 
-		else
-			lerr |= ICOM_USBW; 				/* Write error */
-	}
-
-	if (checkabort) {
-		/* Check for user abort */
-		if ((c = poll_con_char()) != 0 && p->uih[c] != ICOM_OK) {
-			*cut = c;
-			lerr |= p->uih[c];
-//printf("~1 got for user abort with char 0x%x, code 0x%x\n",c,p->uih[c]);
-		}
-	}
-
-#else /* !ENABLE_USB */
-	lerr = ICOM_NOTS;
-#endif /* !ENABLE_USB */
-
-	if (debug && (requesttype & USB_ENDPOINT_IN))
-		fprintf(stderr,"icoms: Reading control data %s\n",icoms_tohex(rwbuf, rwsize));
-	if (debug) fprintf(stderr,"icoms: About to return control ICOM err 0x%x\n",lerr);
-
-	return lerr;
-}
-
-/* USB control message */
-/* Same as above, but set error state */
-static int
-icoms_usb_control(
-icoms *p,
-int requesttype,		/* 8 bit request type (USB bmRequestType) */
-int request,			/* 8 bit request code (USB bRequest) */
-int value,				/* 16 bit value (USB wValue) */
-int index,				/* 16 bit index (USB wIndex) */
-unsigned char *rwbuf,	/* Write or read buffer */
-int rwsize, 			/* Bytes to read or write */
-double tout) {
-	p->lerr = icoms_usb_control_th(p, requesttype, request, value, index, rwbuf, rwsize, tout,
-		                                                                 p->debug, &p->cut, 1);
-	return p->lerr;
-}
-
-/* - - - - - - - - - - - - - */
-/* USB Read  - thread friendly */
-/* Return error code (don't set error state). */
-/* Don't retry on a short read, return ICOM_SHORT. */
-static int
-icoms_usb_read_th(icoms *p,
-	void **hcancel,			/* Cancel handle */
-	int ep,					/* End point address */
-	unsigned char *rbuf,	/* Read buffer */
-	int bsize,				/* Bytes to read */
-	int *breadp,			/* Bytes read */
-	double tout,			/* Timeout in seconds */
-	int debug,				/* debug flag value */
-	int *cut,				/* Character that caused termination */
-	int checkabort			/* Check for abort from keyboard */
-) {
-	int lerr;				/* Last error */
-	int bread, qa;
-	long top;			/* Timeout period */
-	int bulk = 0;			/* nz if bulk rather than interrupt read */
-
-#ifdef QUIET_MEMCHECKERS
-	memset(rbuf, 0, bsize);
-#endif
-
-	if (!p->is_open)
-		error("icoms_usb_read: not initialised");
-
-	if (p->EPINFO(ep).valid == 0)
-		error("icoms_usb_read invalid end point 0x%02x",ep);
-
-	if (p->EPINFO(ep).type != ICOM_EP_TYPE_BULK
-	 && p->EPINFO(ep).type != ICOM_EP_TYPE_INTERRUPT)
-		error("icoms_usb_read unhandled end point type %d",p->EPINFO(ep).type);
-
-	if (p->EPINFO(ep).type == ICOM_EP_TYPE_BULK)
-		bulk = 1;
-
-//	qa = p->EPINFO(ep).packetsize;	/* For finer grained abort and partial reads */
-	qa = bsize;						/* For simpler tracing */
-
-	lerr = 0;
-	bread = 0;
-
-	top = (int)(tout * 1000 + 0.5);		/* Timeout period in msecs */
-
-#ifdef ENABLE_USB
-
-	/* Bug workaround - on some OS's for some devices */
-	if (p->uflags & icomuf_resetep_before_read) {
-		msec_sleep(1);		/* Let device recover ? */
-		p->usb_resetep(p, ep);
-		msec_sleep(1);		/* Let device recover (ie. Spyder 3) */
-	}
-
-	/* Until data is all read, we get a short read, we time out, or the user aborts */
-//printf("~1 usb_read of %d bytes, timout %f\n",bsize,tout);
-	while (bsize > 0) {
-		int c, rbytes;
-		int rsize = bsize > qa ? qa : bsize; 
-
-//printf("~1 read %d bytes this time\n",rsize);
-		if (bulk)
-			rbytes = icoms_usb_bulk_read(p->usbh, hcancel, ep, rbuf, rsize, top);
-		else
-			rbytes = icoms_usb_interrupt_read(p->usbh, hcancel, ep, rbuf, rsize, top);
-//printf("~1 got result %d\n",rbytes);
-		if (rbytes < 0) {
-#ifdef USE_LIBUSB1
-			if (rbytes == LIBUSB_ERROR_TIMEOUT) /* A timeout */
-#else
-#if defined(UNIX)
-			if (rbytes == -ETIMEDOUT)	/* A timeout */
-#else
-			if (rbytes == -116)			/* A timeout */
-#endif /* UNIX */
-#endif
-				lerr |= ICOM_TO; 
-			else
-				lerr |= ICOM_USBR; 
-			break;
-		} else {	/* Account for bytes read */
-			bsize -= rbytes;
-			rbuf += rbytes;
-			bread += rbytes;
-		}
-		if (rbytes != rsize) {
-			lerr |= ICOM_SHORT; 
-			break;
-		}
-		if (checkabort) {
-			/* Check for user abort */
-			if ((c = poll_con_char()) != 0 && p->uih[c] != ICOM_OK) {
-//printf("~1 got for user abort with char 0x%x, code 0x%x\n",c,p->uih[c]);
-				*cut = c;
-				lerr |= p->uih[c];
-			}
-		}
-	}
-
-	if (breadp != NULL)
-		*breadp = bread;
-
-//printf("~1 about to return 0x%x\n",lerr);
-
-#else /* !ENABLE_USB */
-	lerr = ICOM_NOTS;
-#endif /* !ENABLE_USB */
-
-	if (debug) fprintf(stderr,"icoms: About to return usb read %d bytes, ICOM err 0x%x\n",bread, lerr);
-
-	return lerr;
-}
-
-/* USB Read */
-/* Same as above, but set error state */
-static int
-icoms_usb_read(
-	icoms *p,
-	int ep,					/* End point address */
-	unsigned char *rbuf,	/* Read buffer */
-	int rsize,				/* Bytes to read */
-	int *bread,				/* Bytes read */
-	double tout				/* Timeout in seconds */
-) {
-	p->lerr = icoms_usb_read_th(p, NULL, ep, rbuf, rsize, bread, tout, p->debug, &p->cut, 1);
-
-	return p->lerr;
-}
-
-/* - - - - - - - - - - - - - */
-
-/* USB Write  - thread friendly */
-/* Return error code (don't set error state). */
-/* Don't retry on a short read, return ICOM_SHORT. */
-static int
-icoms_usb_write_th(icoms *p,
-	void **hcancel,			/* Cancel handle */
-	int ep,					/* End point address */
-	unsigned char *wbuf,	/* Write buffer */
-	int bsize,				/* Bytes to write */
-	int *bwrittenp,			/* Bytes written */
-	double tout,			/* Timeout in seconds */
-	int debug,				/* debug flag value */
-	int *cut,				/* Character that caused termination */
-	int checkabort			/* Check for abort from keyboard */
-) {
-	int lerr;				/* Last error */
-	int bwritten, qa;
-	long top;				/* Timout timeout period */
-	int bulk = 0;			/* nz if bulk rather than interrupt read */
-
-	if (!p->is_open)
-		error("icoms_usb_write: not initialised");
-
-	if (p->EPINFO(ep).valid == 0)
-		error("icoms_usb_write invalid end point 0x%02x",ep);
-
-	if (p->EPINFO(ep).type != ICOM_EP_TYPE_BULK
-	 && p->EPINFO(ep).type != ICOM_EP_TYPE_INTERRUPT)
-		error("icoms_usb_write unhandled end point type %d",p->EPINFO(ep).type);
-
-	if (p->EPINFO(ep).type == ICOM_EP_TYPE_BULK)
-		bulk = 1;
-
-//	qa = p->EPINFO(ep).packetsize;	/* For finer grained abort and partial reads */
-	qa = bsize;						/* For simpler tracing */
-
-	lerr = 0;
-	bwritten = 0;
-
-	top = (int)(tout * 1000 + 0.5);		/* Timeout period in msecs */
-
-#ifdef ENABLE_USB
-
-	/* Until data is all written, we get a short write, we time out, or the user aborts */
-	while (bsize > 0) {
-		int c, wbytes;
-		int wsize = bsize > qa ? qa : bsize; 
-
-		if (bulk)
-			wbytes = icoms_usb_bulk_write(p->usbh, hcancel, ep, wbuf, wsize, top);
-		else
-			wbytes = icoms_usb_interrupt_write(p->usbh, hcancel, ep, wbuf, wsize, top);
-		if (wbytes < 0) {
-#ifdef USE_LIBUSB1
-			if (wbytes == LIBUSB_ERROR_TIMEOUT)	/* A timeout */
-#else
-#if defined(UNIX)
-			if (wbytes == -ETIMEDOUT)	/* A timeout */
-#else
-			if (wbytes == -116)			/* A timeout */
-#endif /* UNIX */
-#endif
-				lerr |= ICOM_TO; 
-			else
-				lerr |= ICOM_USBR; 
-			break;
-		} else {	/* Account for bytes written */
-			bsize -= wbytes;
-			wbuf += wbytes;
-			bwritten += wbytes;
-		}
-		if (wbytes != wsize) {
-			lerr |= ICOM_SHORT; 
-			break;
-		}
-		if (checkabort) {
-			/* Check for user abort */
-			if ((c = poll_con_char()) != 0 && p->uih[c] != ICOM_OK) {
-				*cut = c;
-				lerr |= p->uih[c];
-			}
-		}
-	}
-
-	if (bwrittenp != NULL)
-		*bwrittenp = bwritten;
-
-#else /* !ENABLE_USB */
-	lerr = ICOM_NOTS;
-#endif /* !ENABLE_USB */
-
-	if (debug) fprintf(stderr,"icoms: About to return usb write %d bytes, ICOM err 0x%x\n",bwritten, lerr);
-
-	return lerr;
-}
-
-/* USB Write */
-/* Same as above, but set error state */
-static int
-icoms_usb_write(
-	icoms *p,
-	int ep,					/* End point address */
-	unsigned char *wbuf,	/* Read buffer */
-	int wsize,				/* Bytes to write */
-	int *bwritten,			/* Bytes written */
-	double tout				/* Timeout in seconds */
-) {
-	p->lerr = icoms_usb_write_th(p, NULL, ep, wbuf, wsize, bwritten, tout, p->debug, &p->cut, 1);
-	return p->lerr;
-}
-
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Cancel i/o in another thread */
-/* NOTE this should reall be protected by a lock. */
-int icoms_usb_cancel_io(
-	icoms *p,
-	void *hcancel
-) {
-	int rv = 0;
-#ifdef USE_LIBUSB1
-	if (hcancel != NULL)
-		rv = libusb_cancel_transfer((struct libusb_transfer *)hcancel);
-#else
-	msec_sleep(1);		/* Let device recover ? */
-	rv = usb_resetep(p->usbh, (int)hcancel);	/* Not reliable ? */
-	msec_sleep(1);		/* Let device recover ? */
-#endif
-
-	if (rv == 0)
-		return ICOM_OK;
-
-	return ICOM_USBW;
-}
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Reset and end point data toggle to 0 */
-int icoms_usb_resetep(
-	icoms *p,
-	int ep					/* End point address */
-) {
-	int rv;
-#ifdef USE_LIBUSB1
-	rv = libusb_resetep(p->usbh, (unsigned char)ep);		/* Is this the same though ? */
-#else
-	rv = usb_resetep(p->usbh, ep);			/* Not reliable ? */
-#endif
-
-	if (rv == 0)
-		return ICOM_OK;
-
-	return ICOM_USBW;
-}
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* Clear a halt on an end point */
-int icoms_usb_clearhalt(
-	icoms *p,
-	int ep					/* End point address */
-) {
-	int rv;
-#ifdef USE_LIBUSB1
-	rv = libusb_clear_halt(p->usbh, (unsigned char)ep);
-#else
-	rv = usb_clear_halt(p->usbh, ep);
-#endif
-
-	if (rv == 0)
-		return ICOM_OK;
-
-	return ICOM_USBW;
-}
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - */
-/* write and read */
-static int
-icoms_write_read(
-icoms *p,
-char *wbuf,			/* Write puffer */
-char *rbuf,			/* Read buffer */
-int bsize,			/* Buffer size */
-char tc,			/* Terminating characer */
-int ntc,			/* Number of terminating characters */
-double tout
-) {
-	int xuserm = 0;			/* User flags from transmit operation */
-	if (p->debug) fprintf(stderr,"\nicoms: Write_Read called with '%s'\n",icoms_fix(wbuf));
-
-	p->lerr = 0;
-
-	/* Flush any stray chars */
-	/* (This doesn't work on USB because of libusb's problems with timeouts */
-	if (!p->is_usb) {
-		for (p->lerr = 0;;) {	/* Until we get a timeout */
-			int debug = p->debug; p->debug = 0;
-			p->read(p, rbuf, bsize, '\000', 100000, 0.01);
-			p->debug = debug;
-			if (p->lerr != 0)
-				break;				/* Expect timeout with nothing to read */
-		}
-		if (p->lerr & ICOM_USERM) {
-			return p->lerr;			/* We got a user interrupt */
-		}
-		p->lerr = 0;
-	}
-
-	/* Write the write data */
-	p->write(p, wbuf, tout);
-
-	/* Return error if coms error or user abort. Save error if user terminate or command */
-	if ((p->lerr & ~ICOM_USERM) != ICOM_OK || (p->lerr & ICOM_USERM) == ICOM_USER) {
-		if (p->debug) fprintf(stderr,"icoms: Write_Read Write failed - returning 0x%x\n",p->lerr);
-		return p->lerr;
-	} else {
-		xuserm = (p->lerr & ICOM_USERM);
-	}
-
-	/* Read response */
-	p->read(p, rbuf, bsize, tc, ntc, tout);
-	if (p->debug) {
-		if (p->lerr != 0)
-			fprintf(stderr,"icoms: Write_Read Write failed - returning 0x%x\n",p->lerr);
-		else
-			fprintf(stderr,"icoms: Write_Read Write_Read success, returning '%s'\n",icoms_fix(rbuf));
-	}
-	if (p->lerr == ICOM_OK && xuserm != ICOM_OK)
-		return xuserm;
-
-	return p->lerr;
-}
-
-/* ------------------------------------------------- */
-/* Set the usb port number and characteristics. */
-/* This may be called to re-establish a connection that has failed */
-static void
-icoms_set_usb_port(
-icoms *p, 
-int    port,			/* USB com port, 1 - N, 0 for no change. */
-int    config,			/* Configuration */
-int    wr_ep,			/* "Serial" Write end point */
-int    rd_ep,			/* "Serial" Read end point */
-icomuflags usbflags,	/* Any special handling flags */
-int retries,			/* > 0 if we should retry set_configuration (100msec) */ 
-char **pnames			/* List of process names to try and kill before opening */
-) {
-	if (p->debug) fprintf(stderr,"icoms: About to set usb port characteristics\n");
-
-	if (p->is_open) 
-		p->close_port(p);
-
-	if (p->is_usb_portno(p, port) != instUnknown) {
-
-		usb_open_port(p, port, config, wr_ep, rd_ep, usbflags, retries, pnames);
-
-		p->write = icoms_usb_ser_write;
-		p->read = icoms_usb_ser_read;
-
-	}
-	if (p->debug) fprintf(stderr,"icoms: usb port characteristics set ok\n");
-
-	// ~~~999
-//	if (p->debug)
-//		usb_set_debug(p->debug);
-}
-
-/* Reset user interrupt handling to default (Esc, ^C, q or 'Q' = Abort) */
-static void icoms_reset_uih(
-icoms *p
-) {
-	int i;
-
-	for (i = 0; i < 255; i++)
-		p->uih[i] = ICOM_OK;
-
-	p->uih[0x1b] = ICOM_USER;	/* Escape */
-	p->uih['q']  = ICOM_USER;	/* q */
-	p->uih['Q']  = ICOM_USER;	/* Q */
-	p->uih[0x03] = ICOM_USER;	/* ^C */
-}
-
-/* Set a key range to the given handling type */
-/* min & max are between 0 and 255, status is one of */
-static void icoms_set_uih(
-icoms *p,
-int min,		/* Start key code */
-int max,		/* End key code (inclusive) */
-int status		/* ICOM_OK, ICOM_USER, ICOM_TERM, ICOM_TRIG, ICOM_CMND */
-) {
-	int i;
-
-	if (min < 0)
-		min = 0;
-	else if (min > 255)
-		min = 255;
-	if (max < 0)
-		max = 0;
-	else if (max > 255)
-		max = 255;
-
-	if (status != ICOM_OK
-	 && status != ICOM_USER
-	 && status != ICOM_TERM
-	 && status != ICOM_TRIG
-	 && status != ICOM_CMND)
-		status = ICOM_OK;
-
-	for (i = min; i <= max; i++) {
-		p->uih[i] = status;
-	}
-}
-
-/* Get the character that caused the user interrupt */
-/* Clear it to 0x00 after reading it */
-static int icoms_get_uih_char(icoms *p) {
-	int c = p->cut;
-	p->cut = 0;
-	return c;
-}
-
-
-/* Poll for a user abort, terminate, trigger or command. */
-/* Wait for a key rather than polling, if wait != 0 */
-/* Return: */
-/* ICOM_OK if no key was hit or the key has no meaning. */
-/* ICOM_USER if User abort has been hit, */
-/* ICOM_TERM if User terminate has been hit. */
-/* ICOM_TRIG if User trigger has been hit */
-/* ICOM_CMND if User command has been hit */
-int icoms_poll_user(icoms *p, int wait) {
-	int c;
-
-	if (wait) {
-		int rv;
-		for (;;) {
-			c = next_con_char();
-			p->cut = c;
-			rv = p->uih[c];
-			if (rv != ICOM_OK)
-				return rv;
-		}
-	} else {
-		c = poll_con_char();
-		if (c != 0) {
-			p->cut = c;
-			return p->uih[c];
-		}
-	}
-	return ICOM_OK;
-}
-
-/* ---------------------------------------------------------------------------------*/
-
-/* Set the USB specific icoms methods */
-void usb_set_usb_methods(
-icoms *p
-) {
-	p->write_read    = icoms_write_read;
-
-	p->reset_uih     = icoms_reset_uih;
-	p->set_uih       = icoms_set_uih;
-	p->get_uih_char  = icoms_get_uih_char;
-
-	p->is_usb_portno  = usb_is_usb_portno;
-	p->set_usb_port   = icoms_set_usb_port;
-	p->usb_control_th = icoms_usb_control_th;
-	p->usb_control    = icoms_usb_control;
-	p->usb_read_th    = icoms_usb_read_th;
-	p->usb_read       = icoms_usb_read;
-	p->usb_write_th   = icoms_usb_write_th;
-	p->usb_write      = icoms_usb_write;
-	p->usb_cancel_io  = icoms_usb_cancel_io;
-	p->usb_resetep    = icoms_usb_resetep;
-	p->usb_clearhalt  = icoms_usb_clearhalt;
-
-	icoms_reset_uih(p);
-}
-
-/* ---------------------------------------------------------------------------------*/
-/* utilities */
-
-/* Emit a "normal" beep */
-void normal_beep() {
-	/* 0msec delay, 1.0KHz for 200 msec */
-	msec_beep(0, 1000, 200);
-}
-
-/* Emit a "good" beep */
-void good_beep() {
-	/* 0msec delay, 1.2KHz for 200 msec */
-	msec_beep(0, 1200, 200);
-}
-
-/* Emit a "bad" double beep */
-void bad_beep() {
-	/* 0msec delay, 800Hz for 200 msec */
-	msec_beep(0, 800, 200);
-	/* 500msec delay, 800Hz for 200 msec */
-	msec_beep(350, 800, 200);
-}
-
-/* Convert control chars to ^[A-Z] notation in a string */
-char *
-icoms_fix(char *ss) {
-	static unsigned char buf[1005];
-	unsigned char *d;
-	unsigned char *s = (unsigned char *)ss;
-	for(d = buf; (d - buf) < 1000;) {
-		if (*s < ' ' && *s > '\000') {
-			*d++ = '^';
-			*d++ = *s++ + '@';
-		} else if (*s >= 0x80) {
-			*d++ = '\\';
-			*d++ = '0' + ((*s >> 6) & 0x3);
-			*d++ = '0' + ((*s >> 3) & 0x7);
-			*d++ = '0' + ((*s++ >> 0) & 0x7);
-		} else {
-			*d++ = *s++;
-		}
-		if (s[-1] == '\000')
-			break;
-	}
-	*d++ = '.';
-	*d++ = '.';
-	*d++ = '.';
-	*d++ = '\000';
-	return (char *)buf;
-}
-
-/* Convert a limited binary buffer to a list of hex */
-char *
-icoms_tohex(unsigned char *s, int len) {
-	static char buf[64 * 3 + 10];
-	int i;
-	char *d;
-
-	buf[0] = '\000';
-	for(i = 0, d = buf; i < 64 && i < len; i++, s++) {
-		sprintf(d, "%s%02x", i > 0 ? " " : "", *s);
-		d += strlen(d);
-	}
-	if (i < len)
-		sprintf(d, " ...");
-
-	return buf;
-}
-
-/* ---------------------------------------------------------------------------------*/

=== removed directory '.pc/04_CVE-2012-4405.diff'
=== removed directory '.pc/04_CVE-2012-4405.diff/icc'
=== removed file '.pc/04_CVE-2012-4405.diff/icc/icc.c'
--- .pc/04_CVE-2012-4405.diff/icc/icc.c	2012-09-11 13:45:12 +0000
+++ .pc/04_CVE-2012-4405.diff/icc/icc.c	1970-01-01 00:00:00 +0000
@@ -1,17408 +0,0 @@
-
-/* 
- * International Color Consortium Format Library (icclib)
- * For ICC profile version 3.4
- *
- * Author:  Graeme W. Gill
- * Date:    2002/04/22
- * Version: 2.13
- *
- * Copyright 1997 - 2012 Graeme W. Gill
- *
- * This material is licensed with an "MIT" free use license:-
- * see the License.txt file in this directory for licensing details.
- */
-
-/*
- * TTBD:
- *
- *      Add a "warning mode" to file reading, in which file format
- *      errors are ignored where possible, rather than generating
- *      a fatal error (see ICM_STRICT #define).
- *
- *      NameColor Dump doesn't handle device space correctly - 
- *	    should use appropriate interpretation in case device is Lab etc.
- *
- *      Should recognise & honour unicode 0xFFFE endian marker.
- *      Should generate it on writing too ?
- *
- *      Add support for copying tags from one icc to another.
- *
- *		Should fix all write_number failure errors to indicate failed value.
- *		(Partially implemented - need to check all write_number functions)
- *
- *		Make write fail error messages be specific on which element failed.
- *
- *		Should add named color space lookup function support.
- *
- *      Would be nice to add generic ability to add new tag type handling,
- *      so that the base library doesn't need to be modified (ie. VideoCardGamma) ?
- *
- *		Need to add DeviceSettings and OutputResponse tags to bring up to
- *		ICC.1:1998-09 [started but not complete]
- *
- */
-
-#undef ICM_STRICT	/* Not fully implimented - switch off strict checking of file format */
-
-/*  Make the default grid points of the Lab clut be symetrical about */
-/* a/b 0.0, and also make L = 100.0 fall on a grid point. */
-#define SYMETRICAL_DEFAULT_LAB_RANGE
-
-#define _ICC_C_				/* Turn on implimentation code */
-
-#undef DEBUG_SETLUT			/* Show each value being set in setting lut contents */
-#undef DEBUG_SETLUT_CLIP		/* Show clipped values when setting LUT */
-#undef DEBUG_LULUT			/* Show each value being looked up from lut contents */
-#undef DEBUG_LLULUT			/* Debug individual lookup steps (not fully implemented) */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <ctype.h>
-#include <math.h>
-#include <time.h>
-#ifdef __sun
-#include <unistd.h>
-#endif
-#if defined(__IBMC__) && defined(_M_IX86)
-#include <float.h>
-#endif
-#include "icc.h"
-
-#ifdef _MSC_VER
-#define vsnprintf _vsnprintf
-#define snprintf _snprintf
-#endif
-
-/* ========================================================== */
-/* Default system interface object implementations */
-
-#ifndef SEPARATE_STD
-#define COMBINED_STD
-
-#include "iccstd.c"
-
-#undef COMBINED_STD
-#endif /* SEPARATE_STD */
-
-/* Forced byte alignment for tag table and tags */
-#define ALIGN_SIZE 4
-
-/* =========================================================== */
-
-#ifdef DEBUG_SETLUT
-#undef DBGSL
-#define DBGSL(xxx) printf xxx ;
-#else
-#undef DBGSL
-#define DBGSL(xxx) 
-#endif
-
-#if defined(DEBUG_SETLUT) || defined(DEBUG_SETLUT_CLIP)
-#undef DBGSLC
-#define DBGSLC(xxx) printf xxx ;
-#else
-#undef DBGSLC
-#define DBGSLC(xxx) 
-#endif
-
-#ifdef DEBUG_LULUT
-#undef DBGLL
-#define DBGLL(xxx) printf xxx ;
-#else
-#undef DBGLL
-#define DBGLL(xxx) 
-#endif
-
-#ifdef DEBUG_LLULUT
-#undef DBLLL
-#define DBLLL(xxx) printf xxx ;
-#else
-#undef DBLLL
-#define DBLLL(xxx) 
-#endif
-
-/* =========================================================== */
-/* Overflow protected unsigned int arithmatic functions. */
-/* These functions saturate rather than wrapping around. */
-/* (Divide doesn't need protection) */
-/* They return UINT_MAX if there was an overflow */
-
-/* a + b */
-static unsigned int sat_add(unsigned int a, unsigned int b) {
-	if (b > (UINT_MAX - a))
-		return UINT_MAX;
-	return a + b;
-}
-
-/* a - b */
-static unsigned int sat_sub(unsigned int a, unsigned int b) {
-	if (a < b)
-		return UINT_MAX;
-	return a - b;
-}
-
-/* a * b */
-static unsigned int sat_mul(unsigned int a, unsigned int b) {
-	unsigned int c;
-
-	if (a == 0 || b == 0)
-		return 0;
-
-	if (a > (UINT_MAX/b))
-		return UINT_MAX;
-	else
-		return a * b;
-}
-
-/* A + B + C */
-#define sat_addadd(A, B, C) sat_add(A, sat_add(B, C))
-
-/* A + B * C */
-#define sat_addmul(A, B, C) sat_add(A, sat_mul(B, C))
-
-/* A + B + C * D */
-#define sat_addaddmul(A, B, C, D) sat_add(A, sat_add(B, sat_mul(C, D)))
-
-/* A * B * C */
-#define sat_mul3(A, B, C) sat_mul(A, sat_mul(B, C))
-
-/* a ^ b */
-static unsigned int sat_pow(unsigned int a, unsigned int b) {
-	unsigned int c = 1;
-	for (; b > 0; b--) {
-		c = sat_mul(c, a);
-		if (c == UINT_MAX)
-			break;
-	}
-	return c;
-}
-
-/* Alignment */
-static unsigned int sat_align(unsigned int align_size, unsigned int a) {
-	align_size--;
-
-	if (align_size > (UINT_MAX - a))
-		return UINT_MAX;
-
-	return (a + align_size) & ~align_size;
-}
-
-/* These test functions detect whether an overflow would occur */
-
-/* Return nz if add would overflow */
-static int ovr_add(unsigned int a, unsigned int b) {
-
-	if (b > (UINT_MAX - a))
-		return 1;
-	return 0;
-}
-
-/* Return nz if sub would overflow */
-static int ovr_sub(unsigned int a, unsigned int b) {
-	if (a < b)
-		return 1;
-	return 0;
-}
-
-/* Return nz if mult would overflow */
-static int ovr_mul(unsigned int a, unsigned int b) {
-	if (a > (UINT_MAX/b))
-		return 1;
-	return 0;
-}
-
-
-/* size_t versions of saturating arithmatic */
-
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t)(-1))
-#endif
-
-/* a + b */
-static size_t ssat_add(size_t a, size_t b) {
-	if (b > (SIZE_MAX - a))
-		return SIZE_MAX;
-	return a + b;
-}
-
-/* a - b */
-static size_t ssat_sub(size_t a, size_t b) {
-	if (a < b)
-		return SIZE_MAX;
-	return a - b;
-}
-
-/* a * b */
-static size_t ssat_mul(size_t a, size_t b) {
-	size_t c;
-
-	if (a == 0 || b == 0)
-		return 0;
-
-	if (a > (SIZE_MAX/b))
-		return SIZE_MAX;
-	else
-		return a * b;
-}
-
-/* ------------------------------------------------- */
-/* Memory image icmFile compatible class */
-/* Buffer is assumed to be a fixed size, and externally allocated */
-/* Writes therefore don't expand the buffer. */
-
-/* Get the size of the file (Only valid for reading file). */
-static size_t icmFileMem_get_size(icmFile *pp) {
-	return pp->size;
-}
-
-/* Set current position to offset. Return 0 on success, nz on failure. */
-static int icmFileMem_seek(
-icmFile *pp,
-unsigned int offset
-) {
-	icmFileMem *p = (icmFileMem *)pp;
-	unsigned char *np;
-
-	np = p->start + offset;
-	if (np < p->start || np >= p->end)
-		return 1;
-	p->cur = np;
-	return 0;
-}
-
-/* Read count items of size length. Return number of items successfully read. */
-static size_t icmFileMem_read(
-icmFile *pp,
-void *buffer,
-size_t size,
-size_t count
-) {
-	icmFileMem *p = (icmFileMem *)pp;
-	size_t len;
-
-	len = ssat_mul(size, count);
-	if (len > (p->end - p->cur)) { /* Too much */
-		if (size > 0)
-			count = (p->end - p->cur)/size;
-		else
-			count = 0;
-	}
-	len = size * count;
-	if (len > 0)
-		memmove(buffer, p->cur, len);
-	p->cur += len;
-	return count;
-}
-
-/* write count items of size length. Return number of items successfully written. */
-static size_t icmFileMem_write(
-icmFile *pp,
-void *buffer,
-size_t size,
-size_t count
-) {
-	icmFileMem *p = (icmFileMem *)pp;
-	size_t len;
-
-	len = ssat_mul(size, count);
-	if (len > (p->end - p->cur)) { /* Too much */
-		if (size > 0)
-			count = (p->end - p->cur)/size;
-		else
-			count = 0;
-	}
-	len = size * count;
-	if (len > 0)
-		memmove(p->cur, buffer, len);
-	p->cur += len;
-	return count;
-}
-
-/* do a printf */
-static int icmFileMem_printf(
-icmFile *pp,
-const char *format,
-...
-) {
-	int rv;
-	va_list args;
-	icmFileMem *p = (icmFileMem *)pp;
-
-	va_start(args, format);
-
-#if ((defined(__IBMC__) || defined(__BORLANDC__)) && defined(_M_IX86))
-	rv = vsprintf((char *)p->cur, format, args);	/* This could overwrite the buffer !!! */
-#else
-	rv = vsnprintf((char *)p->cur, (p->end - p->cur), format, args);
-#endif
-
-	va_end(args);
-	return rv;
-}
-
-
-/* flush all write data out to secondary storage. Return nz on failure. */
-static int icmFileMem_flush(
-icmFile *pp
-) {
-	return 0;
-}
-
-/* we're done with the file object, return nz on failure */
-static int icmFileMem_delete(
-icmFile *pp
-) {
-	icmFileMem *p = (icmFileMem *)pp;
-	icmAlloc *al = p->al;
-	int del_al   = p->del_al;
-
-	if (p->del_buf)		/* Free the memory buffer */
-		al->free(al, p->start);
-	al->free(al, p);	/* Free object */
-	if (del_al)			/* We are responsible for deleting allocator */
-		al->del(al);
-	return 0;
-}
-
-/* Create a memory image file access class with allocator */
-/* Buffer is used as is. */
-icmFile *new_icmFileMem_a(
-void *base,			/* Pointer to base of memory buffer */
-size_t length,		/* Number of bytes in buffer */
-icmAlloc *al		/* heap allocator */
-) {
-	icmFileMem *p;
-
-	if ((p = (icmFileMem *) al->calloc(al, 1, sizeof(icmFileMem))) == NULL) {
-		return NULL;
-	}
-	p->al       = al;				/* Heap allocator */
-	p->get_size = icmFileMem_get_size;
-	p->seek     = icmFileMem_seek;
-	p->read     = icmFileMem_read;
-	p->write    = icmFileMem_write;
-	p->gprintf  = icmFileMem_printf;
-	p->flush    = icmFileMem_flush;
-	p->del      = icmFileMem_delete;
-
-	p->start = (unsigned char *)base;
-	p->cur = p->start;
-	p->end = p->start + length;
-
-	p->size = length;
-
-	return (icmFile *)p;
-}
-
-/* Create a memory image file access class with given allocator */
-/* and delete base when icmFile is deleted. */
-icmFile *new_icmFileMem_ad(void *base, size_t length, icmAlloc *al) {
-	icmFile *fp;
-
-	if ((fp = new_icmFileMem_a(base, length, al)) != NULL) {	
-		((icmFileMem *)fp)->del_buf = 1;
-	}
-
-	return fp;
-}
-
-/* ========================================================== */
-/* Conversion support functions */
-/* Convert between ICC storage types and native C types */
-/* Write routine return non-zero if numbers can't be represented */
-
-/* Unsigned */
-static unsigned int read_UInt8Number(char *p) {
-	unsigned int rv;
-	rv = (unsigned int)((ORD8 *)p)[0];
-	return rv;
-}
-
-static int write_UInt8Number(unsigned int d, char *p) {
-	if (d > 255)
-		return 1;
-	((ORD8 *)p)[0] = (ORD8)d;
-	return 0;
-}
-
-static unsigned int read_UInt16Number(char *p) {
-	unsigned int rv;
-	rv = 256 * (unsigned int)((ORD8 *)p)[0]
-	   +       (unsigned int)((ORD8 *)p)[1];
-	return rv;
-}
-
-static int write_UInt16Number(unsigned int d, char *p) {
-	if (d > 65535)
-		return 1;
-	((ORD8 *)p)[0] = (ORD8)(d >> 8);
-	((ORD8 *)p)[1] = (ORD8)(d);
-	return 0;
-}
-
-static unsigned int read_UInt32Number(char *p) {
-	unsigned int rv;
-	rv = 16777216 * (unsigned int)((ORD8 *)p)[0]
-	   +    65536 * (unsigned int)((ORD8 *)p)[1]
-	   +      256 * (unsigned int)((ORD8 *)p)[2]
-	   +            (unsigned int)((ORD8 *)p)[3];
-	return rv;
-}
-
-static int write_UInt32Number(unsigned int d, char *p) {
-	((ORD8 *)p)[0] = (ORD8)(d >> 24);
-	((ORD8 *)p)[1] = (ORD8)(d >> 16);
-	((ORD8 *)p)[2] = (ORD8)(d >> 8);
-	((ORD8 *)p)[3] = (ORD8)(d);
-	return 0;
-}
-
-static void read_UInt64Number(icmUint64 *d, char *p) {
-	d->h = 16777216 * (unsigned int)((ORD8 *)p)[0]
-	     +    65536 * (unsigned int)((ORD8 *)p)[1]
-	     +      256 * (unsigned int)((ORD8 *)p)[2]
-	     +            (unsigned int)((ORD8 *)p)[3];
-	d->l = 16777216 * (unsigned int)((ORD8 *)p)[4]
-	     +    65536 * (unsigned int)((ORD8 *)p)[5]
-	     +      256 * (unsigned int)((ORD8 *)p)[6]
-	     +            (unsigned int)((ORD8 *)p)[7];
-}
-
-static int write_UInt64Number(icmUint64 *d, char *p) {
-	((ORD8 *)p)[0] = (ORD8)(d->h >> 24);
-	((ORD8 *)p)[1] = (ORD8)(d->h >> 16);
-	((ORD8 *)p)[2] = (ORD8)(d->h >> 8);
-	((ORD8 *)p)[3] = (ORD8)(d->h);
-	((ORD8 *)p)[4] = (ORD8)(d->l >> 24);
-	((ORD8 *)p)[5] = (ORD8)(d->l >> 16);
-	((ORD8 *)p)[6] = (ORD8)(d->l >> 8);
-	((ORD8 *)p)[7] = (ORD8)(d->l);
-	return 0;
-}
-
-static double read_U8Fixed8Number(char *p) {
-	ORD32 o32;
-	o32 = 256 * (ORD32)((ORD8 *)p)[0]		/* Read big endian 16 bit unsigned */
-        +       (ORD32)((ORD8 *)p)[1];
-	return (double)o32/256.0;
-}
-
-static int write_U8Fixed8Number(double d, char *p) {
-	ORD32 o32;
-	d = d * 256.0 + 0.5;
-	if (d >= 65536.0)
-		return 1;
-	if (d < 0.0)
-		return 1;
-	o32 = (ORD32)d;
-	((ORD8 *)p)[0] = (ORD8)((o32) >> 8);
-	((ORD8 *)p)[1] = (ORD8)((o32));
-	return 0;
-}
-
-static double read_U16Fixed16Number(char *p) {
-	ORD32 o32;
-	o32 = 16777216 * (ORD32)((ORD8 *)p)[0]		/* Read big endian 32 bit unsigned */
-        +    65536 * (ORD32)((ORD8 *)p)[1]
-	    +      256 * (ORD32)((ORD8 *)p)[2]
-	    +            (ORD32)((ORD8 *)p)[3];
-	return (double)o32/65536.0;
-}
-
-static int write_U16Fixed16Number(double d, char *p) {
-	ORD32 o32;
-	d = d * 65536.0 + 0.5;
-	if (d >= 4294967296.0)
-		return 1;
-	if (d < 0.0)
-		return 1;
-	o32 = (ORD32)d;
-	((ORD8 *)p)[0] = (ORD8)((o32) >> 24);
-	((ORD8 *)p)[1] = (ORD8)((o32) >> 16);
-	((ORD8 *)p)[2] = (ORD8)((o32) >> 8);
-	((ORD8 *)p)[3] = (ORD8)((o32));
-	return 0;
-}
-
-
-/* Signed numbers */
-static int read_SInt8Number(char *p) {
-	int rv;
-	rv = (int)((INR8 *)p)[0];
-	return rv;
-}
-
-static int write_SInt8Number(int d, char *p) {
-	if (d > 127)
-		return 1;
-	else if (d < -128)
-		return 1;
-	((INR8 *)p)[0] = (INR8)d;
-	return 0;
-}
-
-static int read_SInt16Number(char *p) {
-	int rv;
-	rv = 256 * (int)((INR8 *)p)[0]
-	   +       (int)((ORD8 *)p)[1];
-	return rv;
-}
-
-static int write_SInt16Number(int d, char *p) {
-	if (d > 32767)
-		return 1;
-	else if (d < -32768)
-		return 1;
-	((INR8 *)p)[0] = (INR8)(d >> 8);
-	((ORD8 *)p)[1] = (ORD8)(d);
-	return 0;
-}
-
-static int read_SInt32Number(char *p) {
-	int rv;
-	rv = 16777216 * (int)((INR8 *)p)[0]
-	   +    65536 * (int)((ORD8 *)p)[1]
-	   +      256 * (int)((ORD8 *)p)[2]
-	   +            (int)((ORD8 *)p)[3];
-	return rv;
-}
-
-static int write_SInt32Number(int d, char *p) {
-	((INR8 *)p)[0] = (INR8)(d >> 24);
-	((ORD8 *)p)[1] = (ORD8)(d >> 16);
-	((ORD8 *)p)[2] = (ORD8)(d >> 8);
-	((ORD8 *)p)[3] = (ORD8)(d);
-	return 0;
-}
-
-static void read_SInt64Number(icmInt64 *d, char *p) {
-	d->h = 16777216 * (int)((INR8 *)p)[0]
-	     +    65536 * (int)((ORD8 *)p)[1]
-	     +      256 * (int)((ORD8 *)p)[2]
-	     +            (int)((ORD8 *)p)[3];
-	d->l = 16777216 * (unsigned int)((ORD8 *)p)[4]
-	     +    65536 * (unsigned int)((ORD8 *)p)[5]
-	     +      256 * (unsigned int)((ORD8 *)p)[6]
-	     +            (unsigned int)((ORD8 *)p)[7];
-}
-
-static int write_SInt64Number(icmInt64 *d, char *p) {
-	((INR8 *)p)[0] = (INR8)(d->h >> 24);
-	((ORD8 *)p)[1] = (ORD8)(d->h >> 16);
-	((ORD8 *)p)[2] = (ORD8)(d->h >> 8);
-	((ORD8 *)p)[3] = (ORD8)(d->h);
-	((ORD8 *)p)[4] = (ORD8)(d->l >> 24);
-	((ORD8 *)p)[5] = (ORD8)(d->l >> 16);
-	((ORD8 *)p)[6] = (ORD8)(d->l >> 8);
-	((ORD8 *)p)[7] = (ORD8)(d->l);
-	return 0;
-}
-
-static double read_S15Fixed16Number(char *p) {
-	INR32 i32;
-	i32 = 16777216 * (INR32)((INR8 *)p)[0]		/* Read big endian 32 bit signed */
-        +    65536 * (INR32)((ORD8 *)p)[1]
-	    +      256 * (INR32)((ORD8 *)p)[2]
-	    +            (INR32)((ORD8 *)p)[3];
-	return (double)i32/65536.0;
-}
-
-static int write_S15Fixed16Number(double d, char *p) {
-	INR32 i32;
-	d = floor(d * 65536.0 + 0.5);		/* Beware! (int)(d + 0.5) doesn't work! */
-	if (d >= 2147483648.0)
-		return 1;
-	if (d < -2147483648.0)
-		return 1;
-	i32 = (INR32)d;
-	((INR8 *)p)[0] = (INR8)((i32) >> 24);		/* Write big endian 32 bit signed */
-	((ORD8 *)p)[1] = (ORD8)((i32) >> 16);
-	((ORD8 *)p)[2] = (ORD8)((i32) >> 8);
-	((ORD8 *)p)[3] = (ORD8)((i32));
-	return 0;
-}
-
-/* Device coordinate as 8 bit value range 0.0 - 1.0 */
-static double read_DCS8Number(char *p) {
-	unsigned int rv;
-	rv =   (unsigned int)((ORD8 *)p)[0];
-	return (double)rv/255.0;
-}
-
-static int write_DCS8Number(double d, char *p) {
-	ORD32 o32;
-	d = d * 255.0 + 0.5;
-	if (d >= 256.0)
-		return 1;
-	if (d < 0.0)
-		return 1;
-	o32 = (ORD32)d;
-	((ORD8 *)p)[0] = (ORD8)(o32);
-	return 0;
-}
-
-/* Device coordinate as 16 bit value range 0.0 - 1.0 */
-static double read_DCS16Number(char *p) {
-	unsigned int rv;
-	rv = 256 * (unsigned int)((ORD8 *)p)[0]
-	   +       (unsigned int)((ORD8 *)p)[1];
-	return (double)rv/65535.0;
-}
-
-static int write_DCS16Number(double d, char *p) {
-	ORD32 o32;
-	d = d * 65535.0 + 0.5;
-	if (d >= 65536.0)
-		return 1;
-	if (d < 0.0)
-		return 1;
-	o32 = (ORD32)d;
-	((ORD8 *)p)[0] = (ORD8)(o32 >> 8);
-	((ORD8 *)p)[1] = (ORD8)(o32);
-	return 0;
-}
-
-static void Lut_Lut2XYZ(double *out, double *in);
-static void Lut_XYZ2Lut(double *out, double *in);
-static void Lut_Lut2Lab_8(double *out, double *in);
-static void Lut_Lab2Lut_8(double *out, double *in);
-static void Lut_Lut2LabV2_16(double *out, double *in);
-static void Lut_Lab2LutV2_16(double *out, double *in);
-static void Lut_Lut2LabV4_16(double *out, double *in);
-static void Lut_Lab2LutV4_16(double *out, double *in);
-
-static void Lut_Lut2Y(double *out, double *in);
-static void Lut_Y2Lut(double *out, double *in);
-static void Lut_Lut2L_8(double *out, double *in);
-static void Lut_L2Lut_8(double *out, double *in);
-static void Lut_Lut2LV2_16(double *out, double *in);
-static void Lut_L2LutV2_16(double *out, double *in);
-static void Lut_Lut2LV4_16(double *out, double *in);
-static void Lut_L2LutV4_16(double *out, double *in);
-
-//~~~~888888
-/* read a PCS number. PCS can be profile PCS, profile version Lab, */
-/* or a specific type of Lab, depending on the value of csig: */
-/*   icmSigPCSData, icSigXYZData, icmSigLab8Data, icSigLabData, */
-/*   icmSigLabV2Data or icmSigLabV4Data */
-/* Do nothing if not one of the above. */
-static void read_PCSNumber(icc *icp, icColorSpaceSignature csig, double pcs[3], char *p) {
-
-	if (csig == icmSigPCSData)
-		csig = icp->header->pcs;
-	if (csig == icSigLabData) {
-		if (icp->ver != 0)
-			csig = icmSigLabV4Data;
-		else
-			csig = icmSigLabV2Data;
-	}
-
-	if (csig == icmSigLab8Data) {
-		pcs[0] = read_DCS8Number(p);
-		pcs[1] = read_DCS8Number(p+1);
-		pcs[2] = read_DCS8Number(p+2);
-	} else {
-		pcs[0] = read_DCS16Number(p);
-		pcs[1] = read_DCS16Number(p+2);
-		pcs[2] = read_DCS16Number(p+4);
-	}
-	switch (csig) {
-		case icSigXYZData:
-			Lut_Lut2XYZ(pcs, pcs);
-			break;
-		case icmSigLab8Data:
-			Lut_Lut2Lab_8(pcs, pcs);
-			break;
-		case icmSigLabV2Data:
-			Lut_Lut2LabV2_16(pcs, pcs);
-			break;
-		case icmSigLabV4Data:
-			Lut_Lut2LabV4_16(pcs, pcs);
-			break;
-		default:
-			break;
-	}
-}
-
-/* write a PCS number. PCS can be profile PCS, profile version Lab, */
-/* or a specific type of Lab, depending on the value of csig: */
-/*   icmSigPCSData, icSigXYZData, icmSigLab8Data, icSigLabData, */
-/*   icmSigLabV2Data or icmSigLabV4Data */
-/* Return 1 if error */
-static int write_PCSNumber(icc *icp, icColorSpaceSignature csig, double pcs[3], char *p) {
-	double v[3];
-	int j;
-
-	if (csig == icmSigPCSData)
-		csig = icp->header->pcs;
-	if (csig == icSigLabData) {
-		if (icp->ver != 0)
-			csig = icmSigLabV4Data;
-		else
-			csig = icmSigLabV2Data;
-	}
-
-	switch (csig) {
-		case icSigXYZData:
-			Lut_XYZ2Lut(v, pcs);
-			break;
-		case icmSigLab8Data:
-			Lut_Lab2Lut_8(v, pcs);
-			break;
-		case icmSigLabV2Data:
-			Lut_Lab2LutV2_16(v, pcs);
-			break;
-		case icmSigLabV4Data:
-			Lut_Lab2LutV4_16(v, pcs);
-			break;
-		default:
-			return 1;
-	}
-	if (csig == icmSigLab8Data) {
-		for (j = 0; j < 3; j++) {
-			if (write_DCS8Number(v[j], p+j))
-				return 1;
-		}
-	} else {
-		for (j = 0; j < 3; j++) {
-			if (write_DCS16Number(v[j], p+(2 * j)))
-				return 1;
-		}
-	}
-
-	return 0;
-}
-
-/* Read a given primitive type. Return non-zero on error */
-/* (Not currently used internaly ?) */
-/* Public: */
-int read_Primitive(icc *icp, icmPrimType ptype, void *prim, char *p) {
-
-	switch(ptype) {
-		case icmUInt8Number:
-			*((unsigned int *)prim) = read_UInt8Number(p);
-			return 0;
-		case icmUInt16Number:
-			*((unsigned int *)prim) = read_UInt16Number(p);
-			return 0;
-		case icmUInt32Number:
-			*((unsigned int *)prim) = read_UInt32Number(p);
-			return 0;
-		case icmUInt64Number:
-			read_UInt64Number((icmUint64 *)prim, p);
-			return 0;
-		case icmU8Fixed8Number:
-			*((double *)prim) = read_U8Fixed8Number(p);
-			return 0;
-		case icmU16Fixed16Number:
-			*((double *)prim) = read_U16Fixed16Number(p);
-			return 0;
-		case icmSInt8Number:
-			*((int *)prim) = read_SInt8Number(p);
-			return 0;
-		case icmSInt16Number:
-			*((int *)prim) = read_SInt16Number(p);
-			return 0;
-		case icmSInt32Number:
-			*((int *)prim) = read_SInt32Number(p);
-			return 0;
-		case icmSInt64Number:
-			read_SInt64Number((icmInt64 *)prim, p);
-			return 0;
-		case icmS15Fixed16Number:
-			*((double *)prim) = read_S15Fixed16Number(p);
-			return 0;
-		case icmDCS8Number:
-			*((double *)prim) = read_DCS8Number(p);
-			return 0;
-		case icmDCS16Number:
-			*((double *)prim) = read_DCS16Number(p);
-			return 0;
-		case icmPCSNumber:
-			read_PCSNumber(icp, icmSigPCSData, ((double *)prim), p);
-			return 0;
-		case icmPCSXYZNumber:
-			read_PCSNumber(icp, icSigXYZData, ((double *)prim), p);
-			return 0;
-		case icmPCSLab8Number:
-			read_PCSNumber(icp, icmSigLab8Data, ((double *)prim), p);
-			return 0;
-		case icmPCSLabNumber:
-			read_PCSNumber(icp, icSigLabData, ((double *)prim), p);
-			return 0;
-		case icmPCSLabV2Number:
-			read_PCSNumber(icp, icmSigLabV2Data, ((double *)prim), p);
-			return 0;
-		case icmPCSLabV4Number:
-			read_PCSNumber(icp, icmSigLabV4Data, ((double *)prim), p);
-			return 0;
-	}
-
-	return 2;
-}
-
-/* Write a given primitive type. Return non-zero on error */
-/* (Not currently used internaly ?) */
-/* Public: */
-int write_Primitive(icc *icp, icmPrimType ptype, char *p, void *prim) {
-
-	switch(ptype) {
-		case icmUInt8Number:
-			return write_UInt8Number(*((unsigned int *)prim), p);
-		case icmUInt16Number:
-			return write_UInt16Number(*((unsigned int *)prim), p);
-		case icmUInt32Number:
-			return write_UInt32Number(*((unsigned int *)prim), p);
-		case icmUInt64Number:
-			return write_UInt64Number((icmUint64 *)prim, p);
-		case icmU8Fixed8Number:
-			return write_U8Fixed8Number(*((double *)prim), p);
-		case icmU16Fixed16Number:
-			return write_U16Fixed16Number(*((double *)prim), p);
-		case icmSInt8Number:
-			return write_SInt8Number(*((int *)prim), p);
-		case icmSInt16Number:
-			return write_SInt16Number(*((int *)prim), p);
-		case icmSInt32Number:
-			return write_SInt32Number(*((int *)prim), p);
-		case icmSInt64Number:
-			return write_SInt64Number((icmInt64 *)prim, p);
-		case icmS15Fixed16Number:
-			return write_S15Fixed16Number(*((double *)prim), p);
-		case icmDCS8Number:
-			return write_DCS8Number(*((double *)prim), p);
-		case icmDCS16Number:
-			return write_DCS16Number(*((double *)prim), p);
-		case icmPCSNumber:
-			return write_PCSNumber(icp, icmSigPCSData, ((double *)prim), p);
-		case icmPCSXYZNumber:
-			return write_PCSNumber(icp, icSigXYZData, ((double *)prim), p);
-		case icmPCSLab8Number:
-			return write_PCSNumber(icp, icmSigLab8Data, ((double *)prim), p);
-		case icmPCSLabNumber:
-			return write_PCSNumber(icp, icSigLabData, ((double *)prim), p);
-		case icmPCSLabV2Number:
-			return write_PCSNumber(icp, icmSigLabV2Data, ((double *)prim), p);
-		case icmPCSLabV4Number:
-			return write_PCSNumber(icp, icmSigLabV4Data, ((double *)prim), p);
-	}
-
-	return 2;
-}
-
-/* ---------------------------------------------------------- */
-/* Auiliary function - return a string that represents a tag */
-/* Note - returned buffers are static, can only be used 5 */
-/* times before buffers get reused. */
-char *tag2str(
-	int tag
-) {
-	int i;
-	static int si = 0;			/* String buffer index */
-	static char buf[5][20];		/* String buffers */
-	char *bp;
-	unsigned char c[4];
-
-	bp = buf[si++];
-	si %= 5;				/* Rotate through buffers */
-
-	c[0] = 0xff & (tag >> 24);
-	c[1] = 0xff & (tag >> 16);
-	c[2] = 0xff & (tag >> 8);
-	c[3] = 0xff & (tag >> 0);
-	for (i = 0; i < 4; i++) {	/* Can we represent it as a string ? */
-		if (!isprint(c[i]))
-			break;
-	}
-	if (i < 4) {	/* Not printable - use hex */
-		sprintf(bp,"0x%x",tag);
-	} else {		/* Printable */
-		sprintf(bp,"'%c%c%c%c'",c[0],c[1],c[2],c[3]);
-	}
-	return bp;
-}
-
-/* Auiliary function - return a tag created from a string */
-/* Note there is also the icmMakeTag() macro */
-unsigned int str2tag(
-	const char *str
-) {
-	unsigned int tag;
-	tag = (((unsigned int)str[0]) << 24)
-	    + (((unsigned int)str[1]) << 16)
-	    + (((unsigned int)str[2]) << 8)
-	    + (((unsigned int)str[3]));
-	return tag;
-}
-
-/* helper - return 1 if the string doesn't have a */
-/* null terminator within len, return 0 if it does. */
-/* Note: will return 1 if len == 0 */
-static int check_null_string(char *cp, int len) {
-	for (; len > 0; len--) {
-		if (cp[0] == '\000')
-			break;
-		cp++;
-	}
-	if (len == 0)
-		return 1;
-	return 0;
-}
-
-/* helper - return 1 if the string doesn't have a */
-/*  null terminator within len, return 0 if it does. */
-/* Note: will return 1 if len == 0 */
-/* Unicode version */
-static int check_null_string16(char *cp, int len) {
-	for (; len > 0; len--) {	/* Length is in characters */
-		if (cp[0] == 0 && cp[1] == 0)
-			break;
-		cp += 2;
-	}
-	if (len == 0) 
-		return 1;
-	return 0;
-}
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-/* Color Space to number of component conversion */
-/* Return 0 on error */
-static unsigned int number_ColorSpaceSignature(icColorSpaceSignature sig) {
-	switch(sig) {
-		case icSigXYZData:
-			return 3;
-		case icSigLabData:
-			return 3;
-		case icSigLuvData:
-			return 3;
-		case icSigYCbCrData:
-			return 3;
-		case icSigYxyData:
-			return 3;
-		case icSigRgbData:
-			return 3;
-		case icSigGrayData:
-			return 1;
-		case icSigHsvData:
-			return 3;
-		case icSigHlsData:
-			return 3;
-		case icSigCmykData:
-			return 4;
-		case icSigCmyData:
-			return 3;
-		case icSig2colorData:
-			return 2;
-		case icSig3colorData:
-			return 3;
-		case icSig4colorData:
-			return 4;
-		case icSig5colorData:
-		case icSigMch5Data:
-			return 5;
-		case icSig6colorData:
-		case icSigMch6Data:
-			return 6;
-		case icSig7colorData:
-		case icSigMch7Data:
-			return 7;
-		case icSig8colorData:
-		case icSigMch8Data:
-			return 8;
-		case icSig9colorData:
-			return 9;
-		case icSig10colorData:
-			return 10;
-		case icSig11colorData:
-			return 11;
-		case icSig12colorData:
-			return 12;
-		case icSig13colorData:
-			return 13;
-		case icSig14colorData:
-			return 14;
-		case icSig15colorData:
-			return 15;
-
-		/* Non-standard and Pseudo spaces */
-		case icmSigYData:
-			return 1;
-		case icmSigLData:
-			return 1;
-		case icmSigL8Data:
-			return 1;
-		case icmSigLV2Data:
-			return 1;
-		case icmSigLV4Data:
-			return 1;
-		case icmSigPCSData:
-			return 3;
-		case icmSigLab8Data:
-			return 3;
-		case icmSigLabV2Data:
-			return 3;
-		case icmSigLabV4Data:
-			return 3;
-
-		default:
-			break;
-	}
-	return 0;
-}
-
-/* Public version of above */
-
-/* Return the number of channels for the given color space. Return 0 if unknown. */
-ICCLIB_API unsigned int icmCSSig2nchan(icColorSpaceSignature sig) {
-	return number_ColorSpaceSignature(sig);
-}
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-/* Return the individual channel names and number of channels give a colorspace signature. */
-/* Return 0 if it is not a colorspace that itself defines particular channels, */ 
-/* 1 if it is a colorant based colorspace, and 2 if it is not a colorant based space */
-static int chnames_ColorSpaceSignature(
-icColorSpaceSignature sig,
-char *cvals[]				/* Pointers to return for each channel */
-) {
-	switch (sig) {
-    	case icSigXYZData:
-			cvals[0] = "CIE X";
-			cvals[1] = "CIE Y";
-			cvals[2] = "CIE Z";
-			return 2;
-
-    	case icSigLabData:
-			cvals[0] = "CIE L*";
-			cvals[1] = "CIE a*";
-			cvals[2] = "CIE b*";
-			return 2;
-
-    	case icSigLuvData:
-			cvals[0] = "CIE L*";
-			cvals[1] = "CIE u*";
-			cvals[2] = "CIE v*";
-			return 2;
-
-		/* Usually ITU-R BT.601 (was CCIR 601) */
-    	case icSigYCbCrData:
-			cvals[0] = "ITU Y";
-			cvals[1] = "ITU Cb";
-			cvals[2] = "ITU Cr";
-			return 2;
-
-    	case icSigYxyData:
-			cvals[0] = "CIE Y";
-			cvals[1] = "CIE x";
-			cvals[2] = "CIE y";
-			return 2;
-
-		/* Alvy Ray Smith ? */
-    	case icSigHsvData:
-			cvals[0] = "RGB Hue";
-			cvals[1] = "RGB Saturation";
-			cvals[2] = "RGB Value";
-			return 2;
-
-		/* GSPC ? */
-    	case icSigHlsData:
-			cvals[0] = "RGB Hue";
-			cvals[1] = "RGB Lightness";
-			cvals[2] = "RGB Saturation";
-			return 2;
-
-		case icSigCmyData:
-			cvals[0] = "Cyan";
-			cvals[1] = "Magenta";
-			cvals[2] = "Yellow";
-			return 1;
-
-		case icSigRgbData:
-			cvals[0] = "Red";
-			cvals[1] = "Green";
-			cvals[2] = "Blue";
-			return 1;
-
-		case icSigCmykData:
-			cvals[0] = "Cyan";
-			cvals[1] = "Magenta";
-			cvals[2] = "Yellow";
-			cvals[3] = "Black";
-			return 1;
-
-		
-		/* Non-standard and Pseudo spaces */
-    	case icmSigYData:
-			cvals[0] = "CIE Y";
-			return 2;
-
-    	case icmSigLData:
-			cvals[0] = "CIE L*";
-			return 2;
-
-		default:
-			break;
-
-	}
-	return 0;
-}
-
-/* Public version of above */
-
-/* Return the individual channel names and number of channels give a colorspace signature. */
-/* Return 0 if it is not a colorspace that itself defines particular channels, */ 
-/* 1 if it is a colorant based colorspace, and 2 if it is not a colorant based space */
-ICCLIB_API unsigned int icmCSSig2chanNames(icColorSpaceSignature sig, char *cvals[]) {
-
-	return chnames_ColorSpaceSignature(sig, cvals);
-}
-
-/* ------------------------------------------------------- */
-/* Flag dump functions */
-/* Note - returned buffers are static, can only be used 5 */
-/* times before buffers get reused. */
-
-/* Screening Encodings */
-static char *string_ScreenEncodings(unsigned int flags) {
-	static int si = 0;			/* String buffer index */
-	static char buf[5][80];		/* String buffers */
-	char *bp, *cp;
-
-	cp = bp = buf[si++];
-	si %= 5;				/* Rotate through buffers */
-
-	if (flags & icPrtrDefaultScreensTrue) {
-		sprintf(cp,"Default Screen");
-	} else {
-		sprintf(cp,"No Default Screen");
-	}
-	cp = cp + strlen(cp);
-	if (flags & icLinesPerInch) {
-		sprintf(cp,", Lines Per Inch");
-	} else {
-		sprintf(cp,", Lines Per cm");
-	}
-	cp = cp + strlen(cp);
-
-	return bp;
-}
-
-/* Device attributes */
-static char *string_DeviceAttributes(unsigned int flags) {
-	static int si = 0;			/* String buffer index */
-	static char buf[5][80];		/* String buffers */
-	char *bp, *cp;
-
-	cp = bp = buf[si++];
-	si %= 5;				/* Rotate through buffers */
-
-	if (flags & icTransparency) {
-		sprintf(cp,"Transparency");
-	} else {
-		sprintf(cp,"Reflective");
-	}
-	cp = cp + strlen(cp);
-	if (flags & icMatte) {
-		sprintf(cp,", Matte");
-	} else {
-		sprintf(cp,", Glossy");
-	}
-	cp = cp + strlen(cp);
-	if (flags & icNegative) {
-		sprintf(cp,", Negative");
-	} else {
-		sprintf(cp,", Positive");
-	}
-	cp = cp + strlen(cp);
-	if (flags & icBlackAndWhite) {
-		sprintf(cp,", BlackAndWhite");
-	} else {
-		sprintf(cp,", Color");
-	}
-	cp = cp + strlen(cp);
-
-	return bp;
-}
-
-/* Profile header flags */
-static char *string_ProfileHeaderFlags(unsigned int flags) {
-	static int si = 0;			/* String buffer index */
-	static char buf[5][80];		/* String buffers */
-	char *bp, *cp;
-
-	cp = bp = buf[si++];
-	si %= 5;				/* Rotate through buffers */
-
-	if (flags & icEmbeddedProfileTrue) {
-		sprintf(cp,"Embedded Profile");
-	} else {
-		sprintf(cp,"Not Embedded Profile");
-	}
-	cp = cp + strlen(cp);
-	if (flags & icUseWithEmbeddedDataOnly) {
-		sprintf(cp,", Use with embedded data only");
-	} else {
-		sprintf(cp,", Use anywhere");
-	}
-	cp = cp + strlen(cp);
-
-	return bp;
-}
-
-
-static char *string_AsciiOrBinaryData(unsigned int flags) {
-	static int si = 0;			/* String buffer index */
-	static char buf[5][80];		/* String buffers */
-	char *bp, *cp;
-
-	cp = bp = buf[si++];
-	si %= 5;				/* Rotate through buffers */
-
-	if (flags & icBinaryData) {
-		sprintf(cp,"Binary");
-	} else {
-		sprintf(cp,"Ascii");
-	}
-	cp = cp + strlen(cp);
-
-	return bp;
-}
-
-/* ------------------------------------------------------------ */
-/* Enumeration dump functions */
-/* Note - returned buffers are static, can only be used once */
-/* before buffers get reused if type is unknown. */
-
-/* public tags and sizes */
-static const char *string_TagSignature(icTagSignature sig) {
-	static char buf[80];
-	switch(sig) {
-		case icSigAToB0Tag:
-			return "AToB0 Multidimentional Transform";
-		case icSigAToB1Tag:
-			return "AToB1 Multidimentional Transform";
-		case icSigAToB2Tag:
-			return "AToB2 Multidimentional Transform";
-		case icSigBlueColorantTag:
-			return "Blue Colorant";
-		case icSigBlueTRCTag:
-			return "Blue Tone Reproduction Curve";
-		case icSigBToA0Tag:
-			return "BToA0 Multidimentional Transform";
-		case icSigBToA1Tag:
-			return "BToA1 Multidimentional Transform";
-		case icSigBToA2Tag:
-			return "BToA2 Multidimentional Transform";
-		case icSigCalibrationDateTimeTag:
-			return "Calibration Date & Time";
-		case icSigCharTargetTag:
-			return "Characterization Target";
-		case icSigCopyrightTag:
-			return "Copyright";
-		case icSigCrdInfoTag:
-			return "CRD Info";
-		case icSigDeviceMfgDescTag:
-			return "Device Manufacturer Description";
-		case icSigDeviceModelDescTag:
-			return "Device Model Description";
-		case icSigGamutTag:
-			return "Gamut";
-		case icSigGrayTRCTag:
-			return "Gray Tone Reproduction Curve";
-		case icSigGreenColorantTag:
-			return "Green Colorant";
-		case icSigGreenTRCTag:
-			return "Green Tone Reproduction Curve";
-		case icSigLuminanceTag:
-			return "Luminance";
-		case icSigMeasurementTag:
-			return "Measurement";
-		case icSigMediaBlackPointTag:
-			return "Media Black Point";
-		case icSigMediaWhitePointTag:
-			return "Media White Point";
-		case icSigNamedColorTag:
-			return "Named Color";
-		case icSigNamedColor2Tag:
-			return "Named Color 2";
-		case icSigPreview0Tag:
-			return "Preview0";
-		case icSigPreview1Tag:
-			return "Preview1";
-		case icSigPreview2Tag:
-			return "Preview2";
-		case icSigProfileDescriptionTag:
-			return "Profile Description";
-		case icSigProfileSequenceDescTag:
-			return "Profile Sequence";
-		case icSigPs2CRD0Tag:
-			return "PS Level 2 CRD perceptual";
-		case icSigPs2CRD1Tag:
-			return "PS Level 2 CRD colorimetric";
-		case icSigPs2CRD2Tag:
-			return "PS Level 2 CRD saturation";
-		case icSigPs2CRD3Tag:
-			return "PS Level 2 CRD absolute";
-		case icSigPs2CSATag:
-			return "PS Level 2 color space array";
-		case icSigPs2RenderingIntentTag:
-			return "PS Level 2 Rendering Intent";
-		case icSigRedColorantTag:
-			return "Red Colorant";
-		case icSigRedTRCTag:
-			return "Red Tone Reproduction Curve";
-		case icSigScreeningDescTag:
-			return "Screening Description";
-		case icSigScreeningTag:
-			return "Screening Attributes";
-		case icSigTechnologyTag:
-			return "Device Technology";
-		case icSigUcrBgTag:
-			return "Under Color Removal & Black Generation";
-		case icSigVideoCardGammaTag:
-			return "Video Card Gamma Curve";
-		case icSigViewingCondDescTag:
-			return "Viewing Condition Description";
-		case icSigViewingConditionsTag:
-			return "Viewing Condition Paramaters";
-		default:
-			sprintf(buf,"Unrecognized - %s",tag2str(sig));
-			return buf;
-	}
-}
-
-/* technology signature descriptions */
-static const char *string_TechnologySignature(icTechnologySignature sig) {
-	static char buf[80];
-	switch(sig) {
-		case icSigDigitalCamera:
-			return "Digital Camera";
-		case icSigFilmScanner:
-			return "Film Scanner";
-		case icSigReflectiveScanner:
-			return "Reflective Scanner";
-		case icSigInkJetPrinter:
-			return "InkJet Printer";
-		case icSigThermalWaxPrinter:
-			return "Thermal WaxPrinter";
-		case icSigElectrophotographicPrinter:
-			return "Electrophotographic Printer";
-		case icSigElectrostaticPrinter:
-			return "Electrostatic Printer";
-		case icSigDyeSublimationPrinter:
-			return "DyeSublimation Printer";
-		case icSigPhotographicPaperPrinter:
-			return "Photographic Paper Printer";
-		case icSigFilmWriter:
-			return "Film Writer";
-		case icSigVideoMonitor:
-			return "Video Monitor";
-		case icSigVideoCamera:
-			return "Video Camera";
-		case icSigProjectionTelevision:
-			return "Projection Television";
-		case icSigCRTDisplay:
-			return "Cathode Ray Tube Display";
-		case icSigPMDisplay:
-			return "Passive Matrix Display";
-		case icSigAMDisplay:
-			return "Active Matrix Display";
-		case icSigPhotoCD:
-			return "Photo CD";
-		case icSigPhotoImageSetter:
-			return "Photo ImageSetter";
-		case icSigGravure:
-			return "Gravure";
-		case icSigOffsetLithography:
-			return "Offset Lithography";
-		case icSigSilkscreen:
-			return "Silkscreen";
-		case icSigFlexography:
-			return "Flexography";
-		default:
-			sprintf(buf,"Unrecognized - %s",tag2str(sig));
-			return buf;
-	}
-}
-
-/* type signatures */
-static const char *string_TypeSignature(icTagTypeSignature sig) {
-	static char buf[80];
-	switch(sig) {
-		case icSigCurveType:
-			return "Curve";
-		case icSigDataType:
-			return "Data";
-		case icSigDateTimeType:
-			return "DateTime";
-		case icSigLut16Type:
-			return "Lut16";
-		case icSigLut8Type:
-			return "Lut8";
-		case icSigMeasurementType:
-			return "Measurement";
-		case icSigNamedColorType:
-			return "Named Color";
-		case icSigProfileSequenceDescType:
-			return "Profile Sequence Desc";
-		case icSigS15Fixed16ArrayType:
-			return "S15Fixed16 Array";
-		case icSigScreeningType:
-			return "Screening";
-		case icSigSignatureType:
-			return "Signature";
-		case icSigTextType:
-			return "Text";
-		case icSigTextDescriptionType:
-			return "Text Description";
-		case icSigU16Fixed16ArrayType:
-			return "U16Fixed16 Array";
-		case icSigUcrBgType:
-			return "Under Color Removal & Black Generation";
-		case icSigUInt16ArrayType:
-			return "UInt16 Array";
-		case icSigUInt32ArrayType:
-			return "UInt32 Array";
-		case icSigUInt64ArrayType:
-			return "UInt64 Array";
-		case icSigUInt8ArrayType:
-			return "UInt8 Array";
-		case icSigVideoCardGammaType:
-			return "Video Card Gamma";
-		case icSigViewingConditionsType:
-			return "Viewing Conditions";
-		case icSigXYZType:
-			return "XYZ (Array?)";
-		case icSigNamedColor2Type:
-			return "Named Color 2";
-		case icSigCrdInfoType:
-			return "CRD Info";
-		default:
-			sprintf(buf,"Unrecognized - %s",tag2str(sig));
-			return buf;
-	}
-}
-
-/* Color Space Signatures */
-static const char *string_ColorSpaceSignature(icColorSpaceSignature sig) {
-	static char buf[80];
-	switch(sig) {
-		case icSigXYZData:
-			return "XYZ";
-		case icSigLabData:
-			return "Lab";
-		case icSigLuvData:
-			return "Luv";
-		case icSigYCbCrData:
-			return "YCbCr";
-		case icSigYxyData:
-			return "Yxy";
-		case icSigRgbData:
-			return "RGB";
-		case icSigGrayData:
-			return "Gray";
-		case icSigHsvData:
-			return "HSV";
-		case icSigHlsData:
-			return "HLS";
-		case icSigCmykData:
-			return "CMYK";
-		case icSigCmyData:
-			return "CMY";
-		case icSig2colorData:
-			return "2 Color";
-		case icSig3colorData:
-			return "3 Color";
-		case icSig4colorData:
-			return "4 Color";
-		case icSig5colorData:
-		case icSigMch5Data:
-			return "5 Color";
-		case icSig6colorData:
-		case icSigMch6Data:
-			return "6 Color";
-		case icSig7colorData:
-		case icSigMch7Data:
-			return "7 Color";
-		case icSig8colorData:
-		case icSigMch8Data:
-			return "8 Color";
-		case icSig9colorData:
-			return "9 Color";
-		case icSig10colorData:
-			return "10 Color";
-		case icSig11colorData:
-			return "11 Color";
-		case icSig12colorData:
-			return "12 Color";
-		case icSig13colorData:
-			return "13 Color";
-		case icSig14colorData:
-			return "14 Color";
-		case icSig15colorData:
-			return "15 Color";
-
-		/* Non-standard and Pseudo spaces */
-		case icmSigYData:
-			return "Y";
-		case icmSigLData:
-			return "L";
-		case icmSigL8Data:
-			return "L";
-		case icmSigLV2Data:
-			return "L";
-		case icmSigLV4Data:
-			return "L";
-		case icmSigPCSData:
-			return "PCS";
-		case icmSigLab8Data:
-			return "Lab";
-		case icmSigLabV2Data:
-			return "Lab";
-		case icmSigLabV4Data:
-			return "Lab";
-
-		default:
-			sprintf(buf,"Unrecognized - %s",tag2str(sig));
-			return buf;
-	}
-}
-
-#ifdef NEVER
-/* Public version of above */
-char *ColorSpaceSignature2str(icColorSpaceSignature sig) {
-	return string_ColorSpaceSignature(sig);
-}
-#endif
-
-
-/* profileClass enumerations */
-static const char *string_ProfileClassSignature(icProfileClassSignature sig) {
-	static char buf[80];
-	switch(sig) {
-		case icSigInputClass:
-			return "Input";
-		case icSigDisplayClass:
-			return "Display";
-		case icSigOutputClass:
-			return "Output";
-		case icSigLinkClass:
-			return "Link";
-		case icSigAbstractClass:
-			return "Abstract";
-		case icSigColorSpaceClass:
-			return "Color Space";
-		case icSigNamedColorClass:
-			return "Named Color";
-		default:
-			sprintf(buf,"Unrecognized - %s",tag2str(sig));
-			return buf;
-	}
-}
-
-/* Platform Signatures */
-static const char *string_PlatformSignature(icPlatformSignature sig) {
-	static char buf[80];
-	switch(sig) {
-		case icSigMacintosh:
-			return "Macintosh";
-		case icSigMicrosoft:
-			return "Microsoft";
-		case icSigSolaris:
-			return "Solaris";
-		case icSigSGI:
-			return "SGI";
-		case icSigTaligent:
-			return "Taligent";
-		case icmSig_nix:
-			return "*nix";
-		default:
-			sprintf(buf,"Unrecognized - %s",tag2str(sig));
-			return buf;
-	}
-}
-
-/* Measurement Geometry, used in the measurmentType tag */
-static const char *string_MeasurementGeometry(icMeasurementGeometry sig) {
-	static char buf[30];
-	switch(sig) {
-		case icGeometryUnknown:
-			return "Unknown";
-		case icGeometry045or450:
-			return "0/45 or 45/0";
-		case icGeometry0dord0:
-			return "0/d or d/0";
-		default:
-			sprintf(buf,"Unrecognized - 0x%x",sig);
-			return buf;
-	}
-}
-
-/* Rendering Intents, used in the profile header */
-static const char *string_RenderingIntent(icRenderingIntent sig) {
-	static char buf[30];
-	switch(sig) {
-		case icPerceptual:
-			return "Perceptual";
-		case icRelativeColorimetric:
-    		return "Relative Colorimetric";
-		case icSaturation:
-    		return "Saturation";
-		case icAbsoluteColorimetric:
-    		return "Absolute Colorimetric";
-		case icmAbsolutePerceptual:				/* icclib specials */
-			return "Absolute Perceptual";
-		case icmAbsoluteSaturation:				/* icclib specials */
-			return "Absolute Saturation";
-		case icmDefaultIntent:					/* icclib specials */
-    		return "Default Intent";
-		default:
-			sprintf(buf,"Unrecognized - 0x%x",sig);
-			return buf;
-	}
-}
-
-/* Transform Lookup function */
-static const char *string_LookupFunc(icmLookupFunc sig) {
-	static char buf[30];
-	switch(sig) {
-		case icmFwd:
-			return "Forward";
-		case icmBwd:
-    		return "Backward";
-		case icmGamut:
-    		return "Gamut";
-		case icmPreview:
-    		return "Preview";
-		default:
-			sprintf(buf,"Unrecognized - 0x%x",sig);
-			return buf;
-	}
-}
-
-
-/* Different Spot Shapes currently defined, used for screeningType */
-static const char *string_SpotShape(icSpotShape sig) {
-	static char buf[30];
-	switch(sig) {
-		case icSpotShapeUnknown:
-			return "Unknown";
-		case icSpotShapePrinterDefault:
-			return "Printer Default";
-		case icSpotShapeRound:
-			return "Round";
-		case icSpotShapeDiamond:
-			return "Diamond";
-		case icSpotShapeEllipse:
-			return "Ellipse";
-		case icSpotShapeLine:
-			return "Line";
-		case icSpotShapeSquare:
-			return "Square";
-		case icSpotShapeCross:
-			return "Cross";
-		default:
-			sprintf(buf,"Unrecognized - 0x%x",sig);
-			return buf;
-	}
-}
-
-/* Standard Observer, used in the measurmentType tag */
-static const char *string_StandardObserver(icStandardObserver sig) {
-	static char buf[30];
-	switch(sig) {
-		case icStdObsUnknown:
-			return "Unknown";
-		case icStdObs1931TwoDegrees:
-			return "1931 Two Degrees";
-		case icStdObs1964TenDegrees:
-			return "1964 Ten Degrees";
-		default:
-			sprintf(buf,"Unrecognized - 0x%x",sig);
-			return buf;
-	}
-}
-
-/* Pre-defined illuminants, used in measurement and viewing conditions type */
-static const char *string_Illuminant(icIlluminant sig) {
-	static char buf[30];
-	switch(sig) {
-		case icIlluminantUnknown:
-			return "Unknown";
-		case icIlluminantD50:
-			return "D50";
-		case icIlluminantD65:
-			return "D65";
-		case icIlluminantD93:
-			return "D93";
-		case icIlluminantF2:
-			return "F2";
-		case icIlluminantD55:
-			return "D55";
-		case icIlluminantA:
-			return "A";
-		case icIlluminantEquiPowerE:
-			return "Equi-Power(E)";
-		case icIlluminantF8:
-			return "F8";
-		default:
-			sprintf(buf,"Unrecognized - 0x%x",sig);
-			return buf;
-	}
-}
-
-/* Return a text abreviation of a color lookup algorithm */
-static const char *string_LuAlg(icmLuAlgType alg) {
-	static char buf[80];
-
-	switch(alg) {
-    	case icmMonoFwdType:
-			return "MonoFwd";
-    	case icmMonoBwdType:
-			return "MonoBwd";
-    	case icmMatrixFwdType:
-			return "MatrixFwd";
-    	case icmMatrixBwdType:
-			return "MatrixBwd";
-    	case icmLutType:
-			return "Lut";
-	default:
-		sprintf(buf,"Unrecognized - %d",alg);
-		return buf;
-	}
-}
-
-/* Return a string description of the given enumeration value */
-/* Public: */
-const char *icm2str(icmEnumType etype, int enumval) {
-
-	switch(etype) {
-	    case icmScreenEncodings:
-			return string_ScreenEncodings((unsigned int) enumval);
-	    case icmDeviceAttributes:
-			return string_DeviceAttributes((unsigned int) enumval);
-		case icmProfileHeaderFlags:
-			return string_ProfileHeaderFlags((unsigned int) enumval);
-		case icmAsciiOrBinaryData:
-			return string_AsciiOrBinaryData((unsigned int) enumval);
-		case icmTagSignature:
-			return string_TagSignature((icTagSignature) enumval);
-		case icmTechnologySignature:
-			return string_TechnologySignature((icTechnologySignature) enumval);
-		case icmTypeSignature:
-			return string_TypeSignature((icTagTypeSignature) enumval);
-		case icmColorSpaceSignature:
-			return string_ColorSpaceSignature((icColorSpaceSignature) enumval);
-		case icmProfileClassSignature:
-			return string_ProfileClassSignature((icProfileClassSignature) enumval);
-		case icmPlatformSignature:
-			return string_PlatformSignature((icPlatformSignature) enumval);
-		case icmMeasurementGeometry:
-			return string_MeasurementGeometry((icMeasurementGeometry) enumval);
-		case icmRenderingIntent:
-			return string_RenderingIntent((icRenderingIntent) enumval);
-		case icmTransformLookupFunc:
-			return string_LookupFunc((icmLookupFunc) enumval);
-		case icmSpotShape:
-			return string_SpotShape((icSpotShape) enumval);
-		case icmStandardObserver:
-			return string_StandardObserver((icStandardObserver) enumval);
-		case icmIlluminant:
-			return string_Illuminant((icIlluminant) enumval);
-		case icmLuAlg:
-			return string_LuAlg((icmLuAlgType) enumval);
-		default:
-			return "enum2str got unknown type";
-	}
-}
-
-/* ========================================================== */
-/* Object I/O routines                                        */
-/* ========================================================== */
-/* icmUnknown object */
-
-/* Return the number of bytes needed to write this tag */
-static unsigned int icmUnknown_get_size(
-	icmBase *pp
-) {
-	icmUnknown *p = (icmUnknown *)pp;
-	unsigned int len = 0;
-	len = sat_add(len, 8);				/* 8 bytes for tag and padding */
-	len = sat_addmul(len, p->size, 1);	/* 1 byte for each unknown data */
-	return len;
-}
-
-/* read the object, return 0 on success, error code on fail */
-static int icmUnknown_read(
-	icmBase *pp,
-	unsigned int len,	/* tag length */
-	unsigned int of		/* start offset within file */
-) {
-	icmUnknown *p = (icmUnknown *)pp;
-	icc *icp = p->icp;
-	int rv = 0;
-	unsigned int i, size;
-	char *bp, *buf;
-
-	if (len < 8) {
-		sprintf(icp->err,"icmUnknown_read: Tag too small to be legal");
-		return icp->errc = 1;
-	}
-
-	/* Allocate a file read buffer */
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmUnknown_read: malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Read portion of file into buffer */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->read(icp->fp, bp, 1, len) != len) {
-		sprintf(icp->err,"icmUnknown_read: fseek() or fread() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	p->size = size = (len - 8)/1;		/* Number of elements in the array */
-
-	if ((rv = p->allocate((icmBase *)p)) != 0) {
-		icp->al->free(icp->al, buf);
-		return rv;
-	}
-
-	/* Read type descriptor from the buffer */
-	p->uttype = (icTagTypeSignature)read_SInt32Number(bp);
-	bp += 8;	/* Skip padding */
-
-	/* Read all the data from the buffer */
-	for (i = 0; i < size; i++, bp += 1) {
-		p->data[i] = read_UInt8Number(bp);
-	}
-	icp->al->free(p->icp->al, buf);
-	return 0;
-}
-
-/* Write the contents of the object. Return 0 on sucess, error code on failure */
-static int icmUnknown_write(
-	icmBase *pp,
-	unsigned int of			/* File offset to write from */
-) {
-	icmUnknown *p = (icmUnknown *)pp;
-	icc *icp = p->icp;
-	unsigned int i;
-	unsigned int len;
-	char *bp, *buf;		/* Buffer to write from */
-	int rv = 0;
-
-	/* Allocate a file write buffer */
-	if ((len = p->get_size((icmBase *)p)) == UINT_MAX) {
-		sprintf(icp->err,"icmUnknown_write get_size overflow");
-		return icp->errc = 1;
-	}
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmUnknown_write malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Write type descriptor to the buffer */
-	if ((rv = write_SInt32Number((int)p->uttype,bp)) != 0) {
-		sprintf(icp->err,"icmUnknown_write: write_SInt32Number() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = rv;
-	}
-	write_SInt32Number(0,bp+4);			/* Set padding to 0 */
-	bp += 8;	/* Skip padding */
-
-	/* Write all the data to the buffer */
-	for (i = 0; i < p->size; i++, bp += 1) {
-		if ((rv = write_UInt8Number(p->data[i],bp)) != 0) {
-			sprintf(icp->err,"icmUnknown_write: write_UInt8umber() failed");
-			icp->al->free(icp->al, buf);
-			return icp->errc = rv;
-		}
-	}
-
-	/* Write to the file */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->write(icp->fp, buf, 1, len) != len) {
-		sprintf(icp->err,"icmUnknown_write fseek() or fwrite() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 2;
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Dump a text description of the object */
-static void icmUnknown_dump(
-	icmBase *pp,
-	icmFile *op,	/* Output to dump to */
-	int   verb		/* Verbosity level */
-) {
-	icmUnknown *p = (icmUnknown *)pp;
-	unsigned int i, ii, r, ph;
-
-	if (verb <= 1)
-		return;
-
-	op->gprintf(op,"Unknown:\n");
-	op->gprintf(op,"  Payload size in bytes = %u\n",p->size);
-
-	/* Print one row of binary and ASCII interpretation if verb == 2, All if == 3 */
-	/* else print all of it. */
-	ii = i = ph = 0;
-	for (r = 1;; r++) {		/* count rows */
-		int c = 1;			/* Character location */
-
-		c = 1;
-		if (ph != 0) {	/* Print ASCII under binary */
-			op->gprintf(op,"           ");
-			i = ii;				/* Swap */
-			c += 11;
-		} else {
-			op->gprintf(op,"    0x%04lx: ",i);
-			ii = i;				/* Swap */
-			c += 10;
-		}
-		while (i < p->size && c < 75) {
-			if (ph == 0) 
-				op->gprintf(op,"%02x ",p->data[i]);
-			else {
-				if (isprint(p->data[i]))
-					op->gprintf(op," %c ",p->data[i]);
-				else
-					op->gprintf(op,"   ",p->data[i]);
-			}
-			c += 3;
-			i++;
-		}
-		if (ph == 0 || i < p->size)
-			op->gprintf(op,"\n");
-
-		if (ph == 1 && i >= p->size) {
-			op->gprintf(op,"\n");
-			break;
-		}
-		if (ph == 1 && r > 1 && verb < 3) {
-			op->gprintf(op,"    ...\n");
-			break;			/* Print 1 row if not verbose */
-		}
-
-		if (ph == 0)
-			ph = 1;
-		else
-			ph = 0;
-
-	}
-}
-
-/* Allocate variable sized data elements */
-static int icmUnknown_allocate(
-	icmBase *pp
-) {
-	icmUnknown *p = (icmUnknown *)pp;
-	icc *icp = p->icp;
-
-	if (p->size != p->_size) {
-		if (ovr_mul(p->size, sizeof(unsigned char))) {
-			sprintf(icp->err,"icmUnknown_alloc: size overflow");
-			return icp->errc = 1;
-		}
-		if (p->data != NULL)
-			icp->al->free(icp->al, p->data);
-		if ((p->data = (unsigned char *) icp->al->calloc(icp->al, p->size, sizeof(unsigned char)))
-		                                                                                == NULL) {
-			sprintf(icp->err,"icmUnknown_alloc: malloc() of icmUnknown data failed");
-			return icp->errc = 2;
-		}
-		p->_size = p->size;
-	}
-	return 0;
-}
-
-/* Free all storage in the object */
-static void icmUnknown_delete(
-	icmBase *pp
-) {
-	icmUnknown *p = (icmUnknown *)pp;
-	icc *icp = p->icp;
-
-	if (p->data != NULL)
-		icp->al->free(icp->al, p->data);
-	icp->al->free(icp->al, p);
-}
-
-/* Create an empty object. Return null on error */
-static icmBase *new_icmUnknown(
-	icc *icp
-) {
-	icmUnknown *p;
-	if ((p = (icmUnknown *) icp->al->calloc(icp->al,1,sizeof(icmUnknown))) == NULL)
-		return NULL;
-	p->ttype    = icmSigUnknownType;
-	p->uttype   = icmSigUnknownType;
-	p->refcount = 1;
-	p->get_size = icmUnknown_get_size;
-	p->read     = icmUnknown_read;
-	p->write    = icmUnknown_write;
-	p->dump     = icmUnknown_dump;
-	p->allocate = icmUnknown_allocate;
-	p->del      = icmUnknown_delete;
-	p->icp      = icp;
-
-	return (icmBase *)p;
-}
-
-/* ---------------------------------------------------------- */
-/* icmUInt8Array object */
-
-/* Return the number of bytes needed to write this tag */
-static unsigned int icmUInt8Array_get_size(
-	icmBase *pp
-) {
-	icmUInt8Array *p = (icmUInt8Array *)pp;
-	unsigned int len = 0;
-	len = sat_add(len, 8);				/* 8 bytes for tag and padding */
-	len = sat_addmul(len, p->size, 1);	/* 1 byte for each UInt8 */
-	return len;
-}
-
-/* read the object, return 0 on success, error code on fail */
-static int icmUInt8Array_read(
-	icmBase *pp,
-	unsigned int len,	/* tag length */
-	unsigned int of		/* start offset within file */
-) {
-	icmUInt8Array *p = (icmUInt8Array *)pp;
-	icc *icp = p->icp;
-	int rv = 0;
-	unsigned int i, size;
-	char *bp, *buf;
-
-	if (len < 8) {
-		sprintf(icp->err,"icmUInt8Array_read: Tag too small to be legal");
-		return icp->errc = 1;
-	}
-
-	/* Allocate a file read buffer */
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmUInt8Array_read: malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Read portion of file into buffer */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->read(icp->fp, bp, 1, len) != len) {
-		sprintf(icp->err,"icmUInt8Array_read: fseek() or fread() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	p->size = size = (len - 8)/1;		/* Number of elements in the array */
-
-	if ((rv = p->allocate((icmBase *)p)) != 0) {
-		icp->al->free(icp->al, buf);
-		return rv;
-	}
-
-	/* Read type descriptor from the buffer */
-	if (((icTagTypeSignature)read_SInt32Number(bp)) != p->ttype) {
-		icp->al->free(icp->al, buf);
-		sprintf(icp->err,"icmUInt8Array_read: Wrong tag type for icmUInt8Array");
-		return icp->errc = 1;
-	}
-	bp += 8;	/* Skip padding */
-
-	/* Read all the data from the buffer */
-	for (i = 0; i < size; i++, bp += 1) {
-		p->data[i] = read_UInt8Number(bp);
-	}
-	icp->al->free(p->icp->al, buf);
-	return 0;
-}
-
-/* Write the contents of the object. Return 0 on sucess, error code on failure */
-static int icmUInt8Array_write(
-	icmBase *pp,
-	unsigned int of			/* File offset to write from */
-) {
-	icmUInt8Array *p = (icmUInt8Array *)pp;
-	icc *icp = p->icp;
-	unsigned int i;
-	unsigned int len;
-	char *bp, *buf;		/* Buffer to write from */
-	int rv = 0;
-
-	/* Allocate a file write buffer */
-	if ((len = p->get_size((icmBase *)p)) == UINT_MAX) {
-		sprintf(icp->err,"icmUInt8Array_write get_size overflow");
-		return icp->errc = 1;
-	}
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmUInt8Array_write malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Write type descriptor to the buffer */
-	if ((rv = write_SInt32Number((int)p->ttype,bp)) != 0) {
-		sprintf(icp->err,"icmUInt8Array_write: write_SInt32Number() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = rv;
-	}
-	write_SInt32Number(0,bp+4);			/* Set padding to 0 */
-	bp += 8;	/* Skip padding */
-
-	/* Write all the data to the buffer */
-	for (i = 0; i < p->size; i++, bp += 1) {
-		if ((rv = write_UInt8Number(p->data[i],bp)) != 0) {
-			sprintf(icp->err,"icmUInt8Array_write: write_UInt8umber() failed");
-			icp->al->free(icp->al, buf);
-			return icp->errc = rv;
-		}
-	}
-
-	/* Write to the file */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->write(icp->fp, buf, 1, len) != len) {
-		sprintf(icp->err,"icmUInt8Array_write fseek() or fwrite() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 2;
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Dump a text description of the object */
-static void icmUInt8Array_dump(
-	icmBase *pp,
-	icmFile *op,	/* Output to dump to */
-	int   verb		/* Verbosity level */
-) {
-	icmUInt8Array *p = (icmUInt8Array *)pp;
-	if (verb <= 0)
-		return;
-
-	op->gprintf(op,"UInt8Array:\n");
-	op->gprintf(op,"  No. elements = %lu\n",p->size);
-	if (verb >= 2) {
-		unsigned int i;
-		for (i = 0; i < p->size; i++)
-			op->gprintf(op,"    %lu:  %u\n",i,p->data[i]);
-	}
-}
-
-/* Allocate variable sized data elements */
-static int icmUInt8Array_allocate(
-	icmBase *pp
-) {
-	icmUInt8Array *p = (icmUInt8Array *)pp;
-	icc *icp = p->icp;
-
-	if (p->size != p->_size) {
-		if (ovr_mul(p->size, sizeof(unsigned int))) {
-			sprintf(icp->err,"icmUInt8Array_alloc: size overflow");
-			return icp->errc = 1;
-		}
-		if (p->data != NULL)
-			icp->al->free(icp->al, p->data);
-		if ((p->data = (unsigned int *) icp->al->calloc(icp->al, p->size, sizeof(unsigned int)))
-		                                                                              == NULL) {
-			sprintf(icp->err,"icmUInt8Array_alloc: malloc() of icmUInt8Array data failed");
-			return icp->errc = 2;
-		}
-		p->_size = p->size;
-	}
-	return 0;
-}
-
-/* Free all storage in the object */
-static void icmUInt8Array_delete(
-	icmBase *pp
-) {
-	icmUInt8Array *p = (icmUInt8Array *)pp;
-	icc *icp = p->icp;
-
-	if (p->data != NULL)
-		icp->al->free(icp->al, p->data);
-	icp->al->free(icp->al, p);
-}
-
-/* Create an empty object. Return null on error */
-static icmBase *new_icmUInt8Array(
-	icc *icp
-) {
-	icmUInt8Array *p;
-	if ((p = (icmUInt8Array *) icp->al->calloc(icp->al,1,sizeof(icmUInt8Array))) == NULL)
-		return NULL;
-	p->ttype    = icSigUInt8ArrayType;
-	p->refcount = 1;
-	p->get_size = icmUInt8Array_get_size;
-	p->read     = icmUInt8Array_read;
-	p->write    = icmUInt8Array_write;
-	p->dump     = icmUInt8Array_dump;
-	p->allocate = icmUInt8Array_allocate;
-	p->del      = icmUInt8Array_delete;
-	p->icp      = icp;
-
-	return (icmBase *)p;
-}
-
-/* ---------------------------------------------------------- */
-/* icmUInt16Array object */
-
-/* Return the number of bytes needed to write this tag */
-static unsigned int icmUInt16Array_get_size(
-	icmBase *pp
-) {
-	icmUInt16Array *p = (icmUInt16Array *)pp;
-	unsigned int len = 0;
-	len = sat_add(len, 8);				/* 8 bytes for tag and padding */
-	len = sat_addmul(len, p->size, 2);	/* 2 bytes for each UInt16 */
-	return len;
-}
-
-/* read the object, return 0 on success, error code on fail */
-static int icmUInt16Array_read(
-	icmBase *pp,
-	unsigned int len,	/* tag length */
-	unsigned int of		/* start offset within file */
-) {
-	icmUInt16Array *p = (icmUInt16Array *)pp;
-	icc *icp = p->icp;
-	int rv = 0;
-	unsigned int i, size;
-	char *bp, *buf;
-
-	if (len < 8) {
-		sprintf(icp->err,"icmUInt16Array_read: Tag too small to be legal");
-		return icp->errc = 1;
-	}
-
-	/* Allocate a file read buffer */
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmUInt16Array_read: malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Read portion of file into buffer */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->read(icp->fp, bp, 1, len) != len) {
-		sprintf(icp->err,"icmUInt16Array_read: fseek() or fread() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	p->size = size = (len - 8)/2;		/* Number of elements in the array */
-
-	if ((rv = p->allocate((icmBase *)p)) != 0) {
-		icp->al->free(icp->al, buf);
-		return rv;
-	}
-
-	/* Read type descriptor from the buffer */
-	if (((icTagTypeSignature)read_SInt32Number(bp)) != p->ttype) {
-		sprintf(icp->err,"icmUInt16Array_read: Wrong tag type for icmUInt16Array");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	bp += 8;	/* Skip padding */
-
-	/* Read all the data from the buffer */
-	for (i = 0; i < size; i++, bp += 2) {
-		p->data[i] = read_UInt16Number(bp);
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Write the contents of the object. Return 0 on sucess, error code on failure */
-static int icmUInt16Array_write(
-	icmBase *pp,
-	unsigned int of			/* File offset to write from */
-) {
-	icmUInt16Array *p = (icmUInt16Array *)pp;
-	icc *icp = p->icp;
-	unsigned int i;
-	unsigned int len;
-	char *bp, *buf;		/* Buffer to write from */
-	int rv = 0;
-
-	/* Allocate a file write buffer */
-	if ((len = p->get_size((icmBase *)p)) == UINT_MAX) {
-		sprintf(icp->err,"icmUInt16Array_write get_size overflow");
-		return icp->errc = 1;
-	}
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmUInt16Array_write malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Write type descriptor to the buffer */
-	if ((rv = write_SInt32Number((int)p->ttype,bp)) != 0) {
-		sprintf(icp->err,"icmUInt16Array_write: write_SInt32Number() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = rv;
-	}
-	write_SInt32Number(0,bp+4);			/* Set padding to 0 */
-
-	/* Write all the data to the buffer */
-	bp += 8;	/* Skip padding */
-	for (i = 0; i < p->size; i++, bp += 2) {
-		if ((rv = write_UInt16Number(p->data[i],bp)) != 0) {
-			sprintf(icp->err,"icmUInt16Array_write: write_UInt16umber() failed");
-			icp->al->free(icp->al, buf);
-			return icp->errc = rv;
-		}
-	}
-
-	/* Write to the file */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->write(icp->fp, buf, 1, len) != len) {
-		sprintf(icp->err,"icmUInt16Array_write fseek() or fwrite() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 2;
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Dump a text description of the object */
-static void icmUInt16Array_dump(
-	icmBase *pp,
-	icmFile *op,	/* Output to dump to */
-	int   verb		/* Verbosity level */
-) {
-	icmUInt16Array *p = (icmUInt16Array *)pp;
-	if (verb <= 0)
-		return;
-
-	op->gprintf(op,"UInt16Array:\n");
-	op->gprintf(op,"  No. elements = %lu\n",p->size);
-	if (verb >= 2) {
-		unsigned int i;
-		for (i = 0; i < p->size; i++)
-			op->gprintf(op,"    %lu:  %u\n",i,p->data[i]);
-	}
-}
-
-/* Allocate variable sized data elements */
-static int icmUInt16Array_allocate(
-	icmBase *pp
-) {
-	icmUInt16Array *p = (icmUInt16Array *)pp;
-	icc *icp = p->icp;
-
-	if (p->size != p->_size) {
-		if (ovr_mul(p->size, sizeof(unsigned int))) {
-			sprintf(icp->err,"icmUInt16Array_alloc:: size overflow");
-			return icp->errc = 1;
-		}
-		if (p->data != NULL)
-			icp->al->free(icp->al, p->data);
-		if ((p->data = (unsigned int *) icp->al->calloc(icp->al, p->size, sizeof(unsigned int)))
-		                                                                              == NULL) {
-			sprintf(icp->err,"icmUInt16Array_alloc: malloc() of icmUInt16Array data failed");
-			return icp->errc = 2;
-		}
-		p->_size = p->size;
-	}
-	return 0;
-}
-
-/* Free all storage in the object */
-static void icmUInt16Array_delete(
-	icmBase *pp
-) {
-	icmUInt16Array *p = (icmUInt16Array *)pp;
-	icc *icp = p->icp;
-
-	if (p->data != NULL)
-		icp->al->free(icp->al, p->data);
-	icp->al->free(icp->al, p);
-}
-
-/* Create an empty object. Return null on error */
-static icmBase *new_icmUInt16Array(
-	icc *icp
-) {
-	icmUInt16Array *p;
-	if ((p = (icmUInt16Array *) icp->al->calloc(icp->al,1,sizeof(icmUInt16Array))) == NULL)
-		return NULL;
-	p->ttype    = icSigUInt16ArrayType;
-	p->refcount = 1;
-	p->get_size = icmUInt16Array_get_size;
-	p->read     = icmUInt16Array_read;
-	p->write    = icmUInt16Array_write;
-	p->dump     = icmUInt16Array_dump;
-	p->allocate = icmUInt16Array_allocate;
-	p->del      = icmUInt16Array_delete;
-	p->icp      = icp;
-
-	return (icmBase *)p;
-}
-
-/* ---------------------------------------------------------- */
-/* icmUInt32Array object */
-
-/* Return the number of bytes needed to write this tag */
-static unsigned int icmUInt32Array_get_size(
-	icmBase *pp
-) {
-	icmUInt32Array *p = (icmUInt32Array *)pp;
-	unsigned int len = 0;
-	len = sat_add(len, 8);				/* 8 bytes for tag and padding */
-	len = sat_addmul(len, p->size, 4);	/* 4 bytes for each UInt32 */
-	return len;
-}
-
-/* read the object, return 0 on success, error code on fail */
-static int icmUInt32Array_read(
-	icmBase *pp,
-	unsigned int len,	/* tag length */
-	unsigned int of		/* start offset within file */
-) {
-	icmUInt32Array *p = (icmUInt32Array *)pp;
-	icc *icp = p->icp;
-	int rv = 0;
-	unsigned int i, size;
-	char *bp, *buf;
-
-	if (len < 8) {
-		sprintf(icp->err,"icmUInt32Array_read: Tag too small to be legal");
-		return icp->errc = 1;
-	}
-
-	/* Allocate a file read buffer */
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmUInt32Array_read: malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Read portion of file into buffer */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->read(icp->fp, bp, 1, len) != len) {
-		sprintf(icp->err,"icmUInt32Array_read: fseek() or fread() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	p->size = size = (len - 8)/4;		/* Number of elements in the array */
-
-	if ((rv = p->allocate((icmBase *)p)) != 0) {
-		icp->al->free(icp->al, buf);
-		return rv;
-	}
-
-	/* Read type descriptor from the buffer */
-	if (((icTagTypeSignature)read_SInt32Number(bp)) != p->ttype) {
-		sprintf(icp->err,"icmUInt32Array_read: Wrong tag type for icmUInt32Array");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	bp += 8;	/* Skip padding */
-
-	/* Read all the data from the buffer */
-	for (i = 0; i < size; i++, bp += 4) {
-		p->data[i] = read_UInt32Number(bp);
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Write the contents of the object. Return 0 on sucess, error code on failure */
-static int icmUInt32Array_write(
-	icmBase *pp,
-	unsigned int of			/* File offset to write from */
-) {
-	icmUInt32Array *p = (icmUInt32Array *)pp;
-	icc *icp = p->icp;
-	unsigned int i;
-	unsigned int len;
-	char *bp, *buf;		/* Buffer to write from */
-	int rv = 0;
-
-	/* Allocate a file write buffer */
-	if ((len = p->get_size((icmBase *)p)) == UINT_MAX) {
-		sprintf(icp->err,"icmUInt32Array_write get_size overflow");
-		return icp->errc = 1;
-	}
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmUInt32Array_write malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Write type descriptor to the buffer */
-	if ((rv = write_SInt32Number((int)p->ttype,bp)) != 0) {
-		sprintf(icp->err,"icmUInt32Array_write: write_SInt32Number() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = rv;
-	}
-	write_SInt32Number(0,bp+4);			/* Set padding to 0 */
-
-	/* Write all the data to the buffer */
-	bp += 8;	/* Skip padding */
-	for (i = 0; i < p->size; i++, bp += 4) {
-		if ((rv = write_UInt32Number(p->data[i],bp)) != 0) {
-			sprintf(icp->err,"icmUInt32Array_write: write_UInt32umber() failed");
-			icp->al->free(icp->al, buf);
-			return icp->errc = rv;
-		}
-	}
-
-	/* Write to the file */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->write(icp->fp, buf, 1, len) != len) {
-		sprintf(icp->err,"icmUInt32Array_write fseek() or fwrite() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 2;
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Dump a text description of the object */
-static void icmUInt32Array_dump(
-	icmBase *pp,
-	icmFile *op,	/* Output to dump to */
-	int   verb		/* Verbosity level */
-) {
-	icmUInt32Array *p = (icmUInt32Array *)pp;
-	if (verb <= 0)
-		return;
-
-	op->gprintf(op,"UInt32Array:\n");
-	op->gprintf(op,"  No. elements = %lu\n",p->size);
-	if (verb >= 2) {
-		unsigned int i;
-		for (i = 0; i < p->size; i++)
-			op->gprintf(op,"    %lu:  %u\n",i,p->data[i]);
-	}
-}
-
-/* Allocate variable sized data elements */
-static int icmUInt32Array_allocate(
-	icmBase *pp
-) {
-	icmUInt32Array *p = (icmUInt32Array *)pp;
-	icc *icp = p->icp;
-
-	if (p->size != p->_size) {
-		if (ovr_mul(p->size, sizeof(unsigned int))) {
-			sprintf(icp->err,"icmUInt32Array_alloc: size overflow");
-			return icp->errc = 1;
-		}
-		if (p->data != NULL)
-			icp->al->free(icp->al, p->data);
-		if ((p->data = (unsigned int *) icp->al->calloc(icp->al, p->size, sizeof(unsigned int)))
-		                                                                              == NULL) {
-			sprintf(icp->err,"icmUInt32Array_alloc: malloc() of icmUInt32Array data failed");
-			return icp->errc = 2;
-		}
-		p->_size = p->size;
-	}
-	return 0;
-}
-
-/* Free all storage in the object */
-static void icmUInt32Array_delete(
-	icmBase *pp
-) {
-	icmUInt32Array *p = (icmUInt32Array *)pp;
-	icc *icp = p->icp;
-
-	if (p->data != NULL)
-		icp->al->free(icp->al, p->data);
-	icp->al->free(icp->al, p);
-}
-
-/* Create an empty object. Return null on error */
-static icmBase *new_icmUInt32Array(
-	icc *icp
-) {
-	icmUInt32Array *p;
-	if ((p = (icmUInt32Array *) icp->al->calloc(icp->al,1,sizeof(icmUInt32Array))) == NULL)
-		return NULL;
-	p->ttype    = icSigUInt32ArrayType;
-	p->refcount = 1;
-	p->get_size = icmUInt32Array_get_size;
-	p->read     = icmUInt32Array_read;
-	p->write    = icmUInt32Array_write;
-	p->dump     = icmUInt32Array_dump;
-	p->allocate = icmUInt32Array_allocate;
-	p->del      = icmUInt32Array_delete;
-	p->icp      = icp;
-
-	return (icmBase *)p;
-}
-
-/* ---------------------------------------------------------- */
-/* icmUInt64Array object */
-
-/* Return the number of bytes needed to write this tag */
-static unsigned int icmUInt64Array_get_size(
-	icmBase *pp
-) {
-	icmUInt64Array *p = (icmUInt64Array *)pp;
-	unsigned int len = 0;
-	len = sat_add(len, 8);				/* 8 bytes for tag and padding */
-	len = sat_addmul(len, p->size, 8);	/* 8 bytes for each UInt64 */
-	return len;
-}
-
-/* read the object, return 0 on success, error code on fail */
-static int icmUInt64Array_read(
-	icmBase *pp,
-	unsigned int len,	/* tag length */
-	unsigned int of		/* start offset within file */
-) {
-	icmUInt64Array *p = (icmUInt64Array *)pp;
-	icc *icp = p->icp;
-	int rv = 0;
-	unsigned int i, size;
-	char *bp, *buf;
-
-	if (len < 8) {
-		sprintf(icp->err,"icmUInt64Array_read: Tag too small to be legal");
-		return icp->errc = 1;
-	}
-
-	/* Allocate a file read buffer */
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmUInt64Array_read: malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Read portion of file into buffer */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->read(icp->fp, bp, 1, len) != len) {
-		sprintf(icp->err,"icmUInt64Array_read: fseek() or fread() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	p->size = size = (len - 8)/8;		/* Number of elements in the array */
-
-	if ((rv = p->allocate((icmBase *)p)) != 0) {
-		icp->al->free(icp->al, buf);
-		return rv;
-	}
-
-	/* Read type descriptor from the buffer */
-	if (((icTagTypeSignature)read_SInt32Number(bp)) != p->ttype) {
-		sprintf(icp->err,"icmUInt64Array_read: Wrong tag type for icmUInt64Array");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	bp += 8;	/* Skip padding */
-
-	/* Read all the data from the buffer */
-	for (i = 0; i < size; i++, bp += 8) {
-		read_UInt64Number(&p->data[i], bp);
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Write the contents of the object. Return 0 on sucess, error code on failure */
-static int icmUInt64Array_write(
-	icmBase *pp,
-	unsigned int of			/* File offset to write from */
-) {
-	icmUInt64Array *p = (icmUInt64Array *)pp;
-	icc *icp = p->icp;
-	unsigned int i;
-	unsigned int len;
-	char *bp, *buf;		/* Buffer to write from */
-	int rv = 0;
-
-	/* Allocate a file write buffer */
-	if ((len = p->get_size((icmBase *)p)) == UINT_MAX) {
-		sprintf(icp->err,"icmUInt64Array_write get_size overflow");
-		return icp->errc = 1;
-	}
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmUInt64Array_write malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Write type descriptor to the buffer */
-	if ((rv = write_SInt32Number((int)p->ttype,bp)) != 0) {
-		sprintf(icp->err,"icmUInt64Array_write: write_SInt32Number() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = rv;
-	}
-	write_SInt32Number(0,bp+4);			/* Set padding to 0 */
-
-	/* Write all the data to the buffer */
-	bp += 8;	/* Skip padding */
-	for (i = 0; i < p->size; i++, bp += 8) {
-		if ((rv = write_UInt64Number(&p->data[i],bp)) != 0) {
-			sprintf(icp->err,"icmUInt64Array_write: write_UInt64umber() failed");
-			icp->al->free(icp->al, buf);
-			return icp->errc = rv;
-		}
-	}
-
-	/* Write to the file */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->write(icp->fp, buf, 1, len) != len) {
-		sprintf(icp->err,"icmUInt64Array_write fseek() or fwrite() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 2;
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Dump a text description of the object */
-static void icmUInt64Array_dump(
-	icmBase *pp,
-	icmFile *op,	/* Output to dump to */
-	int   verb		/* Verbosity level */
-) {
-	icmUInt64Array *p = (icmUInt64Array *)pp;
-	if (verb <= 0)
-		return;
-
-	op->gprintf(op,"UInt64Array:\n");
-	op->gprintf(op,"  No. elements = %lu\n",p->size);
-	if (verb >= 2) {
-		unsigned int i;
-		for (i = 0; i < p->size; i++)
-			op->gprintf(op,"    %lu:  h=%lu, l=%lu\n",i,p->data[i].h,p->data[i].l);
-	}
-}
-
-/* Allocate variable sized data elements */
-static int icmUInt64Array_allocate(
-	icmBase *pp
-) {
-	icmUInt64Array *p = (icmUInt64Array *)pp;
-	icc *icp = p->icp;
-
-	if (p->size != p->_size) {
-		if (ovr_mul(p->size, sizeof(icmUint64))) {
-			sprintf(icp->err,"icmUInt64Array_alloc: size overflow");
-			return icp->errc = 1;
-		}
-		if (p->data != NULL)
-			icp->al->free(icp->al, p->data);
-		if ((p->data = (icmUint64 *) icp->al->calloc(icp->al, p->size, sizeof(icmUint64)))
-		                                                                        == NULL) {
-			sprintf(icp->err,"icmUInt64Array_alloc: malloc() of icmUInt64Array data failed");
-			return icp->errc = 2;
-		}
-		p->_size = p->size;
-	}
-	return 0;
-}
-
-/* Free all storage in the object */
-static void icmUInt64Array_delete(
-	icmBase *pp
-) {
-	icmUInt64Array *p = (icmUInt64Array *)pp;
-	icc *icp = p->icp;
-
-	if (p->data != NULL)
-		icp->al->free(icp->al, p->data);
-	icp->al->free(icp->al, p);
-}
-
-/* Create an empty object. Return null on error */
-static icmBase *new_icmUInt64Array(
-	icc *icp
-) {
-	icmUInt64Array *p;
-	if ((p = (icmUInt64Array *) icp->al->calloc(icp->al,1,sizeof(icmUInt64Array))) == NULL)
-		return NULL;
-	p->ttype    = icSigUInt64ArrayType;
-	p->refcount = 1;
-	p->get_size = icmUInt64Array_get_size;
-	p->read     = icmUInt64Array_read;
-	p->write    = icmUInt64Array_write;
-	p->dump     = icmUInt64Array_dump;
-	p->allocate = icmUInt64Array_allocate;
-	p->del      = icmUInt64Array_delete;
-	p->icp      = icp;
-
-	return (icmBase *)p;
-}
-
-/* ---------------------------------------------------------- */
-/* icmU16Fixed16Array object */
-
-/* Return the number of bytes needed to write this tag */
-static unsigned int icmU16Fixed16Array_get_size(
-	icmBase *pp
-) {
-	icmU16Fixed16Array *p = (icmU16Fixed16Array *)pp;
-	unsigned int len = 0;
-	len = sat_add(len, 8);				/* 8 bytes for tag and padding */
-	len = sat_addmul(len, p->size, 4);	/* 4 byte for each U16Fixed16 */
-	return len;
-}
-
-/* read the object, return 0 on success, error code on fail */
-static int icmU16Fixed16Array_read(
-	icmBase *pp,
-	unsigned int len,	/* tag length */
-	unsigned int of		/* start offset within file */
-) {
-	icmU16Fixed16Array *p = (icmU16Fixed16Array *)pp;
-	icc *icp = p->icp;
-	int rv = 0;
-	unsigned int i, size;
-	char *bp, *buf;
-
-	if (len < 8) {
-		sprintf(icp->err,"icmU16Fixed16Array_read: Tag too small to be legal");
-		return icp->errc = 1;
-	}
-
-	/* Allocate a file read buffer */
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmU16Fixed16Array_read: malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Read portion of file into buffer */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->read(icp->fp, bp, 1, len) != len) {
-		sprintf(icp->err,"icmU16Fixed16Array_read: fseek() or fread() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	p->size = size = (len - 8)/4;		/* Number of elements in the array */
-
-	if ((rv = p->allocate((icmBase *)p)) != 0) {
-		icp->al->free(icp->al, buf);
-		return rv;
-	}
-
-	/* Read type descriptor from the buffer */
-	if (((icTagTypeSignature)read_SInt32Number(bp)) != p->ttype) {
-		sprintf(icp->err,"icmU16Fixed16Array_read: Wrong tag type for icmU16Fixed16Array");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	bp += 8;	/* Skip padding */
-
-	/* Read all the data from the buffer */
-	for (i = 0; i < size; i++, bp += 4) {
-		p->data[i] = read_U16Fixed16Number(bp);
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Write the contents of the object. Return 0 on sucess, error code on failure */
-static int icmU16Fixed16Array_write(
-	icmBase *pp,
-	unsigned int of			/* File offset to write from */
-) {
-	icmU16Fixed16Array *p = (icmU16Fixed16Array *)pp;
-	icc *icp = p->icp;
-	unsigned int i;
-	unsigned int len;
-	char *bp, *buf;		/* Buffer to write from */
-	int rv = 0;
-
-	/* Allocate a file write buffer */
-	if ((len = p->get_size((icmBase *)p)) == UINT_MAX) {
-		sprintf(icp->err,"icmU16Fixed16Array_write get_size overflow");
-		return icp->errc = 1;
-	}
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmU16Fixed16Array_write malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Write type descriptor to the buffer */
-	if ((rv = write_SInt32Number((int)p->ttype,bp)) != 0) {
-		sprintf(icp->err,"icmU16Fixed16Array_write: write_SInt32Number() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = rv;
-	}
-	write_SInt32Number(0,bp+4);			/* Set padding to 0 */
-
-	/* Write all the data to the buffer */
-	bp += 8;	/* Skip padding */
-	for (i = 0; i < p->size; i++, bp += 4) {
-		if ((rv = write_U16Fixed16Number(p->data[i],bp)) != 0) {
-			sprintf(icp->err,"icmU16Fixed16Array_write: write_U16Fixed16umber() failed");
-			icp->al->free(icp->al, buf);
-			return icp->errc = rv;
-		}
-	}
-
-	/* Write to the file */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->write(icp->fp, buf, 1, len) != len) {
-		sprintf(icp->err,"icmU16Fixed16Array_write fseek() or fwrite() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 2;
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Dump a text description of the object */
-static void icmU16Fixed16Array_dump(
-	icmBase *pp,
-	icmFile *op,	/* Output to dump to */
-	int   verb		/* Verbosity level */
-) {
-	icmU16Fixed16Array *p = (icmU16Fixed16Array *)pp;
-	if (verb <= 0)
-		return;
-
-	op->gprintf(op,"U16Fixed16Array:\n");
-	op->gprintf(op,"  No. elements = %lu\n",p->size);
-	if (verb >= 2) {
-		unsigned int i;
-		for (i = 0; i < p->size; i++)
-			op->gprintf(op,"    %lu:  %f\n",i,p->data[i]);
-	}
-}
-
-/* Allocate variable sized data elements */
-static int icmU16Fixed16Array_allocate(
-	icmBase *pp
-) {
-	icmU16Fixed16Array *p = (icmU16Fixed16Array *)pp;
-	icc *icp = p->icp;
-
-	if (p->size != p->_size) {
-		if (ovr_mul(p->size, sizeof(double))) {
-			sprintf(icp->err,"icmU16Fixed16Array_alloc: size overflow");
-			return icp->errc = 1;
-		}
-		if (p->data != NULL)
-			icp->al->free(icp->al, p->data);
-		if ((p->data = (double *) icp->al->calloc(icp->al, p->size, sizeof(double))) == NULL) {
-			sprintf(icp->err,"icmU16Fixed16Array_alloc: malloc() of icmU16Fixed16Array data failed");
-			return icp->errc = 2;
-		}
-		p->_size = p->size;
-	}
-	return 0;
-}
-
-/* Free all storage in the object */
-static void icmU16Fixed16Array_delete(
-	icmBase *pp
-) {
-	icmU16Fixed16Array *p = (icmU16Fixed16Array *)pp;
-	icc *icp = p->icp;
-
-	if (p->data != NULL)
-		icp->al->free(icp->al, p->data);
-	icp->al->free(icp->al, p);
-}
-
-/* Create an empty object. Return null on error */
-static icmBase *new_icmU16Fixed16Array(
-	icc *icp
-) {
-	icmU16Fixed16Array *p;
-	if ((p = (icmU16Fixed16Array *) icp->al->calloc(icp->al,1,sizeof(icmU16Fixed16Array))) == NULL)
-		return NULL;
-	p->ttype    = icSigU16Fixed16ArrayType;
-	p->refcount = 1;
-	p->get_size = icmU16Fixed16Array_get_size;
-	p->read     = icmU16Fixed16Array_read;
-	p->write    = icmU16Fixed16Array_write;
-	p->dump     = icmU16Fixed16Array_dump;
-	p->allocate = icmU16Fixed16Array_allocate;
-	p->del      = icmU16Fixed16Array_delete;
-	p->icp      = icp;
-
-	return (icmBase *)p;
-}
-
-/* ---------------------------------------------------------- */
-/* icmS15Fixed16Array object */
-
-/* Return the number of bytes needed to write this tag */
-static unsigned int icmS15Fixed16Array_get_size(
-	icmBase *pp
-) {
-	icmS15Fixed16Array *p = (icmS15Fixed16Array *)pp;
-	unsigned int len = 0;
-	len = sat_add(len, 8);				/* 8 bytes for tag and padding */
-	len = sat_addmul(len, p->size, 4);	/* 4 byte for each S15Fixed16 */
-	return len;
-}
-
-/* read the object, return 0 on success, error code on fail */
-static int icmS15Fixed16Array_read(
-	icmBase *pp,
-	unsigned int len,		/* tag length */
-	unsigned int of		/* start offset within file */
-) {
-	icmS15Fixed16Array *p = (icmS15Fixed16Array *)pp;
-	icc *icp = p->icp;
-	int rv = 0;
-	unsigned int i, size;
-	char *bp, *buf;
-
-	if (len < 8) {
-		sprintf(icp->err,"icmS15Fixed16Array_read: Tag too small to be legal");
-		return icp->errc = 1;
-	}
-
-	/* Allocate a file read buffer */
-	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
-		sprintf(icp->err,"icmS15Fixed16Array_read: malloc() failed");
-		return icp->errc = 2;
-	}
-	bp = buf;
-
-	/* Read portion of file into buffer */
-	if (   icp->fp->seek(icp->fp, of) != 0
-	    || icp->fp->read(icp->fp, bp, 1, len) != len) {
-		sprintf(icp->err,"icmS15Fixed16Array_read: fseek() or fread() failed");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	p->size = size = (len - 8)/4;		/* Number of elements in the array */
-
-	if ((rv = p->allocate((icmBase *)p)) != 0) {
-		icp->al->free(icp->al, buf);
-		return rv;
-	}
-
-	/* Read type descriptor from the buffer */
-	if (((icTagTypeSignature)read_SInt32Number(bp)) != p->ttype) {
-		sprintf(icp->err,"icmS15Fixed16Array_read: Wrong tag type for icmS15Fixed16Array");
-		icp->al->free(icp->al, buf);
-		return icp->errc = 1;
-	}
-	bp += 8;	/* Skip padding */
-
-	/* Read all the data from the buffer */
-	for (i = 0; i < size; i++, bp += 4) {
-		p->data[i] = read_S15Fixed16Number(bp);
-	}
-	icp->al->free(icp->al, buf);
-	return 0;
-}
-
-/* Write the contents of the object. Return 0 on sucess, error code on failure */
-static int icmS15Fixed16Array_write(
-	icmBase *pp,