Backed out changeset 6f3c2171bbb2:
authorJoe Drew <joe@drew.ca>
Fri, 03 Apr 2009 16:27:27 -0400
changeset 26900 b025b0c6e3806754edac056176b8132b80b37c08
parent 26896 6f3c2171bbb22238f1e2dd13c7f748ac6e62145b
child 26903 9c5d2510b2667141229ac81a2e1e540a871ff55d
push idunknown
push userunknown
push dateunknown
bugs481926
milestone1.9.2a1pre
backs out6f3c2171bbb22238f1e2dd13c7f748ac6e62145b
Backed out changeset 6f3c2171bbb2: Bug 481926 - Rewrite color management component. r=joe,ted sr=vlad
config/autoconf.mk.in
config/static-config.mk
configure.in
content/canvas/src/Makefile.in
gfx/Makefile.in
gfx/qcms/Makefile.in
gfx/qcms/iccread.c
gfx/qcms/qcms.h
gfx/qcms/qcmsint.h
gfx/qcms/qcmstypes.h
gfx/qcms/transform.c
gfx/src/thebes/Makefile.in
gfx/thebes/public/gfxPlatform.h
gfx/thebes/public/gfxPlatformGtk.h
gfx/thebes/public/gfxPlatformMac.h
gfx/thebes/public/gfxQtPlatform.h
gfx/thebes/public/gfxWindowsPlatform.h
gfx/thebes/src/Makefile.in
gfx/thebes/src/gfxContext.cpp
gfx/thebes/src/gfxPattern.cpp
gfx/thebes/src/gfxPlatform.cpp
gfx/thebes/src/gfxPlatformGtk.cpp
gfx/thebes/src/gfxPlatformMac.cpp
gfx/thebes/src/gfxQtPlatform.cpp
gfx/thebes/src/gfxWindowsPlatform.cpp
gfx/thebes/test/Makefile.in
layout/base/Makefile.in
layout/mathml/Makefile.in
layout/svg/base/src/Makefile.in
modules/libpr0n/build/Makefile.in
modules/libpr0n/decoders/gif/Makefile.in
modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
modules/libpr0n/decoders/jpeg/Makefile.in
modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h
modules/libpr0n/decoders/png/Makefile.in
modules/libpr0n/decoders/png/nsPNGDecoder.cpp
modules/libpr0n/decoders/png/nsPNGDecoder.h
modules/libpr0n/test/reftest/pngsuite-ancillary/ccwn2c08.html
modules/libpr0n/test/reftest/pngsuite-ancillary/ccwn3p08.html
toolkit/library/libxul-rules.mk
toolkit/toolkit-makefiles.sh
toolkit/toolkit-tiers.mk
widget/src/build/Makefile.in
widget/src/cocoa/Makefile.in
widget/src/cocoa/nsCocoaWindow.mm
widget/src/gtk2/Makefile.in
widget/src/os2/Makefile.in
widget/src/qt/Makefile.in
widget/src/windows/Makefile.in
widget/src/xpwidgets/Makefile.in
widget/src/xpwidgets/nsXPLookAndFeel.cpp
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -276,17 +276,17 @@ WCHAR_CFLAGS	= @WCHAR_CFLAGS@
 OS_CPPFLAGS	= @CPPFLAGS@
 OS_CFLAGS	= $(OS_CPPFLAGS) @CFLAGS@
 OS_CXXFLAGS	= $(OS_CPPFLAGS) @CXXFLAGS@
 OS_LDFLAGS	= @LDFLAGS@
 
 OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
 OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
 
-OS_INCLUDES	= $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
+OS_INCLUDES	= $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
 OS_LIBS		= @LIBS@
 ACDEFINES	= @MOZ_DEFINES@
 
 WARNINGS_AS_ERRORS = @WARNINGS_AS_ERRORS@
 
 MOZ_OPTIMIZE	= @MOZ_OPTIMIZE@
 MOZ_OPTIMIZE_FLAGS = @MOZ_OPTIMIZE_FLAGS@
 MOZ_OPTIMIZE_LDFLAGS = @MOZ_OPTIMIZE_LDFLAGS@
@@ -443,17 +443,19 @@ PNG_CFLAGS	= @PNG_CFLAGS@
 PNG_LIBS	= @PNG_LIBS@
 PNG_REQUIRES	=
 else
 PNG_CFLAGS	= @MOZ_PNG_CFLAGS@
 PNG_LIBS	= @MOZ_PNG_LIBS@
 PNG_REQUIRES	= png
 endif
 
-QCMS_LIBS	= @QCMS_LIBS@
+LCMS_CFLAGS	= @LCMS_CFLAGS@
+LCMS_LIBS	= @LCMS_LIBS@
+LCMS_REQUIRES	= lcms
 
 MOZ_NATIVE_SQLITE = @MOZ_NATIVE_SQLITE@
 SQLITE_CFLAGS     = @SQLITE_CFLAGS@
 SQLITE_LIBS       = @SQLITE_LIBS@
 
 NSPR_CONFIG	= @NSPR_CONFIG@
 NSPR_CFLAGS	= @NSPR_CFLAGS@
 NSPR_LIBS	= @NSPR_LIBS@
--- a/config/static-config.mk
+++ b/config/static-config.mk
@@ -64,16 +64,17 @@ STATIC_EXTRA_DEPS	+= \
 ifdef MOZ_PSM
 STATIC_EXTRA_DEPS	+= $(NSS_DEP_LIBS)
 endif
 
 STATIC_EXTRA_LIBS	+= \
 		$(PNG_LIBS) \
 		$(JPEG_LIBS) \
 		$(ZLIB_LIBS) \
+		$(LCMS_LIBS) \
 		$(NULL)
 
 ifdef MOZ_PSM
 STATIC_EXTRA_LIBS	+= \
 		$(NSS_LIBS) \
 		$(NULL)
 endif
 
--- a/configure.in
+++ b/configure.in
@@ -124,16 +124,17 @@ GTK2_VERSION=2.10.0
 WINDRES_VERSION=2.14.90
 W32API_VERSION=3.8
 GNOMEVFS_VERSION=2.0
 GNOMEUI_VERSION=2.2.0
 GCONF_VERSION=1.2.1
 LIBGNOME_VERSION=2.0
 STARTUP_NOTIFICATION_VERSION=0.8
 DBUS_VERSION=0.60
+LCMS_VERSION=1.17
 SQLITE_VERSION=3.6.10
 LIBNOTIFY_VERSION=0.4
 
 MSMANIFEST_TOOL=
 
 dnl Set various checks
 dnl ========================================================
 MISSING_X=
@@ -7641,21 +7642,32 @@ else
         MOZ_CAIRO_CFLAGS="$MOZ_CAIRO_CFLAGS $CAIRO_XRENDER_CFLAGS"
    fi
 fi
 
 AC_SUBST(MOZ_TREE_CAIRO)
 AC_SUBST(MOZ_CAIRO_CFLAGS)
 AC_SUBST(MOZ_CAIRO_LIBS)
 
-dnl qcms
-dnl ========================================================
-
-QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'
-AC_SUBST(QCMS_LIBS)
+dnl ========================================================
+dnl Check for lcms
+dnl ========================================================
+
+LCMS_CFLAGS=
+if test "$_WIN32_MSVC"; then
+    if test -z "$BUILD_STATIC_LIBS" -a -z "$MOZ_ENABLE_LIBXUL"; then
+        LCMS_CFLAGS=-DLCMS_DLL
+    fi
+    LCMS_LIBS='$(LIBXUL_DIST)/lib/mozlcms.lib'
+else
+    LCMS_LIBS='-L$(LIBXUL_DIST)/bin -lmozlcms'
+fi
+
+AC_SUBST(LCMS_CFLAGS)
+AC_SUBST(LCMS_LIBS)
 
 dnl ========================================================
 dnl disable xul
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(xul,
 [  --disable-xul           Disable XUL],
     MOZ_XUL= )
 if test "$MOZ_XUL"; then
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -60,17 +60,16 @@ REQUIRES	= \
 		necko \
 		pref \
 		docshell \
 		xpconnect \
 		caps \
 		imglib2 \
 		thebes \
 		view \
-		qcms \
 		$(NULL)
 
 # XXX some platforms can't handle building
 # an empty .a/lib.  Remove this dummy.cpp
 # whenever w have a rendering context
 # that doesn't depend on any non-default
 # libraries.
 CPPSRCS		= dummy.cpp \
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -43,17 +43,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= gfx
 
 ifdef MOZ_TREE_CAIRO
 DIRS		= cairo
 endif
 
-DIRS		+= thebes public idl src qcms
+DIRS		+= thebes public idl src
 
 ifdef ENABLE_TESTS
 ifndef MOZ_ENABLE_LIBXUL
 TOOL_DIRS	+= tests
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/gfx/qcms/Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE       = qcms
-LIBRARY_NAME = mozqcms
-LIBXUL_LIBRARY = 1
-GRE_MODULE      = 1
-DIST_INSTALL = 1
-
-EXPORTS      = qcms.h qcmstypes.h
-
-CSRCS = iccread.c transform.c
-
-FORCE_STATIC_LIB = 1
-# This library is used by other shared libs
-FORCE_USE_PIC = 1
-
-include $(topsrcdir)/config/rules.mk
-
-CFLAGS          += -DMOZ_QCMS
deleted file mode 100644
--- a/gfx/qcms/iccread.c
+++ /dev/null
@@ -1,783 +0,0 @@
-//  qcms
-//  Copyright (C) 2009 Mozilla Foundation
-//  Copyright (C) 1998-2007 Marti Maria
-//
-// Permission is hereby granted, free of charge, to any person obtaining 
-// a copy of this software and associated documentation files (the "Software"), 
-// to deal in the Software without restriction, including without limitation 
-// the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-// and/or sell copies of the Software, and to permit persons to whom the Software 
-// is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in 
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO 
-// THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#include <math.h>
-#include <assert.h>
-#include <stdlib.h>
-#include "qcmsint.h"
-
-//XXX: use a better typename
-typedef uint32_t __be32;
-typedef uint16_t __be16;
-
-/* all of the platforms that we use _MSC_VER on are little endian
- * so this is sufficient for now */
-#ifdef _MSC_VER
-#define LITTLE_ENDIAN
-#endif
-
-#if !defined(BIG_ENDIAN) && !defined(LITTLE_ENDIAN)
-#error Unknown endianess
-#endif
-
-#if 0
-not used yet
-/* __builtin_bswap isn't available in older gccs
- * so open code it for now */
-static __be32 cpu_to_be32(int32_t v)
-{
-#ifdef LITTLE_ENDIAN
-	return ((v & 0xff) << 24) | ((v & 0xff00) << 8) | ((v & 0xff0000) >> 8) | ((v & 0xff000000) >> 24);
-	//return __builtin_bswap32(v);
-	return v;
-#endif
-}
-#endif
-
-static uint32_t be32_to_cpu(__be32 v)
-{
-#ifdef LITTLE_ENDIAN
-	return ((v & 0xff) << 24) | ((v & 0xff00) << 8) | ((v & 0xff0000) >> 8) | ((v & 0xff000000) >> 24);
-	//return __builtin_bswap32(v);
-#else
-	return v;
-#endif
-}
-
-static uint32_t be16_to_cpu(__be16 v)
-{
-#ifdef LITTLE_ENDIAN
-	return ((v & 0xff) << 8) | ((v & 0xff00) >> 8);
-#else
-	return v;
-#endif
-}
-
-/* a wrapper around the memory that we are going to parse
- * into a qcms_profile */
-struct mem_source
-{
-	const unsigned char *buf;
-	size_t size;
-	qcms_bool valid;
-	const char *invalid_reason;
-};
-
-static void invalid_source(struct mem_source *mem, const char *reason)
-{
-	mem->valid = false;
-	mem->invalid_reason = reason;
-}
-
-static uint32_t read_u32(struct mem_source *mem, size_t offset)
-{
-	if (offset + 4 > mem->size) {
-		invalid_source(mem, "Invalid offset");
-		return 0;
-	} else {
-		return be32_to_cpu(*(__be32*)(mem->buf + offset));
-	}
-}
-
-static uint16_t read_u16(struct mem_source *mem, size_t offset)
-{
-	if (offset + 2 > mem->size) {
-		invalid_source(mem, "Invalid offset");
-		return 0;
-	} else {
-		return be16_to_cpu(*(__be16*)(mem->buf + offset));
-	}
-}
-
-static uint8_t read_u8(struct mem_source *mem, size_t offset)
-{
-	if (offset + 1 > mem->size) {
-		invalid_source(mem, "Invalid offset");
-		return 0;
-	} else {
-		return *(uint8_t*)(mem->buf + offset);
-	}
-}
-
-static s15Fixed16Number read_s15Fixed16Number(struct mem_source *mem, size_t offset)
-{
-	return read_u32(mem, offset);
-}
-
-#if 0
-static uInt16Number read_uInt16Number(struct mem_source *mem, size_t offset)
-{
-	return read_u16(mem, offset);
-}
-#endif
-
-#define BAD_VALUE_PROFILE NULL
-#define INVALID_PROFILE NULL
-#define NO_MEM_PROFILE NULL
-
-/* An arbitrary 4MB limit on profile size */
-#define MAX_PROFILE_SIZE 1024*1024*4
-#define MAX_TAG_COUNT 1024
-
-static void check_CMM_type_signature(struct mem_source *src)
-{
-	//uint32_t CMM_type_signature = read_u32(src, 4);
-	//TODO: do the check?
-
-}
-
-static void check_profile_version(struct mem_source *src)
-{
-	uint8_t major_revision = read_u8(src, 8 + 0);
-	uint8_t minor_revision = read_u8(src, 8 + 1);
-	uint8_t reserved1      = read_u8(src, 8 + 2);
-	uint8_t reserved2      = read_u8(src, 8 + 3);
-	if (major_revision > 0x2)
-		invalid_source(src, "Unsupported major revision");
-	if (minor_revision > 0x40)
-		invalid_source(src, "Unsupported minor revision");
-	if (reserved1 != 0 || reserved2 != 0)
-		invalid_source(src, "Invalid reserved bytes");
-}
-
-#define INPUT_DEVICE_PROFILE   0x73636e72 // 'scnr'
-#define DISPLAY_DEVICE_PROFILE 0x6d6e7472 // 'mntr'
-#define OUTPUT_DEVICE_PROFILE  0x70727472 // 'prtr'
-#define DEVICE_LINK_PROFILE    0x6c696e6b // 'link'
-#define COLOR_SPACE_PROFILE    0x73706163 // 'spac'
-#define ABSTRACT_PROFILE       0x61627374 // 'abst'
-#define NAMED_COLOR_PROFILE    0x6e6d636c // 'nmcl'
-
-static void read_class_signature(qcms_profile *profile, struct mem_source *mem)
-{
-	profile->class = read_u32(mem, 12);
-	switch (profile->class) {
-		case DISPLAY_DEVICE_PROFILE:
-		case INPUT_DEVICE_PROFILE:
-			break;
-		case OUTPUT_DEVICE_PROFILE:
-		default:
-			invalid_source(mem, "Invalid  Profile/Device Class signature");
-	}
-}
-
-static void read_color_space(qcms_profile *profile, struct mem_source *mem)
-{
-	profile->color_space = read_u32(mem, 16);
-	switch (profile->color_space) {
-		case RGB_SIGNATURE:
-		case GRAY_SIGNATURE:
-			break;
-		default:
-			invalid_source(mem, "Unsupported colorspace");
-	}
-}
-
-struct tag
-{
-	uint32_t signature;
-	uint32_t offset;
-	uint32_t size;
-};
-
-struct tag_index {
-	uint32_t count;
-	struct tag *tags;
-};
-
-static struct tag_index read_tag_table(qcms_profile *profile, struct mem_source *mem)
-{
-	struct tag_index index = {0, NULL};
-	int i;
-
-	index.count = read_u32(mem, 128);
-	if (index.count > MAX_TAG_COUNT) {
-		invalid_source(mem, "max number of tags exceeded");
-		return index;
-	}
-
-	index.tags = malloc(sizeof(struct tag)*index.count);
-	if (index.tags) {
-		for (i = 0; i < index.count; i++) {
-			index.tags[i].signature = read_u32(mem, 128 + 4 + 4*i*3);
-			index.tags[i].offset    = read_u32(mem, 128 + 4 + 4*i*3 + 4);
-			index.tags[i].size      = read_u32(mem, 128 + 4 + 4*i*3 + 8);
-		}
-	}
-
-	return index;
-}
-
-// Checks a profile for obvious inconsistencies and returns
-// true if the profile looks bogus and should probably be
-// ignored.
-qcms_bool qcms_profile_is_bogus(qcms_profile *profile)
-{
-       float sum[3], target[3], tolerance[3];
-       unsigned i;
-
-       // Sum the values
-       sum[0] = s15Fixed16Number_to_float(profile->redColorant.X) +
-	       s15Fixed16Number_to_float(profile->greenColorant.X) +
-	       s15Fixed16Number_to_float(profile->blueColorant.X);
-       sum[1] = s15Fixed16Number_to_float(profile->redColorant.Y) +
-	       s15Fixed16Number_to_float(profile->greenColorant.Y) +
-	       s15Fixed16Number_to_float(profile->blueColorant.Y);
-       sum[2] = s15Fixed16Number_to_float(profile->redColorant.Z) +
-	       s15Fixed16Number_to_float(profile->greenColorant.Z) +
-	       s15Fixed16Number_to_float(profile->blueColorant.Z);
-
-       // Build our target vector (see mozilla bug 460629)
-       target[0] = 0.96420;
-       target[1] = 1.00000;
-       target[2] = 0.82491;
-
-       // Our tolerance vector - Recommended by Chris Murphy based on
-       // conversion from the LAB space criterion of no more than 3 in any one
-       // channel. This is similar to, but slightly more tolerant than Adobe's
-       // criterion.
-       tolerance[0] = 0.02;
-       tolerance[1] = 0.02;
-       tolerance[2] = 0.04;
-
-       // Compare with our tolerance
-       for (i = 0; i < 3; ++i) {
-           if (!(((sum[i] - tolerance[i]) <= target[i]) &&
-                 ((sum[i] + tolerance[i]) >= target[i])))
-               return true;
-       }
-
-       // All Good
-       return false;
-}
-
-#define TAG_bXYZ 0x6258595a
-#define TAG_gXYZ 0x6758595a
-#define TAG_rXYZ 0x7258595a
-#define TAG_rTRC 0x72545243
-#define TAG_bTRC 0x62545243
-#define TAG_gTRC 0x67545243
-#define TAG_kTRC 0x6b545243
-#define TAG_A2B0 0x41324230
-
-static struct tag *find_tag(struct tag_index index, uint32_t tag_id)
-{
-	int i;
-	struct tag *tag = NULL;
-	for (i = 0; i < index.count; i++) {
-		if (index.tags[i].signature == tag_id) {
-			return &index.tags[i];
-		}
-	}
-	return tag;
-}
-
-#define XYZ_TYPE   0x58595a20 // 'XYZ '
-#define CURVE_TYPE 0x63757276 // 'curv'
-#define LUT16_TYPE 0x6d667432 // 'mft2'
-#define LUT8_TYPE  0x6d667431 // 'mft1'
-
-static struct XYZNumber read_tag_XYZType(struct mem_source *src, struct tag_index index, uint32_t tag_id)
-{
-	struct XYZNumber num = {0};
-	struct tag *tag = find_tag(index, tag_id);
-	if (tag) {
-		uint32_t offset = tag->offset;
-
-		uint32_t type = read_u32(src, offset);
-		if (type != XYZ_TYPE)
-			invalid_source(src, "unexpected type, expected XYZ");
-		num.X = read_s15Fixed16Number(src, offset+8);
-		num.Y = read_s15Fixed16Number(src, offset+12);
-		num.Z = read_s15Fixed16Number(src, offset+16);
-	} else {
-		invalid_source(src, "missing xyztag");
-	}
-	return num;
-}
-
-static struct curveType *read_tag_curveType(struct mem_source *src, struct tag_index index, uint32_t tag_id)
-{
-	struct tag *tag = find_tag(index, tag_id);
-	struct curveType *curve = NULL;
-	if (tag) {
-		uint32_t offset = tag->offset;
-		uint32_t type = read_u32(src, offset);
-		uint32_t count = read_u32(src, offset+8);
-		int i;
-
-		if (type != CURVE_TYPE) {
-			invalid_source(src, "unexpected type, expected CURV");
-			return NULL;
-		}
-
-#define MAX_CURVE_ENTRIES 40000 //arbitrary
-		if (count > MAX_CURVE_ENTRIES) {
-			invalid_source(src, "curve size too large");
-			return NULL;
-		}
-		curve = malloc(sizeof(struct curveType) + sizeof(uInt16Number)*count);
-		if (!curve)
-			return NULL;
-
-		curve->count = count;
-		for (i=0; i<count; i++) {
-			curve->data[i] = read_u16(src, offset + 12 + i *2);
-		}
-	} else {
-		invalid_source(src, "missing curvetag");
-	}
-
-	return curve;
-}
-
-/* This function's not done yet */
-static struct lutType *read_tag_lutType(struct mem_source *src, struct tag_index index, uint32_t tag_id)
-{
-	struct tag *tag = find_tag(index, tag_id);
-	uint32_t offset = tag->offset;
-	uint32_t type = read_u32(src, offset);
-	uint16_t num_input_table_entries;
-	uint16_t num_output_table_entries;
-	uint8_t in_chan, grid_points, out_chan;
-	uint32_t clut_size;
-	struct lutType *lut;
-	int i;
-
-	num_input_table_entries  = read_u16(src, offset + 48);
-	num_output_table_entries = read_u16(src, offset + 50);
-
-	in_chan     = read_u8(src, offset + 8);
-	out_chan    = read_u8(src, offset + 9);
-	grid_points = read_u8(src, offset + 10);
-
-	if (!src->valid)
-		return NULL;
-
-	clut_size = in_chan * grid_points * out_chan;
-#define MAX_CLUT_SIZE 10000 // arbitrary
-	if (clut_size > MAX_CLUT_SIZE) {
-		return NULL;
-	}
-
-	if (type != LUT16_TYPE && type != LUT8_TYPE)
-		return NULL;
-
-	lut = malloc(sizeof(struct lutType) + (clut_size + num_input_table_entries + num_output_table_entries)*sizeof(uint8_t));
-	if (!lut)
-		return NULL;
-	lut->num_input_channels   = read_u8(src, offset + 8);
-	lut->num_output_channels  = read_u8(src, offset + 9);
-	lut->num_clut_grid_points = read_u8(src, offset + 10);
-	lut->e00 = read_s15Fixed16Number(src, offset+12);
-	lut->e01 = read_s15Fixed16Number(src, offset+16);
-	lut->e02 = read_s15Fixed16Number(src, offset+20);
-	lut->e10 = read_s15Fixed16Number(src, offset+24);
-	lut->e11 = read_s15Fixed16Number(src, offset+28);
-	lut->e12 = read_s15Fixed16Number(src, offset+32);
-	lut->e20 = read_s15Fixed16Number(src, offset+36);
-	lut->e21 = read_s15Fixed16Number(src, offset+40);
-	lut->e22 = read_s15Fixed16Number(src, offset+44);
-
-	//TODO: finish up
-	for (i = 0; i < lut->num_input_table_entries; i++) {
-	}
-	return lut;
-}
-
-static void read_rendering_intent(qcms_profile *profile, struct mem_source *src)
-{
-	profile->rendering_intent = read_u32(src, 64);
-	switch (profile->rendering_intent) {
-		case QCMS_INTENT_PERCEPTUAL:
-		case QCMS_INTENT_SATURATION:
-		case QCMS_INTENT_RELATIVE_COLORIMETRIC:
-		case QCMS_INTENT_ABSOLUTE_COLORIMETRIC:
-			break;
-		default:
-			invalid_source(src, "unknown rendering intent");
-	}
-}
-
-qcms_profile *qcms_profile_create(void)
-{
-	return calloc(sizeof(qcms_profile), 1);
-}
-
-/* build sRGB gamma table */
-/* based on cmsBuildParametricGamma() */
-static uint16_t *build_sRGB_gamma_table(int num_entries)
-{
-	int i;
-	/* taken from lcms: Build_sRGBGamma() */
-	double gamma = 2.4;
-	double a = 1./1.055;
-	double b = 0.055/1.055;
-	double c = 1./12.92;
-	double d = 0.04045;
-
-	uint16_t *table = malloc(sizeof(uint16_t) * num_entries);
-	if (!table)
-		return NULL;
-
-	for (i=0; i<num_entries; i++) {
-		double x = (double)i / (num_entries-1);
-		double y, output;
-		// IEC 61966-2.1 (sRGB)
-		// Y = (aX + b)^Gamma | X >= d
-		// Y = cX             | X < d
-		if (x >= d) {
-			double e = (a*x + b);
-			if (e > 0)
-				y = pow(e, gamma);
-			else
-				y = 0;
-		} else {
-			y = c*x;
-		}
-
-		// Saturate -- this could likely move to a separate function
-		output = y * 65535. + .5;
-		if (output > 65535.)
-			output = 65535;
-		if (output < 0)
-			output = 0;
-		table[i] = (uint16_t)floor(output);
-	}
-	return table;
-}
-
-static struct curveType *curve_from_table(uint16_t *table, int num_entries)
-{
-	struct curveType *curve;
-	int i;
-	curve = malloc(sizeof(struct curveType) + sizeof(uInt16Number)*num_entries);
-	if (!curve)
-		return NULL;
-	curve->count = num_entries;
-	for (i = 0; i < num_entries; i++) {
-		curve->data[i] = table[i];
-	}
-	return curve;
-}
-
-static uint16_t float_to_u8Fixed8Number(float a)
-{
-	if (a > (255. + 255./256))
-		return 0xffff;
-	else if (a < 0.)
-		return 0;
-	else
-		return floor(a*256. + .5);
-}
-
-static struct curveType *curve_from_gamma(float gamma)
-{
-	struct curveType *curve;
-	int num_entries = 1;
-	curve = malloc(sizeof(struct curveType) + sizeof(uInt16Number)*num_entries);
-	if (!curve)
-		return NULL;
-	curve->count = num_entries;
-	curve->data[0] = float_to_u8Fixed8Number(gamma);
-	return curve;
-}
-
-static void qcms_profile_fini(qcms_profile *profile)
-{
-	free(profile->redTRC);
-	free(profile->blueTRC);
-	free(profile->greenTRC);
-	free(profile->grayTRC);
-	free(profile);
-}
-
-//XXX: it would be nice if we had a way of ensuring
-// everything in a profile was initialized regardless of how it was created
-
-//XXX: should this also be taking a black_point?
-/* similar to CGColorSpaceCreateCalibratedRGB */
-qcms_profile* qcms_profile_create_rgb_with_gamma(
-		qcms_CIE_xyY white_point,
-		qcms_CIE_xyYTRIPLE primaries,
-		float gamma)
-{
-	qcms_profile* profile = qcms_profile_create();
-
-	//XXX: should store the whitepoint
-	set_rgb_colorants(profile, white_point, primaries);
-
-	profile->redTRC = curve_from_gamma(gamma);
-	profile->blueTRC = curve_from_gamma(gamma);
-	profile->greenTRC = curve_from_gamma(gamma);
-
-	if (!profile->redTRC || !profile->blueTRC || !profile->greenTRC) {
-		qcms_profile_fini(profile);
-		return NO_MEM_PROFILE;
-	}
-	profile->class = DISPLAY_DEVICE_PROFILE;
-	profile->rendering_intent = QCMS_INTENT_PERCEPTUAL;
-	profile->color_space = RGB_SIGNATURE;
-	return profile;
-}
-
-qcms_profile* qcms_profile_create_rgb_with_table(
-		qcms_CIE_xyY white_point,
-		qcms_CIE_xyYTRIPLE primaries,
-		uint16_t *table, int num_entries)
-{
-	qcms_profile* profile = qcms_profile_create();
-
-	//XXX: should store the whitepoint
-	set_rgb_colorants(profile, white_point, primaries);
-
-	profile->redTRC = curve_from_table(table, num_entries);
-	profile->blueTRC = curve_from_table(table, num_entries);
-	profile->greenTRC = curve_from_table(table, num_entries);
-
-	if (!profile->redTRC || !profile->blueTRC || !profile->greenTRC) {
-		qcms_profile_fini(profile);
-		return NO_MEM_PROFILE;
-	}
-	profile->class = DISPLAY_DEVICE_PROFILE;
-	profile->rendering_intent = QCMS_INTENT_PERCEPTUAL;
-	profile->color_space = RGB_SIGNATURE;
-	return profile;
-}
-
-/* from lcms: cmsWhitePointFromTemp */
-/* tempK must be >= 4000. and <= 25000.
- * similar to argyll: icx_DTEMP2XYZ() */
-static qcms_CIE_xyY white_point_from_temp(int temp_K)
-{
-	qcms_CIE_xyY white_point;
-	double x, y;
-	double T, T2, T3;
-	// double M1, M2;
-
-	// No optimization provided.
-	T = temp_K;
-	T2 = T*T;            // Square
-	T3 = T2*T;           // Cube
-
-	// For correlated color temperature (T) between 4000K and 7000K:
-	if (T >= 4000. && T <= 7000.) {
-		x = -4.6070*(1E9/T3) + 2.9678*(1E6/T2) + 0.09911*(1E3/T) + 0.244063;
-	} else {
-		// or for correlated color temperature (T) between 7000K and 25000K:
-		if (T > 7000.0 && T <= 25000.0) {
-			x = -2.0064*(1E9/T3) + 1.9018*(1E6/T2) + 0.24748*(1E3/T) + 0.237040;
-		} else {
-			assert(0 && "invalid temp");
-		}
-	}
-
-	// Obtain y(x)
-
-	y = -3.000*(x*x) + 2.870*x - 0.275;
-
-	// wave factors (not used, but here for futures extensions)
-
-	// M1 = (-1.3515 - 1.7703*x + 5.9114 *y)/(0.0241 + 0.2562*x - 0.7341*y);
-	// M2 = (0.0300 - 31.4424*x + 30.0717*y)/(0.0241 + 0.2562*x - 0.7341*y);
-
-	// Fill white_point struct
-	white_point.x = x;
-	white_point.y = y;
-	white_point.Y = 1.0;
-
-	return white_point;
-}
-
-qcms_profile* qcms_profile_sRGB(void)
-{
-	qcms_profile *profile;
-	uint16_t *table;
-
-	qcms_CIE_xyYTRIPLE Rec709Primaries = {
-		{0.6400, 0.3300, 1.0},
-		{0.3000, 0.6000, 1.0},
-		{0.1500, 0.0600, 1.0}
-	};
-	qcms_CIE_xyY D65;
-
-	D65 = white_point_from_temp(6504);
-
-	table = build_sRGB_gamma_table(1024);
-
-	if (!table)
-		return NO_MEM_PROFILE;
-
-	profile = qcms_profile_create_rgb_with_table(D65, Rec709Primaries, table, 1024);
-	free(table);
-	return profile;
-}
-
-
-/* qcms_profile_from_memory does not hold a reference to the memory passed in */
-qcms_profile* qcms_profile_from_memory(const void *mem, size_t size)
-{
-	uint32_t length;
-	struct mem_source source;
-	struct mem_source *src = &source;
-	struct tag_index index;
-	qcms_profile *profile;
-
-	source.buf = mem;
-	source.size = size;
-	source.valid = true;
-	length = read_u32(src, 0);
-	if (length <= size) {
-		// shrink the area that we can read if appropriate
-		source.size = length;
-	} else {
-		return INVALID_PROFILE;
-	}
-
-	profile = qcms_profile_create();
-
-	check_CMM_type_signature(src);
-	check_profile_version(src);
-	read_class_signature(profile, src);
-	read_rendering_intent(profile, src);
-	read_color_space(profile, src);
-	//TODO read rest of profile stuff
-
-	if (!src->valid)
-		goto invalid_profile;
-
-	index = read_tag_table(profile, src);
-	if (!src->valid || !index.tags)
-		goto invalid_tag_table;
-
-	if (profile->class == DISPLAY_DEVICE_PROFILE || profile->class == INPUT_DEVICE_PROFILE) {
-		if (profile->color_space == RGB_SIGNATURE) {
-
-			profile->redColorant = read_tag_XYZType(src, index, TAG_rXYZ);
-			profile->blueColorant = read_tag_XYZType(src, index, TAG_bXYZ);
-			profile->greenColorant = read_tag_XYZType(src, index, TAG_gXYZ);
-
-			if (!src->valid)
-				goto invalid_tag_table;
-
-			profile->redTRC = read_tag_curveType(src, index, TAG_rTRC);
-			profile->blueTRC = read_tag_curveType(src, index, TAG_bTRC);
-			profile->greenTRC = read_tag_curveType(src, index, TAG_gTRC);
-
-			if (!profile->redTRC || !profile->blueTRC || !profile->greenTRC)
-				goto invalid_tag_table;
-
-		} else if (profile->color_space == GRAY_SIGNATURE) {
-
-			profile->grayTRC = read_tag_curveType(src, index, TAG_kTRC);
-			if (!profile->grayTRC)
-				goto invalid_tag_table;
-
-		} else {
-			goto invalid_tag_table;
-		}
-	} else if (0 && profile->class == OUTPUT_DEVICE_PROFILE) {
-		profile->A2B0 = read_tag_lutType(src, index, TAG_A2B0);
-	} else {
-		goto invalid_tag_table;
-	}
-
-	if (!src->valid)
-		goto invalid_tag_table;
-
-	free(index.tags);
-
-	return profile;
-
-invalid_tag_table:
-	free(index.tags);
-invalid_profile:
-	qcms_profile_fini(profile);
-	return INVALID_PROFILE;
-}
-
-qcms_intent qcms_profile_get_rendering_intent(qcms_profile *profile)
-{
-	return profile->rendering_intent;
-}
-
-icColorSpaceSignature
-qcms_profile_get_color_space(qcms_profile *profile)
-{
-	return profile->color_space;
-}
-
-void qcms_profile_release(qcms_profile *profile)
-{
-	if (profile->output_table_r)
-		precache_release(profile->output_table_r);
-	if (profile->output_table_g)
-		precache_release(profile->output_table_g);
-	if (profile->output_table_b)
-		precache_release(profile->output_table_b);
-
-	qcms_profile_fini(profile);
-}
-
-#include <stdio.h>
-qcms_profile* qcms_profile_from_file(FILE *file)
-{
-	uint32_t length, remaining_length;
-	qcms_profile *profile;
-	size_t read_length;
-	__be32 length_be;
-	void *data;
-
-	fread(&length_be, sizeof(length), 1, file);
-	length = be32_to_cpu(length_be);
-	if (length > MAX_PROFILE_SIZE)
-		return BAD_VALUE_PROFILE;
-
-	/* allocate room for the entire profile */
-	data = malloc(length);
-	if (!data)
-		return NO_MEM_PROFILE;
-
-	/* copy in length to the front so that the buffer will contain the entire profile */
-	*((__be32*)data) = length_be;
-	remaining_length = length - sizeof(length_be);
-
-	/* read the rest profile */
-	read_length = fread((unsigned char*)data + sizeof(length_be), 1, remaining_length, file);
-	if (read_length != remaining_length)
-		return INVALID_PROFILE;
-
-	profile = qcms_profile_from_memory(data, length);
-	free(data);
-	return profile;
-}
-
-qcms_profile* qcms_profile_from_path(const char *path)
-{
-	qcms_profile *profile = NULL;
-	FILE *file = fopen(path, "r");
-	if (file) {
-		profile = qcms_profile_from_file(file);
-		fclose(file);
-	}
-	return profile;
-}
deleted file mode 100644
--- a/gfx/qcms/qcms.h
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifndef QCMS_H
-#define QCMS_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* if we've already got an ICC_H header we can ignore the following */
-#ifndef ICC_H
-/* icc34 defines */
-
-/***************************************************************** 
- Copyright (c) 1994-1996 SunSoft, Inc.
-
-                    Rights Reserved
-
-Permission is hereby granted, free of charge, to any person 
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without restrict- 
-ion, including without limitation the rights to use, copy, modify, 
-merge, publish distribute, sublicense, and/or sell copies of the 
-Software, and to permit persons to whom the Software is furnished 
-to do so, subject to the following conditions: 
- 
-The above copyright notice and this permission notice shall be 
-included in all copies or substantial portions of the Software. 
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-
-INFRINGEMENT.  IN NO EVENT SHALL SUNSOFT, INC. OR ITS PARENT 
-COMPANY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
-OTHER DEALINGS IN THE SOFTWARE. 
- 
-Except as contained in this notice, the name of SunSoft, Inc. 
-shall not be used in advertising or otherwise to promote the 
-sale, use or other dealings in this Software without written 
-authorization from SunSoft Inc. 
-******************************************************************/
-
-/* 
- * Color Space Signatures
- * Note that only icSigXYZData and icSigLabData are valid
- * Profile Connection Spaces (PCSs)
- */ 
-typedef enum {
-    icSigXYZData                        = 0x58595A20L,  /* 'XYZ ' */
-    icSigLabData                        = 0x4C616220L,  /* 'Lab ' */
-    icSigLuvData                        = 0x4C757620L,  /* 'Luv ' */
-    icSigYCbCrData                      = 0x59436272L,  /* 'YCbr' */
-    icSigYxyData                        = 0x59787920L,  /* 'Yxy ' */
-    icSigRgbData                        = 0x52474220L,  /* 'RGB ' */
-    icSigGrayData                       = 0x47524159L,  /* 'GRAY' */
-    icSigHsvData                        = 0x48535620L,  /* 'HSV ' */
-    icSigHlsData                        = 0x484C5320L,  /* 'HLS ' */
-    icSigCmykData                       = 0x434D594BL,  /* 'CMYK' */
-    icSigCmyData                        = 0x434D5920L,  /* 'CMY ' */
-    icSig2colorData                     = 0x32434C52L,  /* '2CLR' */
-    icSig3colorData                     = 0x33434C52L,  /* '3CLR' */
-    icSig4colorData                     = 0x34434C52L,  /* '4CLR' */
-    icSig5colorData                     = 0x35434C52L,  /* '5CLR' */
-    icSig6colorData                     = 0x36434C52L,  /* '6CLR' */
-    icSig7colorData                     = 0x37434C52L,  /* '7CLR' */
-    icSig8colorData                     = 0x38434C52L,  /* '8CLR' */
-    icSig9colorData                     = 0x39434C52L,  /* '9CLR' */
-    icSig10colorData                    = 0x41434C52L,  /* 'ACLR' */
-    icSig11colorData                    = 0x42434C52L,  /* 'BCLR' */
-    icSig12colorData                    = 0x43434C52L,  /* 'CCLR' */
-    icSig13colorData                    = 0x44434C52L,  /* 'DCLR' */
-    icSig14colorData                    = 0x45434C52L,  /* 'ECLR' */
-    icSig15colorData                    = 0x46434C52L,  /* 'FCLR' */
-    icMaxEnumData                       = 0xFFFFFFFFL   
-} icColorSpaceSignature;
-#endif
-
-#include <stdio.h>
-
-typedef int qcms_bool;
-
-struct _qcms_transform;
-typedef struct _qcms_transform qcms_transform;
-
-struct _qcms_profile;
-typedef struct _qcms_profile qcms_profile;
-
-/* these values match the Rendering Intent values from the ICC spec */
-typedef enum {
-	QCMS_INTENT_DEFAULT = 0,
-	QCMS_INTENT_PERCEPTUAL = 0,
-	QCMS_INTENT_RELATIVE_COLORIMETRIC = 1,
-	QCMS_INTENT_SATURATION = 2,
-	QCMS_INTENT_ABSOLUTE_COLORIMETRIC = 3
-} qcms_intent;
-
-//XXX: I don't really like the _DATA_ prefix
-typedef enum {
-	QCMS_DATA_RGB_8,
-	QCMS_DATA_RGBA_8,
-	QCMS_DATA_GRAY_8,
-	QCMS_DATA_GRAYA_8
-} qcms_data_type;
-
-/* the names for the following two types are sort of ugly */
-typedef struct
-{
-	double x;
-	double y;
-	double Y;
-} qcms_CIE_xyY;
-
-typedef struct
-{
-	qcms_CIE_xyY red;
-	qcms_CIE_xyY green;
-	qcms_CIE_xyY blue;
-} qcms_CIE_xyYTRIPLE;
-
-qcms_profile* qcms_profile_create_rgb_with_gamma(
-		qcms_CIE_xyY white_point,
-		qcms_CIE_xyYTRIPLE primaries,
-		float gamma);
-
-qcms_profile* qcms_profile_from_memory(const void *mem, size_t size);
-
-qcms_profile* qcms_profile_from_file(FILE *file);
-qcms_profile* qcms_profile_from_path(const char *path);
-qcms_profile* qcms_profile_sRGB(void);
-void qcms_profile_release(qcms_profile *profile);
-
-qcms_bool qcms_profile_is_bogus(qcms_profile *profile);
-qcms_intent qcms_profile_get_rendering_intent(qcms_profile *profile);
-icColorSpaceSignature qcms_profile_get_color_space(qcms_profile *profile);
-
-void qcms_profile_precache_output_transform(qcms_profile *profile);
-
-qcms_transform* qcms_transform_create(
-		qcms_profile *in, qcms_data_type in_type,
-		qcms_profile* out, qcms_data_type out_type,
-		qcms_intent intent);
-
-void qcms_transform_release(qcms_transform *);
-
-void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size_t length);
-
-
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
deleted file mode 100644
--- a/gfx/qcms/qcmsint.h
+++ /dev/null
@@ -1,143 +0,0 @@
-#include <stdlib.h>
-#include "qcms.h"
-#include "qcmstypes.h"
-
-/* used as a 16bit lookup table for the output transformation.
- * we refcount them so we only need to have one around per output
- * profile, instead of duplicating them per transform */
-struct precache_output
-{
-	int ref_count;
-	uint8_t data[65535];
-};
-
-#ifdef _MSC_VER
-#define ALIGN __declspec(align(16))
-#else
-#define ALIGN __attribute__(( aligned (16) ))
-#endif
-
-struct _qcms_transform {
-	float ALIGN matrix[3][4];
-	float *input_gamma_table_r;
-	float *input_gamma_table_g;
-	float *input_gamma_table_b;
-
-	float *input_gamma_table_gray;
-
-	float out_gamma_r;
-	float out_gamma_g;
-	float out_gamma_b;
-
-	float out_gamma_gray;
-
-	uint16_t *output_gamma_lut_r;
-	uint16_t *output_gamma_lut_g;
-	uint16_t *output_gamma_lut_b;
-
-	uint16_t *output_gamma_lut_gray;
-
-	size_t output_gamma_lut_r_length;
-	size_t output_gamma_lut_g_length;
-	size_t output_gamma_lut_b_length;
-
-	size_t output_gamma_lut_gray_length;
-
-	struct precache_output *output_table_r;
-	struct precache_output *output_table_g;
-	struct precache_output *output_table_b;
-
-	void (*transform_fn)(struct _qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length);
-};
-
-typedef int32_t s15Fixed16Number;
-typedef uint16_t uInt16Number;
-
-struct XYZNumber {
-	s15Fixed16Number X;
-	s15Fixed16Number Y;
-	s15Fixed16Number Z;
-};
-
-struct curveType {
-	uint32_t count;
-	uInt16Number data[0];
-};
-
-struct lutType {
-	uint8_t num_input_channels;
-	uint8_t num_output_channels;
-	uint8_t num_clut_grid_points;
-
-	s15Fixed16Number e00;
-	s15Fixed16Number e01;
-	s15Fixed16Number e02;
-	s15Fixed16Number e10;
-	s15Fixed16Number e11;
-	s15Fixed16Number e12;
-	s15Fixed16Number e20;
-	s15Fixed16Number e21;
-	s15Fixed16Number e22;
-
-	uint16_t num_input_table_entries;
-	uint16_t num_output_table_entries;
-
-	uint16_t *input_table;
-	uint16_t *clut_table;
-	uint16_t *output_table;
-};
-#if 0
-this is from an intial idea of having the struct correspond to the data in
-the file. I decided that it wasn't a good idea.
-struct tag_value {
-	uint32_t type;
-	union {
-		struct {
-			uint32_t reserved;
-			struct {
-				s15Fixed16Number X;
-				s15Fixed16Number Y;
-				s15Fixed16Number Z;
-			} XYZNumber;
-		} XYZType;
-	};
-}; // I guess we need to pack this?
-#endif
-
-#define RGB_SIGNATURE  0x52474220
-#define GRAY_SIGNATURE 0x47524159
-
-struct _qcms_profile {
-	uint32_t class;
-	uint32_t color_space;
-	qcms_intent rendering_intent;
-	struct XYZNumber redColorant;
-	struct XYZNumber blueColorant;
-	struct XYZNumber greenColorant;
-	struct curveType *redTRC;
-	struct curveType *blueTRC;
-	struct curveType *greenTRC;
-	struct curveType *grayTRC;
-	struct lutType *A2B0;
-
-	struct precache_output *output_table_r;
-	struct precache_output *output_table_g;
-	struct precache_output *output_table_b;
-};
-
-#ifdef _MSC_VER
-#define inline _inline
-#endif
-
-static inline float s15Fixed16Number_to_float(s15Fixed16Number a)
-{
-	return ((int32_t)a)/65536.;
-}
-
-static inline s15Fixed16Number double_to_s15Fixed16Number(double v)
-{
-	return (int32_t)(v*65536);
-}
-
-void precache_release(struct precache_output *p);
-void set_rgb_colorants(qcms_profile *profile, qcms_CIE_xyY white_point, qcms_CIE_xyYTRIPLE primaries);
deleted file mode 100644
--- a/gfx/qcms/qcmstypes.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef QCMS_TYPES_H
-#define QCMS_TYPES_H
-
-#ifdef MOZ_QCMS
-
-#include "prtypes.h"
-
-typedef PRInt8 int8_t;
-typedef PRUint8 uint8_t;
-typedef PRInt16 int16_t;
-typedef PRUint16 uint16_t;
-typedef PRInt32 int32_t;
-typedef PRUint32 uint32_t;
-typedef PRInt64 int64_t;
-typedef PRUint64 uint64_t;
-
-
-#else
-
-#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi) || defined (__sun) || defined (sun) || defined (__digital__)
-#  include <inttypes.h>
-#elif defined (_MSC_VER)
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#elif defined (_AIX)
-#  include <sys/inttypes.h>
-#else
-#  include <stdint.h>
-#endif
-
-#endif
-
-typedef qcms_bool bool;
-#define true 1
-#define false 0
-
-#endif
deleted file mode 100644
--- a/gfx/qcms/transform.c
+++ /dev/null
@@ -1,1484 +0,0 @@
-//  qcms
-//  Copyright (C) 2009 Mozilla Corporation
-//  Copyright (C) 1998-2007 Marti Maria
-//
-// Permission is hereby granted, free of charge, to any person obtaining 
-// a copy of this software and associated documentation files (the "Software"), 
-// to deal in the Software without restriction, including without limitation 
-// the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-// and/or sell copies of the Software, and to permit persons to whom the Software 
-// is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in 
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO 
-// THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#include <stdlib.h>
-#include <math.h>
-#include <assert.h>
-#include "qcmsint.h"
-
-#if defined(_M_IX86) || defined(__i386__)
-#define X86
-#endif
-
-//XXX: could use a bettername
-typedef uint16_t uint16_fract_t;
-
-/* value must be a value between 0 and 1 */
-//XXX: is the above a good restriction to have?
-float lut_interp_linear(double value, uint16_t *table, int length)
-{
-	int upper, lower;
-	value = value * (length - 1);
-	upper = ceil(value);
-	lower = floor(value);
-	//XXX: can we be more performant here?
-	value = table[upper]*(1. - (upper - value)) + table[lower]*(upper - value);
-	/* scale the value */
-	return value * (1./65535.);
-}
-
-/* same as above but takes and returns a uint16_t value representing a range from 0..1 */
-uint16_t lut_interp_linear16(uint16_t input_value, uint16_t *table, int length)
-{
-	uint32_t value = (input_value * (length - 1));
-	uint32_t upper = (value + 65534) / 65535; /* equivalent to ceil(value/65535) */
-	uint32_t lower = value / 65535;           /* equivalent to floor(value/65535) */
-	uint32_t interp = value % 65535;
-
-	value = (table[upper]*(interp) + table[lower]*(65535 - interp))/65535;
-
-	return value;
-}
-
-void compute_curve_gamma_table_type1(float gamma_table[256], double gamma)
-{
-	unsigned int i;
-	for (i = 0; i < 256; i++) {
-		gamma_table[i] = pow(i/255., gamma);
-	}
-}
-
-void compute_curve_gamma_table_type2(float gamma_table[256], uint16_t *table, int length)
-{
-	unsigned int i;
-	for (i = 0; i < 256; i++) {
-		gamma_table[i] = lut_interp_linear(i/255., table, length);
-	}
-}
-
-void compute_curve_gamma_table_type0(float gamma_table[256])
-{
-	unsigned int i;
-	for (i = 0; i < 256; i++) {
-		gamma_table[i] = i;
-	}
-}
-
-unsigned char clamp_u8(float v)
-{
-	if (v > 255.)
-		return 255;
-	else if (v < 0)
-		return 0;
-	else
-		return floor(v+.5);
-}
-
-struct vector {
-	float v[3];
-};
-
-struct matrix {
-	float m[3][3];
-	bool invalid;
-};
-
-struct vector matrix_eval(struct matrix mat, struct vector v)
-{
-	struct vector result;
-	result.v[0] = mat.m[0][0]*v.v[0] + mat.m[0][1]*v.v[1] + mat.m[0][2]*v.v[2];
-	result.v[1] = mat.m[1][0]*v.v[0] + mat.m[1][1]*v.v[1] + mat.m[1][2]*v.v[2];
-	result.v[2] = mat.m[2][0]*v.v[0] + mat.m[2][1]*v.v[1] + mat.m[2][2]*v.v[2];
-	return result;
-}
-
-//XXX: should probably pass by reference and we could
-//probably reuse this computation in matrix_invert
-float matrix_det(struct matrix mat)
-{
-	float det;
-	det = mat.m[0][0]*mat.m[1][1]*mat.m[2][2] +
-		mat.m[0][1]*mat.m[1][2]*mat.m[2][0] +
-		mat.m[0][2]*mat.m[1][0]*mat.m[2][1] -
-		mat.m[0][0]*mat.m[1][2]*mat.m[2][1] -
-		mat.m[0][1]*mat.m[1][0]*mat.m[2][2] -
-		mat.m[0][2]*mat.m[1][1]*mat.m[2][0];
-	return det;
-}
-
-/* from pixman and cairo and Mathematics for Game Programmers */
-/* lcms uses gauss-jordan elimination with partial pivoting which is
- * less efficient and not as numerically stable. See Mathematics for
- * Game Programmers. */
-struct matrix matrix_invert(struct matrix mat)
-{
-	struct matrix dest_mat;
-	int i,j;
-	static int a[3] = { 2, 2, 1 };
-	static int b[3] = { 1, 0, 0 };
-
-	/* inv  (A) = 1/det (A) * adj (A) */
-	float det = matrix_det(mat);
-
-	if (det == 0) {
-		dest_mat.invalid = true;
-	} else {
-		dest_mat.invalid = false;
-	}
-
-	det = 1/det;
-
-	for (j = 0; j < 3; j++) {
-		for (i = 0; i < 3; i++) {
-			double p;
-			int ai = a[i];
-			int aj = a[j];
-			int bi = b[i];
-			int bj = b[j];
-
-			p = mat.m[ai][aj] * mat.m[bi][bj] -
-				mat.m[ai][bj] * mat.m[bi][aj];
-			if (((i + j) & 1) != 0)
-				p = -p;
-
-			dest_mat.m[j][i] = det * p;
-		}
-	}
-	return dest_mat;
-}
-
-struct matrix matrix_identity(void)
-{
-	struct matrix i;
-	i.m[0][0] = 1;
-	i.m[0][1] = 0;
-	i.m[0][2] = 0;
-	i.m[1][0] = 0;
-	i.m[1][1] = 1;
-	i.m[1][2] = 0;
-	i.m[2][0] = 0;
-	i.m[2][1] = 0;
-	i.m[2][2] = 1;
-	i.invalid = false;
-	return i;
-}
-
-/* from pixman */
-/* MAT3per... */
-struct matrix matrix_multiply(struct matrix a, struct matrix b)
-{
-	struct matrix result;
-	int dx, dy;
-	int o;
-	for (dy = 0; dy < 3; dy++) {
-		for (dx = 0; dx < 3; dx++) {
-			double v = 0;
-			for (o = 0; o < 3; o++) {
-				v += a.m[dy][o] * b.m[o][dx];
-			}
-			result.m[dy][dx] = v;
-		}
-	}
-	result.invalid = a.invalid || b.invalid;
-	return result;
-}
-
-float u8Fixed8Number_to_float(uint16_t x)
-{
-	// 0x0000 = 0.
-	// 0x0100 = 1.
-	// 0xffff = 255  + 255/256
-	return x/256.;
-}
-
-float *build_input_gamma_table(struct curveType *TRC)
-{
-	float *gamma_table = malloc(sizeof(float)*256);
-	if (gamma_table) {
-		if (TRC->count == 0) {
-			compute_curve_gamma_table_type0(gamma_table);
-		} else if (TRC->count == 1) {
-			compute_curve_gamma_table_type1(gamma_table, u8Fixed8Number_to_float(TRC->data[0]));
-		} else {
-			compute_curve_gamma_table_type2(gamma_table, TRC->data, TRC->count);
-		}
-	}
-	return gamma_table;
-}
-
-struct matrix build_colorant_matrix(qcms_profile *p)
-{
-	struct matrix result;
-	result.m[0][0] = s15Fixed16Number_to_float(p->redColorant.X);
-	result.m[0][1] = s15Fixed16Number_to_float(p->greenColorant.X);
-	result.m[0][2] = s15Fixed16Number_to_float(p->blueColorant.X);
-	result.m[1][0] = s15Fixed16Number_to_float(p->redColorant.Y);
-	result.m[1][1] = s15Fixed16Number_to_float(p->greenColorant.Y);
-	result.m[1][2] = s15Fixed16Number_to_float(p->blueColorant.Y);
-	result.m[2][0] = s15Fixed16Number_to_float(p->redColorant.Z);
-	result.m[2][1] = s15Fixed16Number_to_float(p->greenColorant.Z);
-	result.m[2][2] = s15Fixed16Number_to_float(p->blueColorant.Z);
-	result.invalid = false;
-	return result;
-}
-
-/* The following code is copied nearly directly from lcms.
- * I think it could be much better. For example, Argyll seems to have better code in
- * icmTable_lookup_bwd and icmTable_setup_bwd. However, for now this is a quick way
- * to a working solution and allows for easy comparing with lcms. */
-uint16_fract_t lut_inverse_interp16(uint16_t Value, uint16_t LutTable[], int length)
-{
-        int l = 1;
-        int r = 0x10000;
-        int x = 0, res;       // 'int' Give spacing for negative values
-        int NumZeroes, NumPoles;
-        int cell0, cell1;
-        double val2;
-        double y0, y1, x0, x1;
-        double a, b, f;
-
-        // July/27 2001 - Expanded to handle degenerated curves with an arbitrary
-        // number of elements containing 0 at the begining of the table (Zeroes)
-        // and another arbitrary number of poles (FFFFh) at the end.
-        // First the zero and pole extents are computed, then value is compared.
-
-        NumZeroes = 0;
-        while (LutTable[NumZeroes] == 0 && NumZeroes < length-1)
-                        NumZeroes++;
-
-        // There are no zeros at the beginning and we are trying to find a zero, so
-        // return anything. It seems zero would be the less destructive choice
-	/* I'm not sure that this makes sense, but oh well... */
-        if (NumZeroes == 0 && Value == 0)
-            return 0;
-
-        NumPoles = 0;
-        while (LutTable[length-1- NumPoles] == 0xFFFF && NumPoles < length-1)
-                        NumPoles++;
-
-        // Does the curve belong to this case?
-        if (NumZeroes > 1 || NumPoles > 1)
-        {               
-                int a, b;
-
-                // Identify if value fall downto 0 or FFFF zone             
-                if (Value == 0) return 0;
-               // if (Value == 0xFFFF) return 0xFFFF;
-
-                // else restrict to valid zone
-
-                a = ((NumZeroes-1) * 0xFFFF) / (length-1);               
-                b = ((length-1 - NumPoles) * 0xFFFF) / (length-1);
-                                                                
-                l = a - 1;
-                r = b + 1;
-        }
-
-
-        // Seems not a degenerated case... apply binary search
-
-        while (r > l) {
-
-                x = (l + r) / 2;
-
-		res = (int) lut_interp_linear16((uint16_fract_t) (x-1), LutTable, length);
-
-                if (res == Value) {
-
-                    // Found exact match. 
-                    
-                    return (uint16_fract_t) (x - 1);
-                }
-
-                if (res > Value) r = x - 1;
-                else l = x + 1;
-        }
-
-        // Not found, should we interpolate?
-
-                
-        // Get surrounding nodes
-        
-        val2 = (length-1) * ((double) (x - 1) / 65535.0);
-
-        cell0 = (int) floor(val2);
-        cell1 = (int) ceil(val2);
-           
-        if (cell0 == cell1) return (uint16_fract_t) x;
-
-        y0 = LutTable[cell0] ;
-        x0 = (65535.0 * cell0) / (length-1); 
-
-        y1 = LutTable[cell1] ;
-        x1 = (65535.0 * cell1) / (length-1);
-
-        a = (y1 - y0) / (x1 - x0);
-        b = y0 - a * x0;
-
-        if (fabs(a) < 0.01) return (uint16_fract_t) x;
-
-        f = ((Value - b) / a);
-
-        if (f < 0.0) return (uint16_fract_t) 0;
-        if (f >= 65535.0) return (uint16_fract_t) 0xFFFF;
-
-        return (uint16_fract_t) floor(f + 0.5);                        
-        
-}
-
-// Build a White point, primary chromas transfer matrix from RGB to CIE XYZ
-// This is just an approximation, I am not handling all the non-linear
-// aspects of the RGB to XYZ process, and assumming that the gamma correction
-// has transitive property in the tranformation chain.
-//
-// the alghoritm:
-//
-//            - First I build the absolute conversion matrix using
-//              primaries in XYZ. This matrix is next inverted
-//            - Then I eval the source white point across this matrix
-//              obtaining the coeficients of the transformation
-//            - Then, I apply these coeficients to the original matrix
-static struct matrix build_RGB_to_XYZ_transfer_matrix(qcms_CIE_xyY white, qcms_CIE_xyYTRIPLE primrs)
-{
-	struct matrix primaries;
-	struct matrix primaries_invert;
-	struct matrix result;
-	struct vector white_point;
-	struct vector coefs;
-
-	double xn, yn;
-	double xr, yr;
-	double xg, yg;
-	double xb, yb;
-
-	xn = white.x;
-	yn = white.y;
-
-	xr = primrs.red.x;
-	yr = primrs.red.y;
-	xg = primrs.green.x;
-	yg = primrs.green.y;
-	xb = primrs.blue.x;
-	yb = primrs.blue.y;
-
-	primaries.m[0][0] = xr;
-	primaries.m[0][1] = xg;
-	primaries.m[0][2] = xb;
-
-	primaries.m[1][0] = yr;
-	primaries.m[1][1] = yg;
-	primaries.m[1][2] = yb;
-
-	primaries.m[2][0] = 1 - xr - yr;
-	primaries.m[2][1] = 1 - xg - yg;
-	primaries.m[2][2] = 1 - xb - yb;
-	primaries.invalid = false;
-
-	white_point.v[0] = xn/yn;
-	white_point.v[1] = 1.;
-	white_point.v[2] = (1.0-xn-yn)/yn;
-
-	primaries_invert = matrix_invert(primaries);
-
-	coefs = matrix_eval(primaries_invert, white_point);
-
-	result.m[0][0] = coefs.v[0]*xr;
-	result.m[0][1] = coefs.v[1]*xg;
-	result.m[0][2] = coefs.v[2]*xb;
-
-	result.m[1][0] = coefs.v[0]*yr;
-	result.m[1][1] = coefs.v[1]*yg;
-	result.m[1][2] = coefs.v[2]*yb;
-
-	result.m[2][0] = coefs.v[0]*(1.-xr-yr);
-	result.m[2][1] = coefs.v[1]*(1.-xg-yg);
-	result.m[2][2] = coefs.v[2]*(1.-xb-yb);
-	result.invalid = primaries_invert.invalid;
-
-	return result;
-}
-
-struct CIE_XYZ {
-	double X;
-	double Y;
-	double Z;
-};
-
-/* CIE Illuminant D50 */
-static const struct CIE_XYZ D50_XYZ = {
-	0.9642,
-	1.0000,
-	0.8249
-};
-
-/* from lcms: xyY2XYZ()
- * corresponds to argyll: icmYxy2XYZ() */
-static struct CIE_XYZ xyY2XYZ(qcms_CIE_xyY source)
-{
-	struct CIE_XYZ dest;
-	dest.X = (source.x / source.y) * source.Y;
-	dest.Y = source.Y;
-	dest.Z = ((1 - source.x - source.y) / source.y) * source.Y;
-	return dest;
-}
-
-/* from lcms: ComputeChromaticAdaption */
-// Compute chromatic adaption matrix using chad as cone matrix
-static struct matrix
-compute_chromatic_adaption(struct CIE_XYZ source_white_point,
-                           struct CIE_XYZ dest_white_point,
-                           struct matrix chad)
-{
-	struct matrix chad_inv;
-	struct vector cone_source_XYZ, cone_source_rgb;
-	struct vector cone_dest_XYZ, cone_dest_rgb;
-	struct matrix cone, tmp;
-
-	tmp = chad;
-	chad_inv = matrix_invert(tmp);
-
-	cone_source_XYZ.v[0] = source_white_point.X;
-	cone_source_XYZ.v[1] = source_white_point.Y;
-	cone_source_XYZ.v[2] = source_white_point.Z;
-
-	cone_dest_XYZ.v[0] = dest_white_point.X;
-	cone_dest_XYZ.v[1] = dest_white_point.Y;
-	cone_dest_XYZ.v[2] = dest_white_point.Z;
-
-	cone_source_rgb = matrix_eval(chad, cone_source_XYZ);
-	cone_dest_rgb   = matrix_eval(chad, cone_dest_XYZ);
-
-	cone.m[0][0] = cone_dest_rgb.v[0]/cone_source_rgb.v[0];
-	cone.m[0][1] = 0;
-	cone.m[0][2] = 0;
-	cone.m[1][0] = 0;
-	cone.m[1][1] = cone_dest_rgb.v[1]/cone_source_rgb.v[1];
-	cone.m[1][2] = 0;
-	cone.m[2][0] = 0;
-	cone.m[2][1] = 0;
-	cone.m[2][2] = cone_dest_rgb.v[2]/cone_source_rgb.v[2];
-	cone.invalid = false;
-
-	// Normalize
-	return matrix_multiply(chad_inv, matrix_multiply(cone, chad));
-}
-
-/* from lcms: cmsAdaptionMatrix */
-// Returns the final chrmatic adaptation from illuminant FromIll to Illuminant ToIll
-// Bradford is assumed
-static struct matrix
-adaption_matrix(struct CIE_XYZ source_illumination, struct CIE_XYZ target_illumination)
-{
-	struct matrix lam_rigg = {{ // Bradford matrix
-	                         {  0.8951,  0.2664, -0.1614 },
-	                         { -0.7502,  1.7135,  0.0367 },
-	                         {  0.0389, -0.0685,  1.0296 }
-	                         }};
-	return compute_chromatic_adaption(source_illumination, target_illumination, lam_rigg);
-}
-
-/* from lcms: cmsAdaptMatrixToD50 */
-static struct matrix adapt_matrix_to_D50(struct matrix r, qcms_CIE_xyY source_white_pt)
-{
-	struct CIE_XYZ Dn;
-	struct matrix Bradford;
-	Dn = xyY2XYZ(source_white_pt);
-
-	Bradford = adaption_matrix(Dn, D50_XYZ);
-	return matrix_multiply(Bradford, r);
-}
-
-void set_rgb_colorants(qcms_profile *profile, qcms_CIE_xyY white_point, qcms_CIE_xyYTRIPLE primaries)
-{
-	struct matrix colorants;
-	colorants = build_RGB_to_XYZ_transfer_matrix(white_point, primaries);
-	colorants = adapt_matrix_to_D50(colorants, white_point);
-
-	/* note: there's a transpose type of operation going on here */
-	profile->redColorant.X = double_to_s15Fixed16Number(colorants.m[0][0]);
-	profile->redColorant.Y = double_to_s15Fixed16Number(colorants.m[1][0]);
-	profile->redColorant.Z = double_to_s15Fixed16Number(colorants.m[2][0]);
-
-	profile->greenColorant.X = double_to_s15Fixed16Number(colorants.m[0][1]);
-	profile->greenColorant.Y = double_to_s15Fixed16Number(colorants.m[1][1]);
-	profile->greenColorant.Z = double_to_s15Fixed16Number(colorants.m[2][1]);
-
-	profile->blueColorant.X = double_to_s15Fixed16Number(colorants.m[0][2]);
-	profile->blueColorant.Y = double_to_s15Fixed16Number(colorants.m[1][2]);
-	profile->blueColorant.Z = double_to_s15Fixed16Number(colorants.m[2][2]);
-}
-
-static uint16_t *invert_lut(uint16_t *table, int length)
-{
-	int i;
-	/* for now we invert the lut by creating a lut of the same size
-	 * and attempting to lookup a value for each entry using lut_inverse_interp16 */
-	uint16_t *output = malloc(sizeof(uint16_t)*length);
-	if (!output)
-		return NULL;
-
-	for (i = 0; i < length; i++) {
-		double x = ((double) i * 65535.) / (double) (length - 1);
-		uint16_fract_t input = floor(x + .5);
-		output[i] = lut_inverse_interp16(input, table, length);
-	}
-	return output;
-}
-
-static uint16_t *build_linear_table(int length)
-{
-	int i;
-	uint16_t *output = malloc(sizeof(uint16_t)*length);
-	if (!output)
-		return NULL;
-
-	for (i = 0; i < length; i++) {
-		double x = ((double) i * 65535.) / (double) (length - 1);
-		uint16_fract_t input = floor(x + .5);
-		output[i] = input;
-	}
-	return output;
-}
-
-static uint16_t *build_pow_table(float gamma, int length)
-{
-	int i;
-	uint16_t *output = malloc(sizeof(uint16_t)*length);
-	if (!output)
-		return NULL;
-
-	for (i = 0; i < length; i++) {
-		uint16_fract_t result;
-		double x = ((double) i) / (double) (length - 1);
-		x = pow(x, gamma);
-                //XXX turn this conversion into a function
-		result = floor(x*65535. + .5);
-		output[i] = result;
-	}
-	return output;
-}
-
-static float clamp_float(float a)
-{
-	if (a > 1.)
-		return 1.;
-	else if (a < 0)
-		return 0;
-	else
-		return a;
-}
-
-#if 0
-static void qcms_transform_data_rgb_out_pow(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	float (*mat)[4] = transform->matrix;
-	for (i=0; i<length; i++) {
-		unsigned char device_r = *src++;
-		unsigned char device_g = *src++;
-		unsigned char device_b = *src++;
-
-		float linear_r = transform->input_gamma_table_r[device_r];
-		float linear_g = transform->input_gamma_table_g[device_g];
-		float linear_b = transform->input_gamma_table_b[device_b];
-
-		float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
-		float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
-		float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
-
-		float out_device_r = pow(out_linear_r, transform->out_gamma_r);
-		float out_device_g = pow(out_linear_g, transform->out_gamma_g);
-		float out_device_b = pow(out_linear_b, transform->out_gamma_b);
-
-		*dest++ = clamp_u8(255*out_device_r);
-		*dest++ = clamp_u8(255*out_device_g);
-		*dest++ = clamp_u8(255*out_device_b);
-	}
-}
-#endif
-
-static void qcms_transform_data_gray_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	for (i = 0; i < length; i++) {
-		float out_device_r, out_device_g, out_device_b;
-		unsigned char device = *src++;
-
-		float linear = transform->input_gamma_table_gray[device];
-
-                out_device_r = lut_interp_linear(linear, transform->output_gamma_lut_r, transform->output_gamma_lut_r_length);
-		out_device_g = lut_interp_linear(linear, transform->output_gamma_lut_g, transform->output_gamma_lut_g_length);
-		out_device_b = lut_interp_linear(linear, transform->output_gamma_lut_b, transform->output_gamma_lut_b_length);
-
-		*dest++ = clamp_u8(out_device_r*255);
-		*dest++ = clamp_u8(out_device_g*255);
-		*dest++ = clamp_u8(out_device_b*255);
-	}
-}
-
-static void qcms_transform_data_graya_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	for (i = 0; i < length; i++) {
-		float out_device_r, out_device_g, out_device_b;
-		unsigned char device = *src++;
-		unsigned char alpha = *src++;
-
-		float linear = transform->input_gamma_table_gray[device];
-
-                out_device_r = lut_interp_linear(linear, transform->output_gamma_lut_r, transform->output_gamma_lut_r_length);
-		out_device_g = lut_interp_linear(linear, transform->output_gamma_lut_g, transform->output_gamma_lut_g_length);
-		out_device_b = lut_interp_linear(linear, transform->output_gamma_lut_b, transform->output_gamma_lut_b_length);
-
-		*dest++ = clamp_u8(out_device_r*255);
-		*dest++ = clamp_u8(out_device_g*255);
-		*dest++ = clamp_u8(out_device_b*255);
-		*dest++ = alpha;
-	}
-}
-
-
-static void qcms_transform_data_gray_out_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	for (i = 0; i < length; i++) {
-		unsigned char device = *src++;
-		uint16_t gray;
-
-		float linear = transform->input_gamma_table_gray[device];
-
-		/* we could round here... */
-		gray = linear * 65535.;
-
-		*dest++ = transform->output_table_r->data[gray];
-		*dest++ = transform->output_table_g->data[gray];
-		*dest++ = transform->output_table_b->data[gray];
-	}
-}
-
-static void qcms_transform_data_graya_out_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	for (i = 0; i < length; i++) {
-		unsigned char device = *src++;
-		unsigned char alpha = *src++;
-		uint16_t gray;
-
-		float linear = transform->input_gamma_table_gray[device];
-
-		/* we could round here... */
-		gray = linear * 65535.;
-
-		*dest++ = transform->output_table_r->data[gray];
-		*dest++ = transform->output_table_g->data[gray];
-		*dest++ = transform->output_table_b->data[gray];
-		*dest++ = alpha;
-	}
-}
-
-static const ALIGN float floatScale = 65536.0f;
-static const ALIGN float * const floatScaleAddr = &floatScale; // Win32 ASM doesn't know how to take addressOf inline
-
-static const ALIGN float clampMaxValue = ((float) (65536 - 1)) / 65536.0f;
-
-#ifdef X86
-#if 0
-#include <emmintrin.h>
-void qcms_transform_data_rgb_out_lut_sse_intrin(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	float (*mat)[4] = transform->matrix;
-        char input_back[32];
-	/* Ensure we have a buffer that's 16 byte aligned regardless of the original
-	 * stack alignment. We can't use __attribute__((aligned(16))) or __declspec(align(32))
-	 * because they don't work on stack variables. gcc 4.4 does do the right thing 
-	 * on x86 but that's too new for us right now. For more info: gcc bug #16660 */
-        float *input = (float*)(((unsigned long)&input_back[16]) & 0xfffffff0);
-        /* share input and output locations to save having to keep the
-         * locations in separate registers */
-        uint32_t* output = (uint32_t*)input;
-	for (i=0; i<length; i++) {
-		const float *clampMax = &clampMaxValue;
-
-		unsigned char device_r = *src++;
-		unsigned char device_g = *src++;
-		unsigned char device_b = *src++;
-
-		__m128 xmm1 = _mm_load_ps(mat[0]);
-		__m128 xmm2 = _mm_load_ps(mat[1]);
-		__m128 xmm3 = _mm_load_ps(mat[2]);
-
-		__m128 vec_r = _mm_load_ss(&transform->input_gamma_table_r[device_r]);
-		vec_r = _mm_shuffle_ps(vec_r, vec_r, 0);
-		__m128 vec_g = _mm_load_ss(&transform->input_gamma_table_r[device_g]);
-		vec_g = _mm_shuffle_ps(vec_g, vec_g, 0);
-		__m128 vec_b = _mm_load_ss(&transform->input_gamma_table_r[device_b]);
-		vec_b = _mm_shuffle_ps(vec_b, vec_b, 0);
-
-		vec_r = _mm_mul_ps(vec_r, xmm1);
-		vec_g = _mm_mul_ps(vec_g, xmm2);
-		vec_b = _mm_mul_ps(vec_b, xmm3);
-
-		vec_r = _mm_add_ps(vec_r, _mm_add_ps(vec_g, vec_b));
-
-		__m128 max = _mm_load_ss(&clampMax);
-		max = _mm_shuffle_ps(max, max, 0);
-		__m128 min = _mm_setzero_ps();
-
-		vec_r = _mm_max_ps(min, vec_r);
-		vec_r = _mm_min_ps(max, vec_r);
-
-		__m128 scale = _mm_load_ss(&floatScale);
-		scale = _mm_shuffle_ps(scale, scale, 0);
-		__m128 result = _mm_mul_ps(vec_r, scale);
-
-		__m128i out = _mm_cvtps_epi32(result);
-		_mm_store_si128((__m128i*)input, out);
-
-		*dest++ = transform->output_table_r->data[output[0]];
-		*dest++ = transform->output_table_g->data[output[1]];
-		*dest++ = transform->output_table_b->data[output[2]];
-	}
-}
-#endif
-static void qcms_transform_data_rgb_out_lut_sse(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	float (*mat)[4] = transform->matrix;
-        char input_back[32];
-	/* Ensure we have a buffer that's 16 byte aligned regardless of the original
-	 * stack alignment. We can't use __attribute__((aligned(16))) or __declspec(align(32))
-	 * because they don't work on stack variables. gcc 4.4 does do the right thing 
-	 * on x86 but that's too new for us right now. For more info: gcc bug #16660 */
-        float *input = (float*)(((unsigned long)&input_back[16]) & 0xfffffff0);
-        /* share input and output locations to save having to keep the
-         * locations in separate registers */
-        uint32_t* output = (uint32_t*)input;
-	for (i = 0; i < length; i++) {
-		const float *clampMax = &clampMaxValue;
-
-		unsigned char device_r = *src++;
-		unsigned char device_g = *src++;
-		unsigned char device_b = *src++;
-
-		input[0] = transform->input_gamma_table_r[device_r];
-		input[1] = transform->input_gamma_table_g[device_g];
-		input[2] = transform->input_gamma_table_b[device_b];
-
-#ifdef __GNUC__
-		__asm(
-                      "movaps (%0), %%xmm1;\n\t"          // Move the first matrix column to xmm1
-                      "movaps 16(%0), %%xmm2;\n\t"        // Move the second matrix column to xmm2
-                      "movaps 32(%0), %%xmm3;\n\t"        // move the third matrix column to xmm3
-                      "movaps (%3), %%xmm0;\n\t"        // Move the vector to xmm0
-
-                                                          // Note - We have to copy and then shuffle because of the weird
-                                                          // semantics of shufps
-                                                          //
-                      "movaps %%xmm0, %%xmm4;\n\t"        // Copy the vector to xmm4
-                      "shufps $0, %%xmm4, %%xmm4;\n\t"    // Shuffle to repeat the first vector element repeated 4 times
-                      "mulps %%xmm4, %%xmm1;\n\t"         // Multiply the first vector element by the first matrix column
-                      "movaps %%xmm0, %%xmm5; \n\t"       // Copy the vector to xmm5
-                      "shufps $0x55, %%xmm5, %%xmm5;\n\t" // Shuffle to repeat the second vector element repeated 4 times
-                      "mulps %%xmm5, %%xmm2;\n\t"         // Multiply the second vector element by the seccond matrix column 
-                      "movaps %%xmm0, %%xmm6;\n\t"        // Copy the vector to xmm6
-                      "shufps $0xAA, %%xmm6, %%xmm6;\n\t" // Shuffle to repeat the third vector element repeated 4 times
-                      "mulps %%xmm6, %%xmm3;\n\t"         // Multiply the third vector element by the third matrix column
-
-                      "addps %%xmm3, %%xmm2;\n\t"         // Sum (second + third) columns
-                      "addps %%xmm2, %%xmm1;\n\t"         // Sum ((second + third) + first) columns
-
-                      "movss (%1), %%xmm7;\n\t"        // load the floating point representation of 65535/65536 
-                      "shufps $0, %%xmm7, %%xmm7;\n\t" // move it into all of the four slots
-                      "minps %%xmm7, %%xmm1;\n\t"      // clamp the vector to 1.0 max
-                      "xorps %%xmm6, %%xmm6;\n\t"       // get us cleared bitpatern, which is 0.0f
-                      "maxps %%xmm6, %%xmm1;\n\t"      // clamp the vector to 0.0 min
-                      "movss (%2), %%xmm5;\n\t"        // load the floating point scale factor
-                      "shufps $0, %%xmm5, %%xmm5;\n\t" // put it in all four slots
-                      "mulps %%xmm5, %%xmm1;\n\t"      // multiply by the scale factor
-                      "cvtps2dq %%xmm1, %%xmm1;\n\t"   // convert to integers
-                      "movdqa %%xmm1, (%3);\n\t"       // store
-
-                      : 
-                      : "r" (mat), "r" (clampMax), "r" (&floatScale), "r" (input)
-                      : "memory"
-/* older versions of gcc don't know about these registers so only include them as constraints
-   if gcc knows about them */
-#ifdef __SSE2__
-                        , "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7"
-#endif
-                      );
-#else
-                __asm {
-                      mov      eax, mat
-                      mov      ecx, clampMax
-                      mov      edx, floatScaleAddr
-		      mov      ebx, input
-
-                      movaps   xmm1, [eax]
-                      movaps   xmm2, [eax + 16]
-                      movaps   xmm3, [eax + 32]
-                      movaps   xmm0, [ebx]
-
-                      movaps   xmm4, xmm0
-                      shufps   xmm4, xmm4, 0
-                      mulps    xmm1, xmm4
-                      movaps   xmm5, xmm0
-                      shufps   xmm5, xmm5, 0x55
-                      mulps    xmm2, xmm5
-                      movaps   xmm6, xmm0
-                      shufps   xmm6, xmm6, 0xAA
-                      mulps    xmm3, xmm6
-
-                      addps    xmm2, xmm3
-                      addps    xmm1, xmm2
-
-                      movss    xmm7, [ecx]
-                      shufps   xmm7, xmm7, 0
-                      minps    xmm1, xmm7
-                      xorps    xmm6, xmm6
-                      maxps    xmm1, xmm6
-                      movss    xmm5, [edx]
-                      shufps   xmm5, xmm5, 0
-                      mulps    xmm1, xmm5
-                      cvtps2dq xmm1, xmm1
-                      movdqa   [ebx], xmm1
-                }
-#endif
-
-		*dest++ = transform->output_table_r->data[output[0]];
-		*dest++ = transform->output_table_g->data[output[1]];
-		*dest++ = transform->output_table_b->data[output[2]];
-	}
-}
-
-static void qcms_transform_data_rgba_out_lut_sse(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	float (*mat)[4] = transform->matrix;
-        char input_back[32];
-        float *input = (float*)(((unsigned long)&input_back[16]) & 0xfffffff0);
-        /* share input and output locations to save having to keep the
-         * locations in separate registers */
-        uint32_t* output = (uint32_t*)input;
-	for (i = 0; i < length; i++) {
-		const float *clampMax = &clampMaxValue;
-
-		unsigned char device_r = *src++;
-		unsigned char device_g = *src++;
-		unsigned char device_b = *src++;
-		unsigned char alpha = *src++;
-
-		input[0] = transform->input_gamma_table_r[device_r];
-		input[1] = transform->input_gamma_table_g[device_g];
-		input[2] = transform->input_gamma_table_b[device_b];
-
-#ifdef __GNUC__
-		__asm(
-                      "movaps (%0), %%xmm1;\n\t"          // Move the first matrix column to xmm1
-                      "movaps 16(%0), %%xmm2;\n\t"        // Move the second matrix column to xmm2
-                      "movaps 32(%0), %%xmm3;\n\t"        // move the third matrix column to xmm3
-                      "movaps (%3), %%xmm0;\n\t"        // Move the vector to xmm0
-
-                                                          // Note - We have to copy and then shuffle because of the weird
-                                                          // semantics of shufps
-                                                          //
-                      "movaps %%xmm0, %%xmm4;\n\t"        // Copy the vector to xmm4
-                      "shufps $0, %%xmm4, %%xmm4;\n\t"    // Shuffle to repeat the first vector element repeated 4 times
-                      "mulps %%xmm4, %%xmm1;\n\t"         // Multiply the first vector element by the first matrix column
-                      "movaps %%xmm0, %%xmm5; \n\t"       // Copy the vector to xmm5
-                      "shufps $0x55, %%xmm5, %%xmm5;\n\t" // Shuffle to repeat the second vector element repeated 4 times
-                      "mulps %%xmm5, %%xmm2;\n\t"         // Multiply the second vector element by the seccond matrix column 
-                      "movaps %%xmm0, %%xmm6;\n\t"        // Copy the vector to xmm6
-                      "shufps $0xAA, %%xmm6, %%xmm6;\n\t" // Shuffle to repeat the third vector element repeated 4 times
-                      "mulps %%xmm6, %%xmm3;\n\t"         // Multiply the third vector element by the third matrix column
-
-                      "addps %%xmm3, %%xmm2;\n\t"         // Sum (second + third) columns
-                      "addps %%xmm2, %%xmm1;\n\t"         // Sum ((second + third) + first) columns
-
-                      "movss (%1), %%xmm7;\n\t"        // load the floating point representation of 65535/65536 
-                      "shufps $0, %%xmm7, %%xmm7;\n\t" // move it into all of the four slots
-                      "minps %%xmm7, %%xmm1;\n\t"      // clamp the vector to 1.0 max
-                      "xorps %%xmm6, %%xmm6;\n\t"       // get us cleared bitpatern, which is 0.0f
-                      "maxps %%xmm6, %%xmm1;\n\t"      // clamp the vector to 0.0 min
-                      "movss (%2), %%xmm5;\n\t"        // load the floating point scale factor
-                      "shufps $0, %%xmm5, %%xmm5;\n\t" // put it in all four slots
-                      "mulps %%xmm5, %%xmm1;\n\t"      // multiply by the scale factor
-                      "cvtps2dq %%xmm1, %%xmm1;\n\t"   // convert to integers
-                      "movdqa %%xmm1, (%3);\n\t"       // store
-
-                      : 
-                      : "r" (mat), "r" (clampMax), "r" (&floatScale), "r" (input)
-                      : "memory"
-/* older versions of gcc don't know about these registers so only include them as constraints
-   if gcc knows about them */
-#ifdef __SSE2__
-                        , "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7"
-#endif
-                      );
-#else
-                __asm {
-                      mov      eax, mat
-                      mov      ecx, clampMax
-                      mov      edx, floatScaleAddr
-		      mov      ebx, input
-
-                      movaps   xmm1, [eax]
-                      movaps   xmm2, [eax + 16]
-                      movaps   xmm3, [eax + 32]
-                      movaps   xmm0, [ebx]
-
-                      movaps   xmm4, xmm0
-                      shufps   xmm4, xmm4, 0
-                      mulps    xmm1, xmm4
-                      movaps   xmm5, xmm0
-                      shufps   xmm5, xmm5, 0x55
-                      mulps    xmm2, xmm5
-                      movaps   xmm6, xmm0
-                      shufps   xmm6, xmm6, 0xAA
-                      mulps    xmm3, xmm6
-
-                      addps    xmm2, xmm3
-                      addps    xmm1, xmm2
-
-                      movss    xmm7, [ecx]
-                      shufps   xmm7, xmm7, 0
-                      minps    xmm1, xmm7
-                      xorps    xmm6, xmm6
-                      maxps    xmm1, xmm6
-                      movss    xmm5, [edx]
-                      shufps   xmm5, xmm5, 0
-                      mulps    xmm1, xmm5
-                      cvtps2dq xmm1, xmm1
-                      movdqa   [ebx], xmm1
-                }
-#endif
-
-		*dest++ = transform->output_table_r->data[output[0]];
-		*dest++ = transform->output_table_g->data[output[1]];
-		*dest++ = transform->output_table_b->data[output[2]];
-		*dest++ = alpha;
-	}
-}
-#endif
-
-static void qcms_transform_data_rgb_out_lut_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	float (*mat)[4] = transform->matrix;
-	for (i = 0; i < length; i++) {
-		unsigned char device_r = *src++;
-		unsigned char device_g = *src++;
-		unsigned char device_b = *src++;
-		uint16_t r, g, b;
-
-		float linear_r = transform->input_gamma_table_r[device_r];
-		float linear_g = transform->input_gamma_table_g[device_g];
-		float linear_b = transform->input_gamma_table_b[device_b];
-
-		float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
-		float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
-		float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
-
-		out_linear_r = clamp_float(out_linear_r);
-		out_linear_g = clamp_float(out_linear_g);
-		out_linear_b = clamp_float(out_linear_b);
-
-		/* we could round here... */
-		r = out_linear_r * 65535.;
-		g = out_linear_g * 65535.;
-		b = out_linear_b * 65535.;
-
-		*dest++ = transform->output_table_r->data[r];
-		*dest++ = transform->output_table_g->data[g];
-		*dest++ = transform->output_table_b->data[b];
-	}
-}
-
-static void qcms_transform_data_rgba_out_lut_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	float (*mat)[4] = transform->matrix;
-	for (i = 0; i < length; i++) {
-		unsigned char device_r = *src++;
-		unsigned char device_g = *src++;
-		unsigned char device_b = *src++;
-		unsigned char alpha = *src++;
-		uint16_t r, g, b;
-
-		float linear_r = transform->input_gamma_table_r[device_r];
-		float linear_g = transform->input_gamma_table_g[device_g];
-		float linear_b = transform->input_gamma_table_b[device_b];
-
-		float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
-		float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
-		float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
-
-		out_linear_r = clamp_float(out_linear_r);
-		out_linear_g = clamp_float(out_linear_g);
-		out_linear_b = clamp_float(out_linear_b);
-
-		/* we could round here... */
-		r = out_linear_r * 65535.;
-		g = out_linear_g * 65535.;
-		b = out_linear_b * 65535.;
-
-		*dest++ = transform->output_table_r->data[r];
-		*dest++ = transform->output_table_g->data[g];
-		*dest++ = transform->output_table_b->data[b];
-		*dest++ = alpha;
-	}
-}
-
-static void qcms_transform_data_rgb_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	float (*mat)[4] = transform->matrix;
-	for (i = 0; i < length; i++) {
-		unsigned char device_r = *src++;
-		unsigned char device_g = *src++;
-		unsigned char device_b = *src++;
-		float out_device_r, out_device_g, out_device_b;
-
-		float linear_r = transform->input_gamma_table_r[device_r];
-		float linear_g = transform->input_gamma_table_g[device_g];
-		float linear_b = transform->input_gamma_table_b[device_b];
-
-		float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
-		float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
-		float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
-
-		out_linear_r = clamp_float(out_linear_r);
-		out_linear_g = clamp_float(out_linear_g);
-		out_linear_b = clamp_float(out_linear_b);
-
-		out_device_r = lut_interp_linear(out_linear_r, transform->output_gamma_lut_r, transform->output_gamma_lut_r_length);
-		out_device_g = lut_interp_linear(out_linear_g, transform->output_gamma_lut_g, transform->output_gamma_lut_g_length);
-		out_device_b = lut_interp_linear(out_linear_b, transform->output_gamma_lut_b, transform->output_gamma_lut_b_length);
-
-		*dest++ = clamp_u8(out_device_r*255);
-		*dest++ = clamp_u8(out_device_g*255);
-		*dest++ = clamp_u8(out_device_b*255);
-	}
-}
-
-static void qcms_transform_data_rgba_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	float (*mat)[4] = transform->matrix;
-	for (i = 0; i < length; i++) {
-		unsigned char device_r = *src++;
-		unsigned char device_g = *src++;
-		unsigned char device_b = *src++;
-		unsigned char alpha = *src++;
-		float out_device_r, out_device_g, out_device_b;
-
-		float linear_r = transform->input_gamma_table_r[device_r];
-		float linear_g = transform->input_gamma_table_g[device_g];
-		float linear_b = transform->input_gamma_table_b[device_b];
-
-		float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
-		float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
-		float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
-
-		out_linear_r = clamp_float(out_linear_r);
-		out_linear_g = clamp_float(out_linear_g);
-		out_linear_b = clamp_float(out_linear_b);
-
-		out_device_r = lut_interp_linear(out_linear_r, transform->output_gamma_lut_r, transform->output_gamma_lut_r_length);
-		out_device_g = lut_interp_linear(out_linear_g, transform->output_gamma_lut_g, transform->output_gamma_lut_g_length);
-		out_device_b = lut_interp_linear(out_linear_b, transform->output_gamma_lut_b, transform->output_gamma_lut_b_length);
-
-		*dest++ = clamp_u8(out_device_r*255);
-		*dest++ = clamp_u8(out_device_g*255);
-		*dest++ = clamp_u8(out_device_b*255);
-		*dest++ = alpha;
-	}
-}
-
-#if 0
-static void qcms_transform_data_rgb_out_linear(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
-{
-	int i;
-	float (*mat)[4] = transform->matrix;
-	for (i = 0; i < length; i++) {
-		unsigned char device_r = *src++;
-		unsigned char device_g = *src++;
-		unsigned char device_b = *src++;
-
-		float linear_r = transform->input_gamma_table_r[device_r];
-		float linear_g = transform->input_gamma_table_g[device_g];
-		float linear_b = transform->input_gamma_table_b[device_b];
-
-		float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
-		float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
-		float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
-
-		*dest++ = clamp_u8(out_linear_r*255);
-		*dest++ = clamp_u8(out_linear_g*255);
-		*dest++ = clamp_u8(out_linear_b*255);
-	}
-}
-#endif
-
-static struct precache_output *precache_reference(struct precache_output *p)
-{
-	p->ref_count++;
-	return p;
-}
-
-static struct precache_output *precache_create()
-{
-	struct precache_output *p = malloc(sizeof(struct precache_output));
-	p->ref_count = 1;
-	return p;
-}
-
-void precache_release(struct precache_output *p)
-{
-	if (--p->ref_count == 0) {
-		free(p);
-	}
-}
-
-void qcms_transform_release(qcms_transform *t)
-{
-	/* ensure we only free the gamma tables once even if there are
-	 * multiple references to the same data */
-
-	if (t->output_table_r)
-		precache_release(t->output_table_r);
-	if (t->output_table_g)
-		precache_release(t->output_table_g);
-	if (t->output_table_b)
-		precache_release(t->output_table_b);
-
-	free(t->input_gamma_table_r);
-	if (t->input_gamma_table_g != t->input_gamma_table_r)
-		free(t->input_gamma_table_g);
-	if (t->input_gamma_table_g != t->input_gamma_table_r &&
-	    t->input_gamma_table_g != t->input_gamma_table_b)
-		free(t->input_gamma_table_b);
-
-	free(t->input_gamma_table_gray);
-
-	free(t->output_gamma_lut_r);
-	free(t->output_gamma_lut_g);
-	free(t->output_gamma_lut_b);
-
-	free(t);
-}
-
-static void compute_precache_pow(uint8_t *output, float gamma)
-{
-	uint32_t v = 0;
-	for (v = 0; v <= 0xffff; v++) {
-		//XXX: don't do integer/float conversion... and round?
-		output[v] = 255. * pow(v/65535., gamma);
-	}
-}
-
-void compute_precache_lut(uint8_t *output, uint16_t *table, int length)
-{
-	uint32_t v = 0;
-	for (v = 0; v <= 0xffff; v++) {
-		//XXX: don't do integer/float conversion... round?
-		output[v] = lut_interp_linear16(v, table, length) >> 8;
-	}
-}
-
-void compute_precache_linear(uint8_t *output)
-{
-	uint32_t v = 0;
-	for (v = 0; v <= 0xffff; v++) {
-		//XXX: round?
-		output[v] = v >> 8;
-	}
-}
-
-qcms_bool compute_precache(struct curveType *trc, uint8_t *output)
-{
-	if (trc->count == 0) {
-		compute_precache_linear(output);
-	} else if (trc->count == 1) {
-		compute_precache_pow(output, 1./u8Fixed8Number_to_float(trc->data[0]));
-	} else {
-		uint16_t *inverted = invert_lut(trc->data, trc->count);
-		if (!inverted)
-			return false;
-		compute_precache_lut(output, inverted, trc->count);
-		free(inverted);
-	}
-	return true;
-}
-
-
-// Determine if we can build with SSE2 (this was partly copied from jmorecfg.h in
-// mozilla/jpeg)
- // -------------------------------------------------------------------------
-#if defined(_M_IX86) && defined(_MSC_VER_)
-#define HAS_CPUID
-/* Get us a CPUID function. Avoid clobbering EBX because sometimes it's the PIC
-   register - I'm not sure if that ever happens on windows, but cpuid isn't
-   on the critical path so we just preserve the register to be safe and to be
-   consistent with the non-windows version. */
-static void cpuid(uint32_t fxn, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) {
-       uint32_t a_, b_, c_, d_;
-       __asm {
-              xchg   ebx, esi
-              mov    eax, fxn
-              cpuid
-              mov    a_, eax
-              mov    b_, ebx
-              mov    c_, ecx
-              mov    d_, edx
-              xchg   ebx, esi
-       }
-       *a = a_;
-       *b = b_;
-       *c = c_;
-       *d = d_;
-}
-#elif defined(__GNUC__) && defined(__i386__)
-#define HAS_CPUID
-/* Get us a CPUID function. We can't use ebx because it's the PIC register on
-   some platforms, so we use ESI instead and save ebx to avoid clobbering it. */
-static void cpuid(uint32_t fxn, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) {
-
-	uint32_t a_, b_, c_, d_;
-       __asm__ __volatile__ ("xchgl %%ebx, %%esi; cpuid; xchgl %%ebx, %%esi;" 
-                             : "=a" (a_), "=S" (b_), "=c" (c_), "=d" (d_) : "a" (fxn));
-	   *a = a_;
-	   *b = b_;
-	   *c = c_;
-	   *d = d_;
-}
-#endif
-
-// -------------------------Runtime SSE2 Detection-----------------------------
-
-#define SSE2_EDX_MASK (1UL << 26)
-static qcms_bool sse2_available(void)
-{
-#ifdef HAS_CPUID
-       static int has_sse2 = -1;
-       uint32_t a, b, c, d;
-       uint32_t function = 0x00000001;
-
-       if (has_sse2 == -1) {
-              has_sse2 = 0;
-	      cpuid(function, &a, &b, &c, &d);
-              if (d & SSE2_EDX_MASK)
-                     has_sse2 = 1;
-              else
-                     has_sse2 = 0;
-       }
-
-       return has_sse2;
-#endif
-       return false;
-}
-
-
-void build_output_lut(struct curveType *trc,
-		uint16_t **output_gamma_lut, size_t *output_gamma_lut_length)
-{
-	if (trc->count == 0) {
-		*output_gamma_lut = build_linear_table(4096);
-		*output_gamma_lut_length = 4096;
-	} else if (trc->count == 1) {
-		float gamma = 1./u8Fixed8Number_to_float(trc->data[0]);
-		*output_gamma_lut = build_pow_table(gamma, 4096);
-		*output_gamma_lut_length = 4096;
-	} else {
-		*output_gamma_lut = invert_lut(trc->data, trc->count);
-		*output_gamma_lut_length = trc->count;
-	}
-
-}
-
-void qcms_profile_precache_output_transform(qcms_profile *profile)
-{
-	if (!profile->output_table_r) {
-		profile->output_table_r = precache_create();
-		if (!compute_precache(profile->redTRC, profile->output_table_r->data)) {
-			precache_release(profile->output_table_r);
-			profile->output_table_r = NULL;
-		}
-	}
-	if (!profile->output_table_g) {
-		profile->output_table_g = precache_create();
-		if (!compute_precache(profile->greenTRC, profile->output_table_g->data)) {
-			precache_release(profile->output_table_g);
-			profile->output_table_g = NULL;
-		}
-	}
-	if (!profile->output_table_b) {
-		profile->output_table_b = precache_create();
-		if (!compute_precache(profile->blueTRC, profile->output_table_b->data)) {
-			precache_release(profile->output_table_g);
-			profile->output_table_g = NULL;
-		}
-	}
-}
-
-#define NO_MEM_TRANSFORM NULL
-
-qcms_transform* qcms_transform_create(
-		qcms_profile *in, qcms_data_type in_type,
-		qcms_profile* out, qcms_data_type out_type,
-		qcms_intent intent)
-{
-	bool precache = false;
-
-        qcms_transform *transform = calloc(sizeof(qcms_transform), 1);
-        if (!transform) {
-		return NULL;
-	}
-	if (out_type != QCMS_DATA_RGB_8 &&
-                out_type != QCMS_DATA_RGBA_8) {
-            assert(0 && "output type");
-	    free(transform);
-            return NULL;
-        }
-
-	if (out->output_table_r &&
-			out->output_table_g &&
-			out->output_table_b) {
-		precache = true;
-	}
-
-	if (precache) {
-		transform->output_table_r = precache_reference(out->output_table_r);
-		transform->output_table_g = precache_reference(out->output_table_g);
-		transform->output_table_b = precache_reference(out->output_table_b);
-	} else {
-		build_output_lut(out->redTRC, &transform->output_gamma_lut_r, &transform->output_gamma_lut_r_length);
-		build_output_lut(out->greenTRC, &transform->output_gamma_lut_g, &transform->output_gamma_lut_g_length);
-		build_output_lut(out->blueTRC, &transform->output_gamma_lut_b, &transform->output_gamma_lut_b_length);
-		if (!transform->output_gamma_lut_r || !transform->output_gamma_lut_g || !transform->output_gamma_lut_b) {
-			qcms_transform_release(transform);
-			return NO_MEM_TRANSFORM;
-		}
-	}
-
-        if (in->color_space == RGB_SIGNATURE) {
-            struct matrix in_matrix, out_matrix, result;
-
-            if (in_type != QCMS_DATA_RGB_8 &&
-                    in_type != QCMS_DATA_RGBA_8){
-                assert(0 && "input type");
-		free(transform);
-                return NULL;
-            }
-	    if (precache) {
-#ifdef X86
-		    if (sse2_available()) {
-			    if (in_type == QCMS_DATA_RGB_8)
-				    transform->transform_fn = qcms_transform_data_rgb_out_lut_sse;
-			    else
-				    transform->transform_fn = qcms_transform_data_rgba_out_lut_sse;
-
-		    } else
-#endif
-		    {
-			    if (in_type == QCMS_DATA_RGB_8)
-				    transform->transform_fn = qcms_transform_data_rgb_out_lut_precache;
-			    else
-				    transform->transform_fn = qcms_transform_data_rgba_out_lut_precache;
-		    }
-	    } else {
-		    if (in_type == QCMS_DATA_RGB_8)
-			    transform->transform_fn = qcms_transform_data_rgb_out_lut;
-		    else
-			    transform->transform_fn = qcms_transform_data_rgba_out_lut;
-	    }
-
-            //XXX: avoid duplicating tables if we can
-            transform->input_gamma_table_r = build_input_gamma_table(in->redTRC);
-            transform->input_gamma_table_g = build_input_gamma_table(in->greenTRC);
-            transform->input_gamma_table_b = build_input_gamma_table(in->blueTRC);
-
-	    if (!transform->input_gamma_table_r || !transform->input_gamma_table_g || !transform->input_gamma_table_b) {
-		    qcms_transform_release(transform);
-		    return NO_MEM_TRANSFORM;
-	    }
-
-            /* build combined colorant matrix */
-            in_matrix = build_colorant_matrix(in);
-            out_matrix = build_colorant_matrix(out);
-            out_matrix = matrix_invert(out_matrix);
-            if (out_matrix.invalid) {
-                qcms_transform_release(transform);
-                return NULL;
-            }
-            result = matrix_multiply(out_matrix, in_matrix);
-
-            /* store the results in column major mode
-             * this makes doing the multiplication with sse easier */
-            transform->matrix[0][0] = result.m[0][0];
-            transform->matrix[1][0] = result.m[0][1];
-            transform->matrix[2][0] = result.m[0][2];
-            transform->matrix[0][1] = result.m[1][0];
-            transform->matrix[1][1] = result.m[1][1];
-            transform->matrix[2][1] = result.m[1][2];
-            transform->matrix[0][2] = result.m[2][0];
-            transform->matrix[1][2] = result.m[2][1];
-            transform->matrix[2][2] = result.m[2][2];
-
-        } else if (in->color_space == GRAY_SIGNATURE) {
-            if (in_type != QCMS_DATA_GRAY_8 &&
-                    in_type != QCMS_DATA_GRAYA_8){
-                assert(0 && "input type");
-		free(transform);
-                return NULL;
-            }
-
-            transform->input_gamma_table_gray = build_input_gamma_table(in->grayTRC);
-	    if (!transform->input_gamma_table_gray) {
-		    qcms_transform_release(transform);
-		    return NO_MEM_TRANSFORM;
-	    }
-
-	    if (precache) {
-		    if (in_type == QCMS_DATA_GRAY_8) {
-			    transform->transform_fn = qcms_transform_data_gray_out_precache;
-		    } else {
-			    transform->transform_fn = qcms_transform_data_graya_out_precache;
-		    }
-	    } else {
-		    if (in_type == QCMS_DATA_GRAY_8) {
-			    transform->transform_fn = qcms_transform_data_gray_out_lut;
-		    } else {
-			    transform->transform_fn = qcms_transform_data_graya_out_lut;
-		    }
-	    }
-	} else {
-		assert(0 && "unexpected colorspace");
-	}
-	return transform;
-}
-
-void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size_t length)
-{
-	transform->transform_fn(transform, src, dest, length);
-}
--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@@ -57,17 +57,16 @@ REQUIRES =  xpcom \
             string \
             thebes \
             widget \
             view \
             pref \
             unicharutil \
             imglib2 \
             $(ZLIB_REQUIRES) \
-            qcms \
             $(NULL)
 
 CPPSRCS		= \
 		nsThebesDeviceContext.cpp \
 		nsThebesImage.cpp \
 		nsThebesRegion.cpp \
 		nsThebesGfxFactory.cpp \
 		nsThebesRenderingContext.cpp \
@@ -88,17 +87,16 @@ CPPSRCS		+= nsSystemFontsGTK2.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS		+= nsSystemFontsWin.cpp \
 		   $(NULL)
 
 REQUIRES	+= \
 		cairo \
-		qcms \
 		$(NULL)
 
 _OS_LIBS	= usp10
 OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
 
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
--- a/gfx/thebes/public/gfxPlatform.h
+++ b/gfx/thebes/public/gfxPlatform.h
@@ -43,21 +43,23 @@
 #include "nsTArray.h"
 
 #include "nsIObserver.h"
 
 #include "gfxTypes.h"
 #include "gfxASurface.h"
 #include "gfxColor.h"
 
-#include "qcms.h"
 #ifdef XP_OS2
 #undef OS2EMX_PLAIN_CHAR
 #endif
 
+typedef void* cmsHPROFILE;
+typedef void* cmsHTRANSFORM;
+
 class gfxImageSurface;
 class gfxFont;
 class gfxFontGroup;
 struct gfxFontStyle;
 class gfxUserFontSet;
 class gfxFontEntry;
 class gfxProxyFontEntry;
 class nsIURI;
@@ -262,46 +264,46 @@ public:
      */
     static int GetRenderingIntent();
 
     /**
      * Convert a pixel using a cms transform in an endian-aware manner.
      *
      * Sets 'out' to 'in' if transform is NULL.
      */
-    static void TransformPixel(const gfxRGBA& in, gfxRGBA& out, qcms_transform *transform);
+    static void TransformPixel(const gfxRGBA& in, gfxRGBA& out, cmsHTRANSFORM transform);
 
     /**
      * Return the output device ICC profile.
      */
-    static qcms_profile* GetCMSOutputProfile();
+    static cmsHPROFILE GetCMSOutputProfile();
 
     /**
      * Return the sRGB ICC profile.
      */
-    static qcms_profile* GetCMSsRGBProfile();
+    static cmsHPROFILE GetCMSsRGBProfile();
 
     /**
      * Return sRGB -> output device transform.
      */
-    static qcms_transform* GetCMSRGBTransform();
+    static cmsHTRANSFORM GetCMSRGBTransform();
 
     /**
      * Return output -> sRGB device transform.
      */
-    static qcms_transform* GetCMSInverseRGBTransform();
+    static cmsHTRANSFORM GetCMSInverseRGBTransform();
 
     /**
      * Return sRGBA -> output device transform.
      */
-    static qcms_transform* GetCMSRGBATransform();
+    static cmsHTRANSFORM GetCMSRGBATransform();
 
 protected:
     gfxPlatform() { }
     virtual ~gfxPlatform();
 
 private:
-    virtual qcms_profile* GetPlatformCMSOutputProfile();
+    virtual cmsHPROFILE GetPlatformCMSOutputProfile();
 
     nsCOMPtr<nsIObserver> overrideObserver;
 };
 
 #endif /* GFX_PLATFORM_H */
--- a/gfx/thebes/public/gfxPlatformGtk.h
+++ b/gfx/thebes/public/gfxPlatformGtk.h
@@ -137,12 +137,12 @@ public:
 
 protected:
     static void InitDPI();
 
     static double sDPI;
     static gfxFontconfigUtils *sFontconfigUtils;
 
 private:
-    virtual qcms_profile *GetPlatformCMSOutputProfile();
+    virtual cmsHPROFILE GetPlatformCMSOutputProfile();
 };
 
 #endif /* GFX_PLATFORM_GTK_H */
--- a/gfx/thebes/public/gfxPlatformMac.h
+++ b/gfx/thebes/public/gfxPlatformMac.h
@@ -102,17 +102,17 @@ public:
 
     // map a Unicode range (based on char code) to a font language for Preferences
     static eFontPrefLang GetFontPrefLangFor(PRUint8 aUnicodeRange);
 
 private:
     void AppendCJKPrefLangs(eFontPrefLang aPrefLangs[], PRUint32 &aLen, 
                             eFontPrefLang aCharLang, eFontPrefLang aPageLang);
                                                
-    virtual qcms_profile* GetPlatformCMSOutputProfile();
+    virtual cmsHPROFILE GetPlatformCMSOutputProfile();
     
     // read in the pref value for the lower threshold on font anti-aliasing
     static PRUint32 ReadAntiAliasingThreshold();    
     
     nsTArray<PRUint32> mCJKPrefLangs;
     PRInt32 mOSXVersion;
     PRUint32 mFontAntiAliasingThreshold;
 
--- a/gfx/thebes/public/gfxQtPlatform.h
+++ b/gfx/thebes/public/gfxQtPlatform.h
@@ -92,13 +92,13 @@ public:
 
 protected:
     static void InitDPI();
 
     static PRInt32 sDPI;
     static gfxFontconfigUtils *sFontconfigUtils;
 
 private:
-    virtual qcms_profile *GetPlatformCMSOutputProfile();
+    virtual cmsHPROFILE GetPlatformCMSOutputProfile();
 };
 
 #endif /* GFX_PLATFORM_QT_H */
 
--- a/gfx/thebes/public/gfxWindowsPlatform.h
+++ b/gfx/thebes/public/gfxWindowsPlatform.h
@@ -158,17 +158,17 @@ private:
     static PLDHashOperator HashEnumFunc(nsStringHashKey::KeyType aKey,
                                         nsRefPtr<FontFamily>& aData,
                                         void* userArg);
 
     static PLDHashOperator FindFontForCharProc(nsStringHashKey::KeyType aKey,
                                                nsRefPtr<FontFamily>& aFontFamily,
                                                void* userArg);
 
-    virtual qcms_profile* GetPlatformCMSOutputProfile();
+    virtual cmsHPROFILE GetPlatformCMSOutputProfile();
 
     static int PrefChangedCallback(const char*, void*);
 
     // gfxFontInfoLoader overrides, used to load in font cmaps
     virtual void InitLoader();
     virtual PRBool RunLoader();
     virtual void FinishLoader();
 
--- a/gfx/thebes/src/Makefile.in
+++ b/gfx/thebes/src/Makefile.in
@@ -13,17 +13,16 @@ EXPORT_LIBRARY	= 1
 
 REQUIRES = \
 	cairo \
 	string \
 	pref \
 	xpcom \
 	unicharutil \
 	$(LCMS_REQUIRES) \
-	qcms \
 	$(NULL)
 
 CPPSRCS	= \
 	gfxASurface.cpp \
 	gfxAlphaRecovery.cpp \
 	gfxBlur.cpp \
 	gfxContext.cpp \
 	gfxImageSurface.cpp \
@@ -43,17 +42,17 @@ CPPSRCS	= \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS += \
 	$(MOZ_CAIRO_LIBS) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(XPCOM_LIBS) \
 	$(NSPR_LIBS) \
 	$(ZLIB_LIBS) \
-	$(QCMS_LIBS) \
+	$(LCMS_LIBS) \
 	$(NULL)
 
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS	+= 	gfxWindowsPlatform.cpp \
 		gfxWindowsSurface.cpp \
 		gfxWindowsNativeDrawing.cpp \
 		nsUnicodeRange.cpp \
--- a/gfx/thebes/src/gfxContext.cpp
+++ b/gfx/thebes/src/gfxContext.cpp
@@ -41,16 +41,17 @@
 #endif
 #include <math.h>
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
 
 #include "cairo.h"
+#include "lcms.h"
 
 #include "gfxContext.h"
 
 #include "gfxColor.h"
 #include "gfxMatrix.h"
 #include "gfxASurface.h"
 #include "gfxPattern.h"
 #include "gfxPlatform.h"
--- a/gfx/thebes/src/gfxPattern.cpp
+++ b/gfx/thebes/src/gfxPattern.cpp
@@ -36,16 +36,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "gfxTypes.h"
 #include "gfxPattern.h"
 #include "gfxASurface.h"
 #include "gfxPlatform.h"
 
 #include "cairo.h"
+#include "lcms.h"
 
 gfxPattern::gfxPattern(cairo_pattern_t *aPattern)
 {
     mPattern = cairo_pattern_reference(aPattern);
 }
 
 gfxPattern::gfxPattern(const gfxRGBA& aColor)
 {
--- a/gfx/thebes/src/gfxPlatform.cpp
+++ b/gfx/thebes/src/gfxPlatform.cpp
@@ -60,32 +60,32 @@
 
 #include "nsIPref.h"
 #include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
 
 #include "nsWeakReference.h"
 
 #include "cairo.h"
-#include "qcms.h"
+#include "lcms.h"
 
 #include "plstr.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefBranch2.h"
 
 gfxPlatform *gPlatform = nsnull;
 
 // These two may point to the same profile
-static qcms_profile *gCMSOutputProfile = nsnull;
-static qcms_profile *gCMSsRGBProfile = nsnull;
+static cmsHPROFILE gCMSOutputProfile = nsnull;
+static cmsHPROFILE gCMSsRGBProfile = nsnull;
 
-static qcms_transform *gCMSRGBTransform = nsnull;
-static qcms_transform *gCMSInverseRGBTransform = nsnull;
-static qcms_transform *gCMSRGBATransform = nsnull;
+static cmsHTRANSFORM gCMSRGBTransform = nsnull;
+static cmsHTRANSFORM gCMSInverseRGBTransform = nsnull;
+static cmsHTRANSFORM gCMSRGBATransform = nsnull;
 
 static PRBool gCMSInitialized = PR_FALSE;
 static eCMSMode gCMSMode = eCMSMode_Off;
 static int gCMSIntent = -2;
 
 static const char *CMPrefName = "gfx.color_management.mode";
 static const char *CMPrefNameOld = "gfx.color_management.enabled";
 static const char *CMIntentPrefName = "gfx.color_management.rendering_intent";
@@ -219,16 +219,26 @@ gfxPlatform::Init()
     MigratePrefs();
 
     /* Create and register our CMS Override observer. */
     gPlatform->overrideObserver = new SRGBOverrideObserver();
     nsCOMPtr<nsIPrefBranch2> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
     if (prefs)
         prefs->AddObserver(CMForceSRGBPrefName, gPlatform->overrideObserver, PR_TRUE);
 
+    /* By default, LCMS calls exit() on error, which isn't what we want. If
+       cms is enabled, change the error functionality. */
+    if (GetCMSMode() != eCMSMode_Off) {
+#ifdef DEBUG
+        cmsErrorAction(LCMS_ERROR_SHOW);
+#else
+        cmsErrorAction(LCMS_ERROR_IGNORE);
+#endif
+    }
+
     return NS_OK;
 }
 
 void
 gfxPlatform::Shutdown()
 {
     // These may be called before the corresponding subsystems have actually
     // started up. That's OK, they can handle it.
@@ -498,19 +508,17 @@ gfxPlatform::GetCMSMode()
         }
     }
     return gCMSMode;
 }
 
 /* Chris Murphy (CM consultant) suggests this as a default in the event that we
 cannot reproduce relative + Black Point Compensation.  BPC brings an
 unacceptable performance overhead, so we go with perceptual. */
-#define INTENT_DEFAULT QCMS_INTENT_PERCEPTUAL
-#define INTENT_MIN 0
-#define INTENT_MAX 3
+#define INTENT_DEFAULT INTENT_PERCEPTUAL
 
 PRBool
 gfxPlatform::GetRenderingIntent()
 {
     if (gCMSIntent == -2) {
 
         /* Try to query the pref system for a rendering intent. */
         nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
@@ -532,52 +540,48 @@ gfxPlatform::GetRenderingIntent()
         /* If we didn't get a valid intent from prefs, use the default. */
         if (gCMSIntent == -2) 
             gCMSIntent = INTENT_DEFAULT;
     }
     return gCMSIntent;
 }
 
 void 
-gfxPlatform::TransformPixel(const gfxRGBA& in, gfxRGBA& out, qcms_transform *transform)
+gfxPlatform::TransformPixel(const gfxRGBA& in, gfxRGBA& out, cmsHTRANSFORM transform)
 {
 
     if (transform) {
-        /* we want the bytes in RGB order */
 #ifdef IS_LITTLE_ENDIAN
-        /* ABGR puts the bytes in |RGBA| order on little endian */
         PRUint32 packed = in.Packed(gfxRGBA::PACKED_ABGR);
-        qcms_transform_data(transform,
+        cmsDoTransform(transform,
                        (PRUint8 *)&packed, (PRUint8 *)&packed,
                        1);
         out.~gfxRGBA();
         new (&out) gfxRGBA(packed, gfxRGBA::PACKED_ABGR);
 #else
-        /* ARGB puts the bytes in |ARGB| order on big endian */
         PRUint32 packed = in.Packed(gfxRGBA::PACKED_ARGB);
-        /* add one to move past the alpha byte */
-        qcms_transform_data(transform,
+        cmsDoTransform(transform,
                        (PRUint8 *)&packed + 1, (PRUint8 *)&packed + 1,
                        1);
         out.~gfxRGBA();
         new (&out) gfxRGBA(packed, gfxRGBA::PACKED_ARGB);
 #endif
     }
 
     else if (&out != &in)
         out = in;
 }
 
-qcms_profile *
+cmsHPROFILE
 gfxPlatform::GetPlatformCMSOutputProfile()
 {
     return nsnull;
 }
 
-qcms_profile *
+cmsHPROFILE
 gfxPlatform::GetCMSOutputProfile()
 {
     if (!gCMSOutputProfile) {
 
         nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
         if (prefs) {
 
             nsresult rv;
@@ -593,140 +597,145 @@ gfxPlatform::GetCMSOutputProfile()
             }
 
             if (!gCMSOutputProfile) {
 
                 nsXPIDLCString fname;
                 rv = prefs->GetCharPref(CMProfilePrefName,
                                         getter_Copies(fname));
                 if (NS_SUCCEEDED(rv) && !fname.IsEmpty()) {
-                    gCMSOutputProfile = qcms_profile_from_path(fname);
+                    gCMSOutputProfile = cmsOpenProfileFromFile(fname, "r");
                 }
             }
         }
 
         if (!gCMSOutputProfile) {
             gCMSOutputProfile =
                 gfxPlatform::GetPlatform()->GetPlatformCMSOutputProfile();
         }
 
         /* Determine if the profile looks bogus. If so, close the profile
          * and use sRGB instead. See bug 460629, */
-        if (gCMSOutputProfile && qcms_profile_is_bogus(gCMSOutputProfile)) {
+        if (gCMSOutputProfile && cmsProfileIsBogus(gCMSOutputProfile)) {
             NS_ASSERTION(gCMSOutputProfile != GetCMSsRGBProfile(),
                          "Builtin sRGB profile tagged as bogus!!!");
-            qcms_profile_release(gCMSOutputProfile);
+            cmsCloseProfile(gCMSOutputProfile);
             gCMSOutputProfile = nsnull;
         }
 
         if (!gCMSOutputProfile) {
             gCMSOutputProfile = GetCMSsRGBProfile();
         }
+
         /* Precache the LUT16 Interpolations for the output profile. See 
            bug 444661 for details. */
-        qcms_profile_precache_output_transform(gCMSOutputProfile);
+        cmsPrecacheProfile(gCMSOutputProfile, CMS_PRECACHE_LI168_REVERSE);
     }
 
     return gCMSOutputProfile;
 }
 
-qcms_profile *
+cmsHPROFILE
 gfxPlatform::GetCMSsRGBProfile()
 {
     if (!gCMSsRGBProfile) {
 
         /* Create the profile using lcms. */
-        gCMSsRGBProfile = qcms_profile_sRGB();
+        gCMSsRGBProfile = cmsCreate_sRGBProfile();
+
+        /* Precache the Fixed-point Interpolations for sRGB as an input
+           profile. See bug 444661 for details. */
+        cmsPrecacheProfile(gCMSsRGBProfile, CMS_PRECACHE_LI8F_FORWARD);
     }
     return gCMSsRGBProfile;
 }
 
-qcms_transform *
+cmsHTRANSFORM
 gfxPlatform::GetCMSRGBTransform()
 {
     if (!gCMSRGBTransform) {
-        qcms_profile *inProfile, *outProfile;
+        cmsHPROFILE inProfile, outProfile;
         outProfile = GetCMSOutputProfile();
         inProfile = GetCMSsRGBProfile();
 
         if (!inProfile || !outProfile)
             return nsnull;
 
-        gCMSRGBTransform = qcms_transform_create(inProfile, QCMS_DATA_RGB_8,
-                                              outProfile, QCMS_DATA_RGB_8,
-                                             QCMS_INTENT_PERCEPTUAL);
+        gCMSRGBTransform = cmsCreateTransform(inProfile, TYPE_RGB_8,
+                                              outProfile, TYPE_RGB_8,
+                                              INTENT_PERCEPTUAL, cmsFLAGS_FLOATSHAPER);
     }
 
     return gCMSRGBTransform;
 }
 
-qcms_transform *
+cmsHTRANSFORM
 gfxPlatform::GetCMSInverseRGBTransform()
 {
     if (!gCMSInverseRGBTransform) {
-        qcms_profile *inProfile, *outProfile;
+        cmsHPROFILE inProfile, outProfile;
         inProfile = GetCMSOutputProfile();
         outProfile = GetCMSsRGBProfile();
 
         if (!inProfile || !outProfile)
             return nsnull;
 
-        gCMSInverseRGBTransform = qcms_transform_create(inProfile, QCMS_DATA_RGB_8,
-                                                     outProfile, QCMS_DATA_RGB_8,
-                                                     QCMS_INTENT_PERCEPTUAL);
+        gCMSInverseRGBTransform = cmsCreateTransform(inProfile, TYPE_RGB_8,
+                                                     outProfile, TYPE_RGB_8,
+                                                     INTENT_PERCEPTUAL, cmsFLAGS_FLOATSHAPER);
     }
 
     return gCMSInverseRGBTransform;
 }
 
-qcms_transform *
+cmsHTRANSFORM
 gfxPlatform::GetCMSRGBATransform()
 {
     if (!gCMSRGBATransform) {
-        qcms_profile *inProfile, *outProfile;
+        cmsHPROFILE inProfile, outProfile;
         outProfile = GetCMSOutputProfile();
         inProfile = GetCMSsRGBProfile();
 
         if (!inProfile || !outProfile)
             return nsnull;
 
-        gCMSRGBATransform = qcms_transform_create(inProfile, QCMS_DATA_RGBA_8,
-                                               outProfile, QCMS_DATA_RGBA_8,
-                                               QCMS_INTENT_PERCEPTUAL);
+        gCMSRGBATransform = cmsCreateTransform(inProfile, TYPE_RGBA_8,
+                                               outProfile, TYPE_RGBA_8,
+                                               INTENT_PERCEPTUAL, cmsFLAGS_FLOATSHAPER);
     }
 
     return gCMSRGBATransform;
 }
 
 /* Shuts down various transforms and profiles for CMS. */
 static void ShutdownCMS()
 {
 
     if (gCMSRGBTransform) {
-        qcms_transform_release(gCMSRGBTransform);
+        cmsDeleteTransform(gCMSRGBTransform);
         gCMSRGBTransform = nsnull;
     }
     if (gCMSInverseRGBTransform) {
-        qcms_transform_release(gCMSInverseRGBTransform);
+        cmsDeleteTransform(gCMSInverseRGBTransform);
         gCMSInverseRGBTransform = nsnull;
     }
     if (gCMSRGBATransform) {
-        qcms_transform_release(gCMSRGBATransform);
+        cmsDeleteTransform(gCMSRGBATransform);
         gCMSRGBATransform = nsnull;
     }
     if (gCMSOutputProfile) {
-        qcms_profile_release(gCMSOutputProfile);
+        cmsCloseProfile(gCMSOutputProfile);
 
         // handle the aliased case
         if (gCMSsRGBProfile == gCMSOutputProfile)
             gCMSsRGBProfile = nsnull;
         gCMSOutputProfile = nsnull;
     }
     if (gCMSsRGBProfile) {
-        qcms_profile_release(gCMSsRGBProfile);
+        cmsCloseProfile(gCMSsRGBProfile);
         gCMSsRGBProfile = nsnull;
     }
 
     // Reset the state variables
     gCMSIntent = -2;
     gCMSMode = eCMSMode_Off;
     gCMSInitialized = PR_FALSE;
 }
--- a/gfx/thebes/src/gfxPlatformGtk.cpp
+++ b/gfx/thebes/src/gfxPlatformGtk.cpp
@@ -72,16 +72,18 @@
 #ifdef MOZ_DFB
 #include "gfxDirectFBSurface.h"
 #endif
 
 #include <fontconfig/fontconfig.h>
 
 #include "nsMathUtils.h"
 
+#include "lcms.h"
+
 #define GDK_PIXMAP_SIZE_MAX 32767
 
 #ifndef MOZ_PANGO
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #endif
 
 double gfxPlatformGtk::sDPI = -1.0;
@@ -522,17 +524,17 @@ gfxPlatformGtk::InitDPI()
     sDPI = gdk_screen_get_resolution(gdk_screen_get_default());
 
     if (sDPI <= 0.0) {
         // Fall back to something sane
         sDPI = 96.0;
     }
 }
 
-qcms_profile *
+cmsHPROFILE
 gfxPlatformGtk::GetPlatformCMSOutputProfile()
 {
 #ifdef MOZ_X11
     const char EDID1_ATOM_NAME[] = "XFree86_DDC_EDID1_RAWDATA";
     const char ICC_PROFILE_ATOM_NAME[] = "_ICC_PROFILE";
 
     Atom edidAtom, iccAtom;
     Display *dpy = GDK_DISPLAY();
@@ -552,20 +554,20 @@ gfxPlatformGtk::GetPlatformCMSOutputProf
                                           &retAtom, &retFormat, &retLength,
                                           &retAfter, &retProperty)) {
             XGetWindowProperty(dpy, root, iccAtom,
                                0, retLength,
                                False, AnyPropertyType,
                                &retAtom, &retFormat, &retLength,
                                &retAfter, &retProperty);
 
-            qcms_profile* profile = NULL;
+            cmsHPROFILE profile = NULL;
 
             if (retLength > 0)
-                profile = qcms_profile_from_memory(retProperty, retLength);
+                profile = cmsOpenProfileFromMem(retProperty, retLength);
 
             XFree(retProperty);
 
             if (profile) {
 #ifdef DEBUG_tor
                 fprintf(stderr,
                         "ICM profile read from %s successfully\n",
                         ICC_PROFILE_ATOM_NAME);
@@ -577,18 +579,18 @@ gfxPlatformGtk::GetPlatformCMSOutputProf
 
     edidAtom = XInternAtom(dpy, EDID1_ATOM_NAME, TRUE);
     if (edidAtom) {
         if (Success == XGetWindowProperty(dpy, root, edidAtom, 0, 32,
                                           False, AnyPropertyType,
                                           &retAtom, &retFormat, &retLength,
                                           &retAfter, &retProperty)) {
             double gamma;
-            qcms_CIE_xyY whitePoint;
-            qcms_CIE_xyYTRIPLE primaries;
+            cmsCIExyY whitePoint;
+            cmsCIExyYTRIPLE primaries;
 
             if (retLength != 128) {
 #ifdef DEBUG_tor
                 fprintf(stderr, "Short EDID data\n");
 #endif
                 return nsnull;
             }
 
@@ -596,48 +598,57 @@ gfxPlatformGtk::GetPlatformCMSOutputProf
 
             gamma = (100 + retProperty[0x17]) / 100.0;
             whitePoint.x = ((retProperty[0x21] << 2) |
                             (retProperty[0x1a] >> 2 & 3)) / 1024.0;
             whitePoint.y = ((retProperty[0x22] << 2) |
                             (retProperty[0x1a] >> 0 & 3)) / 1024.0;
             whitePoint.Y = 1.0;
 
-            primaries.red.x = ((retProperty[0x1b] << 2) |
+            primaries.Red.x = ((retProperty[0x1b] << 2) |
                                (retProperty[0x19] >> 6 & 3)) / 1024.0;
-            primaries.red.y = ((retProperty[0x1c] << 2) |
+            primaries.Red.y = ((retProperty[0x1c] << 2) |
                                (retProperty[0x19] >> 4 & 3)) / 1024.0;
-            primaries.red.Y = 1.0;
+            primaries.Red.Y = 1.0;
 
-            primaries.green.x = ((retProperty[0x1d] << 2) |
+            primaries.Green.x = ((retProperty[0x1d] << 2) |
                                  (retProperty[0x19] >> 2 & 3)) / 1024.0;
-            primaries.green.y = ((retProperty[0x1e] << 2) |
+            primaries.Green.y = ((retProperty[0x1e] << 2) |
                                  (retProperty[0x19] >> 0 & 3)) / 1024.0;
-            primaries.green.Y = 1.0;
+            primaries.Green.Y = 1.0;
 
-            primaries.blue.x = ((retProperty[0x1f] << 2) |
+            primaries.Blue.x = ((retProperty[0x1f] << 2) |
                                (retProperty[0x1a] >> 6 & 3)) / 1024.0;
-            primaries.blue.y = ((retProperty[0x20] << 2) |
+            primaries.Blue.y = ((retProperty[0x20] << 2) |
                                (retProperty[0x1a] >> 4 & 3)) / 1024.0;
-            primaries.blue.Y = 1.0;
+            primaries.Blue.Y = 1.0;
 
             XFree(retProperty);
 
 #ifdef DEBUG_tor
             fprintf(stderr, "EDID gamma: %f\n", gamma);
             fprintf(stderr, "EDID whitepoint: %f %f %f\n",
                     whitePoint.x, whitePoint.y, whitePoint.Y);
             fprintf(stderr, "EDID primaries: [%f %f %f] [%f %f %f] [%f %f %f]\n",
                     primaries.Red.x, primaries.Red.y, primaries.Red.Y,
                     primaries.Green.x, primaries.Green.y, primaries.Green.Y,
                     primaries.Blue.x, primaries.Blue.y, primaries.Blue.Y);
 #endif
 
-            qcms_profile* profile =
-                qcms_profile_create_rgb_with_gamma(whitePoint, primaries, gamma);
+            LPGAMMATABLE gammaTable[3];
+            gammaTable[0] = gammaTable[1] = gammaTable[2] =
+                cmsBuildGamma(256, gamma);
+
+            if (!gammaTable[0])
+                return nsnull;
+
+            cmsHPROFILE profile =
+                cmsCreateRGBProfile(&whitePoint, &primaries, gammaTable);
+
+            cmsFreeGamma(gammaTable[0]);
 
 #ifdef DEBUG_tor
             if (profile) {
                 fprintf(stderr,
                         "ICM profile read from %s successfully\n",
                         EDID1_ATOM_NAME);
             }
 #endif
--- a/gfx/thebes/src/gfxPlatformMac.cpp
+++ b/gfx/thebes/src/gfxPlatformMac.cpp
@@ -53,17 +53,17 @@
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
 #include "nsIPrefLocalizedString.h"
 #include "nsServiceManagerUtils.h"
 #include "nsCRT.h"
 #include "nsTArray.h"
 #include "nsUnicodeRange.h"
 
-#include "qcms.h"
+#include "lcms.h"
 
 gfxPlatformMac::gfxPlatformMac()
 {
     mOSXVersion = 0;
     mFontAntiAliasingThreshold = ReadAntiAliasingThreshold();
 
 #ifndef __LP64__
     // On 64-bit, we only have CoreText, no ATSUI;
@@ -377,46 +377,46 @@ gfxPlatformMac::ReadAntiAliasingThreshol
             threshold = 0;
         }
         CFRelease(prefValue);
     }
 
     return threshold;
 }
 
-qcms_profile *
+cmsHPROFILE
 gfxPlatformMac::GetPlatformCMSOutputProfile()
 {
     CMProfileLocation device;
     CMError err = CMGetDeviceProfile(cmDisplayDeviceClass,
                                      cmDefaultDeviceID,
                                      cmDefaultProfileID,
                                      &device);
     if (err != noErr)
         return nsnull;
 
-    qcms_profile *profile = nsnull;
+    cmsHPROFILE profile = nsnull;
     switch (device.locType) {
     case cmFileBasedProfile: {
         FSRef fsRef;
         if (!FSpMakeFSRef(&device.u.fileLoc.spec, &fsRef)) {
             char path[512];
             if (!FSRefMakePath(&fsRef, (UInt8*)(path), sizeof(path))) {
-                profile = qcms_profile_from_path(path);
+                profile = cmsOpenProfileFromFile(path, "r");
 #ifdef DEBUG_tor
                 if (profile)
                     fprintf(stderr,
                             "ICM profile read from %s fileLoc successfully\n", path);
 #endif
             }
         }
         break;
     }
     case cmPathBasedProfile:
-        profile = qcms_profile_from_path(device.u.pathLoc.path);
+        profile = cmsOpenProfileFromFile(device.u.pathLoc.path, "r");
 #ifdef DEBUG_tor
         if (profile)
             fprintf(stderr,
                     "ICM profile read from %s pathLoc successfully\n",
                     device.u.pathLoc.path);
 #endif
         break;
     default:
--- a/gfx/thebes/src/gfxQtPlatform.cpp
+++ b/gfx/thebes/src/gfxQtPlatform.cpp
@@ -54,17 +54,17 @@
 
 #include "nsUnicharUtils.h"
 
 #include <fontconfig/fontconfig.h>
 
 #include "nsMathUtils.h"
 #include "nsTArray.h"
 
-#include "qcms.h"
+#include "lcms.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
 PRInt32 gfxQtPlatform::sDPI = -1;
 gfxFontconfigUtils *gfxQtPlatform::sFontconfigUtils = nsnull;
 static cairo_user_data_key_t cairo_qt_pixmap_key;
 static void do_qt_pixmap_unref (void *data)
@@ -349,17 +349,17 @@ void
 gfxQtPlatform::InitDPI()
 {
     if (sDPI <= 0) {
         // Fall back to something sane
         sDPI = 96;
     }
 }
 
-qcms_profile*
+cmsHPROFILE
 gfxQtPlatform::GetPlatformCMSOutputProfile()
 {
     return nsnull;
 }
 
 
 FT_Library
 gfxQtPlatform::GetFTLibrary()
--- a/gfx/thebes/src/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/src/gfxWindowsPlatform.cpp
@@ -65,16 +65,18 @@
 #ifdef WINCE
 #include <shlwapi.h>
 #endif
 
 #include "gfxUserFontSet.h"
 
 #include <string>
 
+#include "lcms.h"
+
 #ifdef MOZ_FT2_FONTS
 static FT_Library gPlatformFTLibrary = NULL;
 #endif
 
 // font info loader constants
 static const PRUint32 kDelayBeforeLoadingCmaps = 8 * 1000; // 8secs
 static const PRUint32 kIntervalBetweenLoadingCmaps = 150; // 150ms
 static const PRUint32 kNumFontsPerSlice = 10; // read in info 10 fonts at a time
@@ -822,29 +824,29 @@ gfxWindowsPlatform::FindFontEntry(const 
 {
     nsRefPtr<FontFamily> ff = FindFontFamily(aName);
     if (!ff)
         return nsnull;
 
     return ff->FindFontEntry(aFontStyle);
 }
 
-qcms_profile*
+cmsHPROFILE
 gfxWindowsPlatform::GetPlatformCMSOutputProfile()
 {
 #ifndef MOZ_FT2_FONTS
     WCHAR str[1024+1];
     DWORD size = 1024;
 
     HDC dc = GetDC(nsnull);
     GetICMProfileW(dc, &size, (LPWSTR)&str);
     ReleaseDC(nsnull, dc);
 
-    qcms_profile* profile =
-        qcms_profile_from_path(NS_ConvertUTF16toUTF8(str).get());
+    cmsHPROFILE profile =
+        cmsOpenProfileFromFile(NS_ConvertUTF16toUTF8(str).get(), "r");
 #ifdef DEBUG_tor
     if (profile)
         fprintf(stderr,
                 "ICM profile read from %s successfully\n",
                 NS_ConvertUTF16toUTF8(str).get());
 #endif
     return profile;
 #else
--- a/gfx/thebes/test/Makefile.in
+++ b/gfx/thebes/test/Makefile.in
@@ -46,30 +46,30 @@ MOZILLA_INTERNAL_API = 1
 include $(DEPTH)/config/autoconf.mk
 
 REQUIRES = \
 	xpcom \
 	string \
 	thebes \
 	cairo \
 	pref \
+	lcms \
 	necko \
 	unicharutil \
 	nspr \
-	qcms \
 	$(NULL)
 
 # All platforms
 CPPSRCS = \
 	gfxSurfaceRefCountTest.cpp \
 	gfxFontSelectionTest.cpp \
 	gfxTextRunPerfTest.cpp \
 	gfxWordCacheTest.cpp \
+	gfxColorManagementTest.cpp \
 	$(NULL)
-#	gfxColorManagementTest.cpp \
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CMMSRCS = gfxTestCocoaHelper.mm
 HELPER_OBJS = gfxTestCocoaHelper.$(OBJ_SUFFIX)
 EXTRA_DEPS += gfxTestCocoaHelper.$(OBJ_SUFFIX)
 endif
 
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
@@ -81,16 +81,17 @@ EXTRA_LDOPS += $(TK_LIBS)
 LIBS =  $(HELPER_OBJS) \
 	$(call EXPAND_LIBNAME_PATH,thebes,../src) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(LIBS_DIR) \
 	$(XPCOM_LIBS) \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \
 	$(ZLIB_LIBS) \
+	$(LCMS_LIBS) \
 	$(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 _OS_LIBS += usp10
 OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -73,17 +73,16 @@ REQUIRES	= xpcom \
 		  imglib2 \
 		  unicharutil \
 		  htmlparser \
 		  util \
 		  windowwatcher \
 		  shistory \
 		  caps \
 		  thebes \
-		  qcms \
 		  $(NULL)
 
 ifdef ACCESSIBILITY
 REQUIRES	+= accessibility
 endif
 
 XPIDLSRCS	= \
 		nsIStyleSheetService.idl	\
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@@ -59,17 +59,16 @@ REQUIRES	= xpcom \
 		  webshell \
 		  locale \
 		  unicharutil \
 		  necko \
 		  docshell \
 		  webbrwsr \
 		  pref \
 		  js \
-		  qcms \
 		  $(NULL)
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../style \
 	-I$(srcdir)/../base \
 	-I$(srcdir)/../generic \
 	-I$(srcdir)/../tables \
 	-I$(srcdir)/content/src \
--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/base/src/Makefile.in
@@ -58,17 +58,16 @@ REQUIRES	= xpcom \
 		  necko \
 		  unicharutil \
 		  webshell \
 		  imglib2 \
 		  js \
 		  xpconnect \
 		  docshell \
 		  thebes \
-		  qcms \
 		  $(NULL)
 
 CPPSRCS		= \
 		nsSVGAFrame.cpp \
 		nsSVGClipPathFrame.cpp \
 		nsSVGContainerFrame.cpp \
 		nsSVGEffects.cpp \
 		nsSVGFilterFrame.cpp \
--- a/modules/libpr0n/build/Makefile.in
+++ b/modules/libpr0n/build/Makefile.in
@@ -55,17 +55,17 @@ REQUIRES	= xpcom \
 		  thebes \
 		  necko \
 		  nkcache \
 		  gfx \
 		  caps \
 		  $(JPEG_REQUIRES) \
 		  $(PNG_REQUIRES) \
 		  $(ZLIB_REQUIRES) \
-		  qcms \
+		  $(LCMS_REQUIRES) \
 		  $(NULL)
 
 CPPSRCS = \
 		nsImageModule.cpp \
 		$(NULL)
 
 LOCAL_INCLUDES	= \
 		-I. \
@@ -88,17 +88,17 @@ EXTRA_DSO_LIBS	= \
 		gkgfx \
 		thebes \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
 		$(JPEG_LIBS) \
 		$(PNG_LIBS) $(ZLIB_LIBS) \
-		$(QCMS_LIBS) \
+		$(LCMS_LIBS) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 # Force a rebuild of nsImageModule when either of MOZ_IMG_{DE,EN}CODERS changes
 
 GARBAGE += _img_list nsImgBuildDefines.h
 
--- a/modules/libpr0n/decoders/gif/Makefile.in
+++ b/modules/libpr0n/decoders/gif/Makefile.in
@@ -48,17 +48,17 @@ FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsGIFModule2
 LIBXUL_LIBRARY = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
 		  thebes \
 		  imglib2 \
-		  qcms \
+		  $(LCMS_REQUIRES) \
 		  $(NULL)
 
 CPPSRCS		= nsGIFDecoder2.cpp
 
 # nsGIFDecoder2.cpp includes imgContainer.h
 LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src
 
 include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
+++ b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
@@ -81,17 +81,17 @@ mailing address.
 #include "nsIInputStream.h"
 #include "nsIComponentManager.h"
 #include "imgIContainerObserver.h"
 
 #include "imgILoad.h"
 
 #include "gfxColor.h"
 #include "gfxPlatform.h"
-#include "qcms.h"
+#include "lcms.h"
 
 /*
  * GETN(n, s) requests at least 'n' bytes available from 'q', at start of state 's'
  *
  * Note, the hold will never need to be bigger than 256 bytes to gather up in the hold,
  * as each GIF block (except colormaps) can never be bigger than 256 bytes.
  * Colormaps are directly copied in the resp. global_colormap or the local_colormap of the PAL image frame
  * So a fixed buffer in gif_struct is good enough.
@@ -676,19 +676,19 @@ nsGIFDecoder2::DoLzw(const PRUint8 *q)
 /** 
  * Expand the colormap from RGB to Packed ARGB as needed by Cairo.
  * And apply any LCMS transformation.
  */
 static void ConvertColormap(PRUint32 *aColormap, PRUint32 aColors)
 {
   // Apply CMS transformation if enabled and available
   if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
-    qcms_transform *transform = gfxPlatform::GetCMSRGBTransform();
+    cmsHTRANSFORM transform = gfxPlatform::GetCMSRGBTransform();
     if (transform)
-      qcms_transform_data(transform, aColormap, aColormap, aColors);
+      cmsDoTransform(transform, aColormap, aColormap, aColors);
   }
   // Convert from the GIF's RGB format to the Cairo format.
   // Work from end to begin, because of the in-place expansion
   PRUint8 *from = ((PRUint8 *)aColormap) + 3 * aColors;
   PRUint32 *to = aColormap + aColors;
 
   // Convert color entries to Cairo format
 
--- a/modules/libpr0n/decoders/jpeg/Makefile.in
+++ b/modules/libpr0n/decoders/jpeg/Makefile.in
@@ -49,17 +49,17 @@ MODULE_NAME	= nsJPEGDecoderModule
 LIBXUL_LIBRARY  = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
 		  thebes \
 		  imglib2 \
 		  $(JPEG_REQUIRES) \
-		  qcms \
+		  $(LCMS_REQUIRES) \
 		  $(NULL)
 
 CPPSRCS		= nsJPEGDecoder.cpp
 
 CSRCS		= iccjpeg.c
 
 include $(topsrcdir)/config/rules.mk
 
--- a/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
+++ b/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
@@ -120,19 +120,19 @@ nsJPEGDecoder::nsJPEGDecoder()
          ("nsJPEGDecoder::nsJPEGDecoder: Creating JPEG decoder %p",
           this));
 }
 
 nsJPEGDecoder::~nsJPEGDecoder()
 {
   PR_FREEIF(mBackBuffer);
   if (mTransform)
-    qcms_transform_release(mTransform);
+    cmsDeleteTransform(mTransform);
   if (mInProfile)
-    qcms_profile_release(mInProfile);
+    cmsCloseProfile(mInProfile);
 
   PR_LOG(gJPEGDecoderAccountingLog, PR_LOG_DEBUG,
          ("nsJPEGDecoder::~nsJPEGDecoder: Destroying JPEG decoder %p",
           this));
 }
 
 
 /** imgIDecoder methods **/
@@ -333,20 +333,20 @@ nsresult nsJPEGDecoder::ProcessData(cons
     }
 
     JOCTET  *profile;
     PRUint32 profileLength;
     eCMSMode cmsMode = gfxPlatform::GetCMSMode();
 
     if ((cmsMode != eCMSMode_Off) &&
         read_icc_profile(&mInfo, &profile, &profileLength) &&
-        (mInProfile = qcms_profile_from_memory(profile, profileLength)) != NULL) {
+        (mInProfile = cmsOpenProfileFromMem(profile, profileLength)) != NULL) {
       free(profile);
 
-      PRUint32 profileSpace = qcms_profile_get_color_space(mInProfile);
+      PRUint32 profileSpace = cmsGetColorSpace(mInProfile);
       PRBool mismatch = PR_FALSE;
 
 #ifdef DEBUG_tor
       fprintf(stderr, "JPEG profileSpace: 0x%08X\n", profileSpace);
 #endif
       switch (mInfo.jpeg_color_space) {
       case JCS_GRAYSCALE:
         if (profileSpace == icSigRgbData)
@@ -356,69 +356,74 @@ nsresult nsJPEGDecoder::ProcessData(cons
         break;
       case JCS_RGB:
         if (profileSpace != icSigRgbData)
           mismatch =  PR_TRUE;
         break;
       case JCS_YCbCr:
         if (profileSpace == icSigRgbData)
           mInfo.out_color_space = JCS_RGB;
-        else
-	  // qcms doesn't support ycbcr
+        else if (profileSpace != icSigYCbCrData)
           mismatch = PR_TRUE;
         break;
       case JCS_CMYK:
       case JCS_YCCK:
-	  // qcms doesn't support cmyk
+        if (profileSpace == icSigCmykData)
+          mInfo.out_color_space = JCS_CMYK;
+        else
           mismatch = PR_TRUE;
         break;
       default:
         mState = JPEG_ERROR;
         PR_LOG(gJPEGDecoderAccountingLog, PR_LOG_DEBUG,
                ("} (unknown colorpsace (1))"));
         return NS_ERROR_UNEXPECTED;
       }
 
       if (!mismatch) {
-        qcms_data_type type;
+        PRUint32 type;
         switch (mInfo.out_color_space) {
         case JCS_GRAYSCALE:
-          type = QCMS_DATA_GRAY_8;
+          type = COLORSPACE_SH(PT_GRAY)  | CHANNELS_SH(1) | BYTES_SH(1);
           break;
         case JCS_RGB:
-          type = QCMS_DATA_RGB_8;
+          type = COLORSPACE_SH(PT_RGB)   | CHANNELS_SH(3) | BYTES_SH(1);
+          break;
+        case JCS_YCbCr:
+          type = COLORSPACE_SH(PT_YCbCr) | CHANNELS_SH(3) | BYTES_SH(1);
+          break;
+        case JCS_CMYK:
+          type = COLORSPACE_SH(PT_CMYK)  | CHANNELS_SH(4) | BYTES_SH(1);
           break;
         default:
           mState = JPEG_ERROR;
           PR_LOG(gJPEGDecoderAccountingLog, PR_LOG_DEBUG,
                  ("} (unknown colorpsace (2))"));
           return NS_ERROR_UNEXPECTED;
         }
-#if 0
-	We don't currently support CMYK profiles. The following
-	code dealt with lcms types. Add something like this
-	back when we gain support for CMYK.
+
         /* Adobe Photoshop writes YCCK/CMYK files with inverted data */
         if (mInfo.out_color_space == JCS_CMYK)
           type |= FLAVOR_SH(mInfo.saw_Adobe_marker ? 1 : 0);
-#endif
+        
 
         if (gfxPlatform::GetCMSOutputProfile()) {
 
           /* Calculate rendering intent. */
           int intent = gfxPlatform::GetRenderingIntent();
           if (intent == -1)
-              intent = qcms_profile_get_rendering_intent(mInProfile);
+              intent = cmsTakeRenderingIntent(mInProfile);
 
           /* Create the color management transform. */
-          mTransform = qcms_transform_create(mInProfile,
+          mTransform = cmsCreateTransform(mInProfile,
                                           type,
                                           gfxPlatform::GetCMSOutputProfile(),
-                                          QCMS_DATA_RGB_8,
-                                          (qcms_intent)intent);
+                                          TYPE_RGB_8,
+                                          intent,
+                                          cmsFLAGS_FLOATSHAPER);
         }
       } else {
 #ifdef DEBUG_tor
         fprintf(stderr, "ICM profile colorspace mismatch\n");
 #endif
       }
     }
 
@@ -736,17 +741,17 @@ nsJPEGDecoder::OutputScanlines(PRBool* s
 
       if (mTransform) {
         JSAMPROW source = sampleRow;
         if (mInfo.out_color_space == JCS_GRAYSCALE) {
           /* Convert from the 1byte grey pixels at begin of row 
              to the 3byte RGB byte pixels at 'end' of row */
           sampleRow += mInfo.output_width;
         }
-        qcms_transform_data(mTransform, source, sampleRow, mInfo.output_width);
+        cmsDoTransform(mTransform, source, sampleRow, mInfo.output_width);
         /* Move 3byte RGB data to end of row */
         if (mInfo.out_color_space == JCS_CMYK) {
           memmove(sampleRow + mInfo.output_width,
                   sampleRow,
                   3 * mInfo.output_width);
           sampleRow += mInfo.output_width;
         }
       } else {
@@ -754,19 +759,19 @@ nsJPEGDecoder::OutputScanlines(PRBool* s
           /* Convert from CMYK to RGB */
           /* We cannot convert directly to Cairo, as the CMSRGBTransform may wants to do a RGB transform... */
           /* Would be better to have platform CMSenabled transformation from CMYK to (A)RGB... */
           cmyk_convert_rgb((JSAMPROW)imageRow, mInfo.output_width);
           sampleRow += mInfo.output_width;
         }
         if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
           /* No embedded ICC profile - treat as sRGB */
-          qcms_transform *transform = gfxPlatform::GetCMSRGBTransform();
+          cmsHTRANSFORM transform = gfxPlatform::GetCMSRGBTransform();
           if (transform) {
-            qcms_transform_data(transform, sampleRow, sampleRow, mInfo.output_width);
+            cmsDoTransform(transform, sampleRow, sampleRow, mInfo.output_width);
           }
         }
       }
 
       // counter for while() loops below
       PRUint32 idx = mInfo.output_width;
 
       // copy as bytes until source pointer is 32-bit-aligned
--- a/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h
+++ b/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h
@@ -45,17 +45,17 @@
 #include "nsCOMPtr.h"
 
 #include "imgIContainer.h"
 #include "gfxIImageFrame.h"
 #include "imgIDecoderObserver.h"
 #include "imgILoad.h"
 #include "nsIInputStream.h"
 #include "nsIPipe.h"
-#include "qcms.h"
+#include "lcms.h"
 
 extern "C" {
 #include "jpeglib.h"
 }
 
 #include <setjmp.h>
 
 #define NS_JPEGDECODER_CID \
@@ -117,15 +117,15 @@ public:
   JOCTET *mBackBuffer;
   PRUint32 mBackBufferLen; // Offset of end of active backtrack data
   PRUint32 mBackBufferSize; // size in bytes what mBackBuffer was created with
   PRUint32 mBackBufferUnreadLen; // amount of data currently in mBackBuffer
 
   JOCTET  *mProfile;
   PRUint32 mProfileLength;
 
-  qcms_profile *mInProfile;
-  qcms_transform *mTransform;
+  cmsHPROFILE mInProfile;
+  cmsHTRANSFORM mTransform;
 
   PRPackedBool mReading;
 };
 
 #endif // nsJPEGDecoder_h__
--- a/modules/libpr0n/decoders/png/Makefile.in
+++ b/modules/libpr0n/decoders/png/Makefile.in
@@ -52,17 +52,17 @@ EXTRA_DSO_LIBS	= gkgfx
 
 REQUIRES = xpcom \
            string \
            gfx \
            thebes \
            imglib2 \
            $(PNG_REQUIRES) \
            $(ZLIB_REQUIRES) \
-           qcms \
+           $(LCMS_REQUIRES) \
            $(NULL)
 
 CPPSRCS		= nsPNGDecoder.cpp
 
 ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))
 DEFINES		+= -DMOZ_PNG_WRITE
 endif
 
--- a/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
+++ b/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
@@ -84,21 +84,21 @@ nsPNGDecoder::nsPNGDecoder() :
 
 nsPNGDecoder::~nsPNGDecoder()
 {
   if (mCMSLine)
     nsMemory::Free(mCMSLine);
   if (interlacebuf)
     nsMemory::Free(interlacebuf);
   if (mInProfile) {
-    qcms_profile_release(mInProfile);
+    cmsCloseProfile(mInProfile);
 
     /* mTransform belongs to us only if mInProfile is non-null */
     if (mTransform)
-      qcms_transform_release(mTransform);
+      cmsDeleteTransform(mTransform);
   }
 }
 
 // CreateFrame() is used for both simple and animated images
 void nsPNGDecoder::CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset, 
                                 PRInt32 width, PRInt32 height, gfx_format format)
 {
   mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
@@ -392,108 +392,115 @@ PNGDoGammaCorrection(png_structp png_ptr
     png_set_gamma(png_ptr, 2.2, aGamma);
   }
   else
     png_set_gamma(png_ptr, 2.2, 0.45455);
 
 }
 
 // Adapted from http://www.littlecms.com/pngchrm.c example code
-static qcms_profile *
+static cmsHPROFILE
 PNGGetColorProfile(png_structp png_ptr, png_infop info_ptr,
-                   int color_type, qcms_data_type *inType, PRUint32 *intent)
+                   int color_type, PRUint32 *inType, PRUint32 *intent)
 {
-  qcms_profile *profile = nsnull;
-  *intent = QCMS_INTENT_PERCEPTUAL; // Our default
+  cmsHPROFILE profile = nsnull;
+  *intent = INTENT_PERCEPTUAL; // Our default
 
   // First try to see if iCCP chunk is present
   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
     png_uint_32 profileLen;
     char *profileData, *profileName;
     int compression;
 
     png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
                  &profileData, &profileLen);
 
-    profile = qcms_profile_from_memory(profileData, profileLen);
-    if (profile) {
-      PRUint32 profileSpace = qcms_profile_get_color_space(profile);
+    profile = cmsOpenProfileFromMem(profileData, profileLen);
+    PRUint32 profileSpace = cmsGetColorSpace(profile);
 
-      PRBool mismatch = PR_FALSE;
-      if (color_type & PNG_COLOR_MASK_COLOR) {
-        if (profileSpace != icSigRgbData)
-          mismatch = PR_TRUE;
-      } else {
-        if (profileSpace == icSigRgbData)
-          png_set_gray_to_rgb(png_ptr);
-        else if (profileSpace != icSigGrayData)
-          mismatch = PR_TRUE;
-      }
+    PRBool mismatch = PR_FALSE;
+    if (color_type & PNG_COLOR_MASK_COLOR) {
+      if (profileSpace != icSigRgbData)
+        mismatch = PR_TRUE;
+    } else {
+      if (profileSpace == icSigRgbData)
+        png_set_gray_to_rgb(png_ptr);
+      else if (profileSpace != icSigGrayData)
+        mismatch = PR_TRUE;
+    }
 
-      if (mismatch) {
-        qcms_profile_release(profile);
-        profile = nsnull;
-      } else {
-        *intent = qcms_profile_get_rendering_intent(profile);
-      }
+    if (mismatch) {
+      cmsCloseProfile(profile);
+      profile = nsnull;
+    } else {
+      *intent = cmsTakeRenderingIntent(profile);
     }
   }
 
   // Check sRGB chunk
   if (!profile && png_get_valid(png_ptr, info_ptr, PNG_INFO_sRGB)) {
-    profile = qcms_profile_sRGB();
+    profile = cmsCreate_sRGBProfile();
 
     if (profile) {
       int fileIntent;
       png_set_gray_to_rgb(png_ptr); 
       png_get_sRGB(png_ptr, info_ptr, &fileIntent);
-      PRUint32 map[] = { QCMS_INTENT_PERCEPTUAL, QCMS_INTENT_RELATIVE_COLORIMETRIC,
-                         QCMS_INTENT_SATURATION, QCMS_INTENT_ABSOLUTE_COLORIMETRIC };
+      PRUint32 map[] = { INTENT_PERCEPTUAL, INTENT_RELATIVE_COLORIMETRIC,
+                         INTENT_SATURATION, INTENT_ABSOLUTE_COLORIMETRIC };
       *intent = map[fileIntent];
     }
   }
 
   // Check gAMA/cHRM chunks
   if (!profile && 
        png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA) &&
        png_get_valid(png_ptr, info_ptr, PNG_INFO_cHRM)) {
-    qcms_CIE_xyYTRIPLE primaries;
-    qcms_CIE_xyY whitePoint;
+    cmsCIExyYTRIPLE primaries;
+    cmsCIExyY whitePoint;
 
     png_get_cHRM(png_ptr, info_ptr,
                  &whitePoint.x, &whitePoint.y,
-                 &primaries.red.x,   &primaries.red.y,
-                 &primaries.green.x, &primaries.green.y,
-                 &primaries.blue.x,  &primaries.blue.y);
+                 &primaries.Red.x,   &primaries.Red.y,
+                 &primaries.Green.x, &primaries.Green.y,
+                 &primaries.Blue.x,  &primaries.Blue.y);
     whitePoint.Y =
-      primaries.red.Y = primaries.green.Y = primaries.blue.Y = 1.0;
+      primaries.Red.Y = primaries.Green.Y = primaries.Blue.Y = 1.0;
 
     double gammaOfFile;
+    LPGAMMATABLE gammaTable[3];
 
     png_get_gAMA(png_ptr, info_ptr, &gammaOfFile);
 
-    profile = qcms_profile_create_rgb_with_gamma(whitePoint, primaries, 1/gammaOfFile);
+    gammaTable[0] = gammaTable[1] = gammaTable[2] =
+      cmsBuildGamma(256, 1/gammaOfFile);
+
+    if (!gammaTable[0])
+      return nsnull;
+
+    profile = cmsCreateRGBProfile(&whitePoint, &primaries, gammaTable);
 
     if (profile)
       png_set_gray_to_rgb(png_ptr);
+
+    cmsFreeGamma(gammaTable[0]);
   }
 
   if (profile) {
-    PRUint32 profileSpace = qcms_profile_get_color_space(profile);
+    PRUint32 profileSpace = cmsGetColorSpace(profile);
     if (profileSpace == icSigGrayData) {
       if (color_type & PNG_COLOR_MASK_ALPHA)
-        *inType = QCMS_DATA_GRAYA_8;
+        *inType = TYPE_GRAYA_8;
       else
-        *inType = QCMS_DATA_GRAY_8;
+        *inType = TYPE_GRAY_8;
     } else {
       if (color_type & PNG_COLOR_MASK_ALPHA ||
           png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
-        *inType = QCMS_DATA_RGBA_8;
+        *inType = TYPE_RGBA_8;
       else
-        *inType = QCMS_DATA_RGB_8;
+        *inType = TYPE_RGB_8;
     }
   }
 
   return profile;
 }
 
 void
 info_callback(png_structp png_ptr, png_infop info_ptr)
@@ -544,40 +551,45 @@ info_callback(png_structp png_ptr, png_i
        }
     else
        png_set_expand(png_ptr);
   }
 
   if (bit_depth == 16)
     png_set_strip_16(png_ptr);
 
-  qcms_data_type inType;
-  PRUint32 intent, pIntent;
+  PRUint32 inType, intent, pIntent;
   if (gfxPlatform::GetCMSMode() != eCMSMode_Off) {
     intent = gfxPlatform::GetRenderingIntent();
     decoder->mInProfile = PNGGetColorProfile(png_ptr, info_ptr,
                                              color_type, &inType, &pIntent);
     /* If we're not mandating an intent, use the one from the image. */
     if (intent == -1)
       intent = pIntent;
   }
   if (decoder->mInProfile && gfxPlatform::GetCMSOutputProfile()) {
-    qcms_data_type outType;
+    PRUint32 outType;
     PRUint32 dwFlags = 0;
 
     if (color_type & PNG_COLOR_MASK_ALPHA || num_trans)
-      outType = QCMS_DATA_RGBA_8;
+      outType = TYPE_RGBA_8;
     else
-      outType = QCMS_DATA_RGB_8;
+      outType = TYPE_RGB_8;
 
-    decoder->mTransform = qcms_transform_create(decoder->mInProfile,
+    /* Determine if we can use the optimized floating point path. */
+    if ((inType == outType) && 
+        ((inType == TYPE_RGB_8) || (inType == TYPE_RGBA_8)))
+      dwFlags |= cmsFLAGS_FLOATSHAPER;
+
+    decoder->mTransform = cmsCreateTransform(decoder->mInProfile,
                                              inType,
                                              gfxPlatform::GetCMSOutputProfile(),
                                              outType,
-                                             (qcms_intent)intent);
+                                             intent,
+                                             dwFlags);
   } else {
     png_set_gray_to_rgb(png_ptr);
     PNGDoGammaCorrection(png_ptr, info_ptr);
 
     if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
       if (color_type & PNG_COLOR_MASK_ALPHA || num_trans)
         decoder->mTransform = gfxPlatform::GetCMSRGBATransform();
       else
@@ -732,26 +744,26 @@ row_callback(png_structp png_ptr, png_by
     PRUint8 *imageData;
     PRUint32 imageDataLength, bpr = width * sizeof(PRUint32);
     decoder->mFrame->GetImageData(&imageData, &imageDataLength);
     PRUint32 *cptr32 = (PRUint32*)(imageData + (row_num*bpr));
     PRBool rowHasNoAlpha = PR_TRUE;
 
     if (decoder->mTransform) {
       if (decoder->mCMSLine) {
-        qcms_transform_data(decoder->mTransform, line, decoder->mCMSLine, iwidth);
+        cmsDoTransform(decoder->mTransform, line, decoder->mCMSLine, iwidth);
         /* copy alpha over */
         PRUint32 channels = decoder->mChannels;
         if (channels == 2 || channels == 4) {
           for (PRUint32 i = 0; i < iwidth; i++)
             decoder->mCMSLine[4 * i + 3] = line[channels * i + channels - 1];
         }
         line = decoder->mCMSLine;
       } else {
-        qcms_transform_data(decoder->mTransform, line, line, iwidth);
+        cmsDoTransform(decoder->mTransform, line, line, iwidth);
        }
      }
 
     switch (decoder->format) {
     case gfxIFormats::RGB:
       {
         // counter for while() loops below
         PRUint32 idx = iwidth;
--- a/modules/libpr0n/decoders/png/nsPNGDecoder.h
+++ b/modules/libpr0n/decoders/png/nsPNGDecoder.h
@@ -47,17 +47,17 @@
 #include "gfxIImageFrame.h"
 #include "imgILoad.h"
 
 
 #include "nsCOMPtr.h"
 
 #include "png.h"
 
-#include "qcms.h"
+#include "lcms.h"
 
 #define NS_PNGDECODER_CID \
 { /* 36fa00c2-1dd2-11b2-be07-d16eeb4c50ed */         \
      0x36fa00c2,                                     \
      0x1dd2,                                         \
      0x11b2,                                         \
     {0xbe, 0x07, 0xd1, 0x6e, 0xeb, 0x4c, 0x50, 0xed} \
 }
@@ -82,18 +82,18 @@ public:
   nsCOMPtr<gfxIImageFrame> mFrame;
   nsCOMPtr<imgILoad> mImageLoad;
   nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
 
   png_structp mPNG;
   png_infop mInfo;
   PRUint8 *mCMSLine;
   PRUint8 *interlacebuf;
-  qcms_profile *mInProfile;
-  qcms_transform *mTransform;
+  cmsHPROFILE mInProfile;
+  cmsHTRANSFORM mTransform;
 
   gfx_format format;
   PRUint8 mChannels;
   PRPackedBool mError;
   PRPackedBool mFrameHasNoAlpha;
   PRPackedBool mFrameIsHidden;
 };
 
--- a/modules/libpr0n/test/reftest/pngsuite-ancillary/ccwn2c08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-ancillary/ccwn2c08.html
@@ -1,9 +1,13 @@
-<html><body>
+<html>
+<head>
+<script src="lcms-asm-check.js" type="application/ecmascript"></script>
+</head>
+<body>
 <table cellpadding='0' cellspacing='0' width='32' height='32'>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -73,20 +77,20 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(226,255,236,1)'></td>
-  <td width='1' style='background-color: rgba(161,255,196,1)'></td>
-  <td width='1' style='background-color: rgba(120,255,171,1)'></td>
+  <td width='1' style='background-color: rgba(161,254,196,1)'></td>
+  <td width='1' style='background-color: rgba(120,255,170,1)'></td>
   <td width='1' style='background-color: rgba(161,255,186,1)'></td>
-  <td width='1' style='background-color: rgba(218,255,224,1)'></td>
+  <td width='1' style='background-color: rgba(218,255,223,1)'></td>
   <td width='1' style='background-color: rgba(254,255,254,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -106,23 +110,23 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(193,255,220,1)'></td>
-  <td width='1' style='background-color: rgba(45,255,165,1)'></td>
+  <td width='1' style='background-color: rgba(46,255,165,1)'></td>
   <td width='1' style='background-color: rgba(61,255,160,1)'></td>
   <td width='1' style='background-color: rgba(68,255,153,1)'></td>
-  <td width='1' style='background-color: rgba(63,255,138,1)'></td>
+  <td width='1' style='background-color: rgba(64,255,138,1)'></td>
   <td width='1' style='background-color: rgba(52,255,113,1)'></td>
   <td width='1' style='background-color: rgba(125,255,132,1)'></td>
-  <td width='1' style='background-color: rgba(232,255,227,1)'></td>
+  <td width='1' style='background-color: rgba(231,255,227,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -141,24 +145,24 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(193,255,223,1)'></td>
   <td width='1' style='background-color: rgba(49,255,174,1)'></td>
   <td width='1' style='background-color: rgba(75,255,173,1)'></td>
-  <td width='1' style='background-color: rgba(84,255,168,1)'></td>
+  <td width='1' style='background-color: rgba(85,255,168,1)'></td>
   <td width='1' style='background-color: rgba(91,255,162,1)'></td>
-  <td width='1' style='background-color: rgba(90,255,149,1)'></td>
+  <td width='1' style='background-color: rgba(90,255,148,1)'></td>
   <td width='1' style='background-color: rgba(81,255,126,1)'></td>
   <td width='1' style='background-color: rgba(86,255,93,1)'></td>
-  <td width='1' style='background-color: rgba(122,255,58,1)'></td>
+  <td width='1' style='background-color: rgba(122,255,59,1)'></td>
   <td width='1' style='background-color: rgba(210,255,190,1)'></td>
-  <td width='1' style='background-color: rgba(255,255,255,1)'></td>
+  <td width='1' style='background-color: rgba(255,255,254,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -171,25 +175,25 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(232,255,244,1)'></td>
-  <td width='1' style='background-color: rgba(52,255,183,1)'></td>
+  <td width='1' style='background-color: rgba(232,255,243,1)'></td>
+  <td width='1' style='background-color: rgba(52,255,182,1)'></td>
   <td width='1' style='background-color: rgba(75,255,181,1)'></td>
-  <td width='1' style='background-color: rgba(94,255,180,1)'></td>
+  <td width='1' style='background-color: rgba(95,255,180,1)'></td>
   <td width='1' style='background-color: rgba(105,255,176,1)'></td>
-  <td width='1' style='background-color: rgba(110,255,171,1)'></td>
+  <td width='1' style='background-color: rgba(110,255,170,1)'></td>
   <td width='1' style='background-color: rgba(109,255,159,1)'></td>
   <td width='1' style='background-color: rgba(103,255,137,1)'></td>
-  <td width='1' style='background-color: rgba(107,255,108,1)'></td>
+  <td width='1' style='background-color: rgba(108,255,108,1)'></td>
   <td width='1' style='background-color: rgba(135,255,73,1)'></td>
   <td width='1' style='background-color: rgba(153,255,46,1)'></td>
   <td width='1' style='background-color: rgba(201,255,155,1)'></td>
   <td width='1' style='background-color: rgba(252,255,250,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -207,28 +211,34 @@
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(142,255,208,1)'></td>
   <td width='1' style='background-color: rgba(73,255,188,1)'></td>
-  <td width='1' style='background-color: rgba(94,255,187,1)'></td>
+  <td width='1' style='background-color: rgba(95,255,187,1)'></td>
   <td width='1' style='background-color: rgba(110,255,187,1)'></td>
   <td width='1' style='background-color: rgba(120,255,184,1)'></td>
   <td width='1' style='background-color: rgba(127,255,179,1)'></td>
   <td width='1' style='background-color: rgba(126,255,168,1)'></td>
-  <td width='1' style='background-color: rgba(121,255,149,1)'></td>
+  <td width='1' style='background-color: rgba(121,255,148,1)'></td>
   <td width='1' style='background-color: rgba(127,255,120,1)'></td>
-  <td width='1' style='background-color: rgba(150,255,91,1)'></td>
+<script type="application/ecmascript">
+if (lcms_has_assembly) {
+  document.write("<td width='1' style='background-color: rgba(150,255,91,1)'></td>");
+} else {
+  document.write("<td width='1' style='background-color: rgba(150,255,92,1)'></td>");
+}
+</script>
   <td width='1' style='background-color: rgba(165,255,73,1)'></td>
-  <td width='1' style='background-color: rgba(176,255,52,1)'></td>
+  <td width='1' style='background-color: rgba(176,255,53,1)'></td>
   <td width='1' style='background-color: rgba(205,255,133,1)'></td>
-  <td width='1' style='background-color: rgba(253,255,249,1)'></td>
+  <td width='1' style='background-color: rgba(252,255,248,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -238,32 +248,32 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(218,255,239,1)'></td>
-  <td width='1' style='background-color: rgba(55,255,193,1)'></td>
+  <td width='1' style='background-color: rgba(218,255,238,1)'></td>
+  <td width='1' style='background-color: rgba(55,255,192,1)'></td>
   <td width='1' style='background-color: rgba(88,255,194,1)'></td>
   <td width='1' style='background-color: rgba(109,255,194,1)'></td>
-  <td width='1' style='background-color: rgba(123,255,193,1)'></td>
+  <td width='1' style='background-color: rgba(123,255,192,1)'></td>
   <td width='1' style='background-color: rgba(134,255,191,1)'></td>
   <td width='1' style='background-color: rgba(140,255,187,1)'></td>
   <td width='1' style='background-color: rgba(140,255,178,1)'></td>
-  <td width='1' style='background-color: rgba(136,255,160,1)'></td>
+  <td width='1' style='background-color: rgba(136,255,159,1)'></td>
   <td width='1' style='background-color: rgba(142,255,133,1)'></td>
   <td width='1' style='background-color: rgba(163,255,108,1)'></td>
   <td width='1' style='background-color: rgba(176,255,95,1)'></td>
-  <td width='1' style='background-color: rgba(187,255,77,1)'></td>
-  <td width='1' style='background-color: rgba(195,255,55,1)'></td>
+  <td width='1' style='background-color: rgba(186,255,77,1)'></td>
+  <td width='1' style='background-color: rgba(195,255,56,1)'></td>
   <td width='1' style='background-color: rgba(218,255,133,1)'></td>
-  <td width='1' style='background-color: rgba(254,255,249,1)'></td>
+  <td width='1' style='background-color: rgba(253,255,249,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -277,26 +287,26 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(127,255,210,1)'></td>
   <td width='1' style='background-color: rgba(75,255,198,1)'></td>
   <td width='1' style='background-color: rgba(102,255,199,1)'></td>
   <td width='1' style='background-color: rgba(121,255,199,1)'></td>
   <td width='1' style='background-color: rgba(135,255,199,1)'></td>
-  <td width='1' style='background-color: rgba(146,255,198,1)'></td>
+  <td width='1' style='background-color: rgba(146,255,197,1)'></td>
   <td width='1' style='background-color: rgba(152,255,194,1)'></td>
   <td width='1' style='background-color: rgba(154,255,186,1)'></td>
   <td width='1' style='background-color: rgba(150,255,169,1)'></td>
   <td width='1' style='background-color: rgba(156,255,145,1)'></td>
   <td width='1' style='background-color: rgba(175,255,124,1)'></td>
   <td width='1' style='background-color: rgba(187,255,112,1)'></td>
-  <td width='1' style='background-color: rgba(196,255,98,1)'></td>
+  <td width='1' style='background-color: rgba(195,255,98,1)'></td>
   <td width='1' style='background-color: rgba(204,255,79,1)'></td>
-  <td width='1' style='background-color: rgba(213,255,55,1)'></td>
+  <td width='1' style='background-color: rgba(213,255,56,1)'></td>
   <td width='1' style='background-color: rgba(230,255,133,1)'></td>
   <td width='1' style='background-color: rgba(255,255,253,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -308,66 +318,66 @@
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(231,255,246,1)'></td>
   <td width='1' style='background-color: rgba(55,255,202,1)'></td>
   <td width='1' style='background-color: rgba(91,255,203,1)'></td>
-  <td width='1' style='background-color: rgba(113,255,204,1)'></td>
+  <td width='1' style='background-color: rgba(113,255,203,1)'></td>
   <td width='1' style='background-color: rgba(132,255,205,1)'></td>
   <td width='1' style='background-color: rgba(147,255,205,1)'></td>
-  <td width='1' style='background-color: rgba(157,255,204,1)'></td>
-  <td width='1' style='background-color: rgba(164,255,201,1)'></td>
-  <td width='1' style='background-color: rgba(166,255,195,1)'></td>
-  <td width='1' style='background-color: rgba(163,255,179,1)'></td>
+  <td width='1' style='background-color: rgba(157,255,203,1)'></td>
+  <td width='1' style='background-color: rgba(163,255,201,1)'></td>
+  <td width='1' style='background-color: rgba(166,255,194,1)'></td>
+  <td width='1' style='background-color: rgba(163,255,178,1)'></td>
   <td width='1' style='background-color: rgba(169,255,155,1)'></td>
   <td width='1' style='background-color: rgba(186,255,138,1)'></td>
   <td width='1' style='background-color: rgba(196,255,127,1)'></td>
   <td width='1' style='background-color: rgba(205,255,114,1)'></td>
   <td width='1' style='background-color: rgba(213,255,98,1)'></td>
   <td width='1' style='background-color: rgba(222,255,77,1)'></td>
-  <td width='1' style='background-color: rgba(230,255,55,1)'></td>
+  <td width='1' style='background-color: rgba(230,255,56,1)'></td>
   <td width='1' style='background-color: rgba(244,255,153,1)'></td>
-  <td width='1' style='background-color: rgba(255,255,254,1)'></td>
+  <td width='1' style='background-color: rgba(255,255,253,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(170,255,227,1)'></td>
-  <td width='1' style='background-color: rgba(73,255,207,1)'></td>
+  <td width='1' style='background-color: rgba(73,255,206,1)'></td>
   <td width='1' style='background-color: rgba(102,255,208,1)'></td>
   <td width='1' style='background-color: rgba(123,255,209,1)'></td>
   <td width='1' style='background-color: rgba(141,255,210,1)'></td>
-  <td width='1' style='background-color: rgba(156,255,211,1)'></td>
-  <td width='1' style='background-color: rgba(167,255,210,1)'></td>
+  <td width='1' style='background-color: rgba(156,255,210,1)'></td>
+  <td width='1' style='background-color: rgba(167,255,209,1)'></td>
   <td width='1' style='background-color: rgba(174,255,208,1)'></td>
   <td width='1' style='background-color: rgba(177,255,202,1)'></td>
   <td width='1' style='background-color: rgba(174,255,188,1)'></td>
   <td width='1' style='background-color: rgba(181,255,166,1)'></td>
   <td width='1' style='background-color: rgba(196,255,151,1)'></td>
   <td width='1' style='background-color: rgba(205,255,140,1)'></td>
   <td width='1' style='background-color: rgba(213,255,128,1)'></td>
-  <td width='1' style='background-color: rgba(222,255,114,1)'></td>
+  <td width='1' style='background-color: rgba(221,255,114,1)'></td>
   <td width='1' style='background-color: rgba(230,255,96,1)'></td>
-  <td width='1' style='background-color: rgba(239,255,77,1)'></td>
-  <td width='1' style='background-color: rgba(248,255,52,1)'></td>
-  <td width='1' style='background-color: rgba(255,254,173,1)'></td>
+  <td width='1' style='background-color: rgba(238,255,77,1)'></td>
+  <td width='1' style='background-color: rgba(247,255,53,1)'></td>
+  <td width='1' style='background-color: rgba(254,254,173,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -377,100 +387,112 @@
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(249,255,253,1)'></td>
   <td width='1' style='background-color: rgba(79,255,213,1)'></td>
   <td width='1' style='background-color: rgba(86,255,211,1)'></td>
   <td width='1' style='background-color: rgba(111,255,212,1)'></td>
   <td width='1' style='background-color: rgba(133,255,214,1)'></td>
-  <td width='1' style='background-color: rgba(149,255,215,1)'></td>
-  <td width='1' style='background-color: rgba(164,255,216,1)'></td>
-  <td width='1' style='background-color: rgba(176,255,216,1)'></td>
+  <td width='1' style='background-color: rgba(149,255,214,1)'></td>
+  <td width='1' style='background-color: rgba(164,255,215,1)'></td>
+  <td width='1' style='background-color: rgba(175,255,215,1)'></td>
   <td width='1' style='background-color: rgba(184,255,214,1)'></td>
-  <td width='1' style='background-color: rgba(187,255,210,1)'></td>
+  <td width='1' style='background-color: rgba(187,255,209,1)'></td>
   <td width='1' style='background-color: rgba(185,255,196,1)'></td>
-  <td width='1' style='background-color: rgba(193,255,176,1)'></td>
-  <td width='1' style='background-color: rgba(205,255,164,1)'></td>
+  <td width='1' style='background-color: rgba(192,255,176,1)'></td>
+  <td width='1' style='background-color: rgba(205,255,163,1)'></td>
   <td width='1' style='background-color: rgba(214,255,154,1)'></td>
   <td width='1' style='background-color: rgba(222,255,141,1)'></td>
   <td width='1' style='background-color: rgba(230,255,128,1)'></td>
   <td width='1' style='background-color: rgba(238,255,113,1)'></td>
   <td width='1' style='background-color: rgba(247,255,96,1)'></td>
-  <td width='1' style='background-color: rgba(254,254,75,1)'></td>
-  <td width='1' style='background-color: rgba(255,245,49,1)'></td>
-  <td width='1' style='background-color: rgba(255,246,187,1)'></td>
+  <td width='1' style='background-color: rgba(254,253,75,1)'></td>
+<script type="application/ecmascript">
+if (lcms_has_assembly) {
+  document.write("<td width='1' style='background-color: rgba(255,245,49,1)'></td>");
+} else {
+  document.write("<td width='1' style='background-color: rgba(255,245,50,1)'></td>");
+}
+</script>
+  <td width='1' style='background-color: rgba(255,245,187,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(210,255,242,1)'></td>
-  <td width='1' style='background-color: rgba(63,255,215,1)'></td>
-  <td width='1' style='background-color: rgba(96,255,216,1)'></td>
+  <td width='1' style='background-color: rgba(210,255,241,1)'></td>
+  <td width='1' style='background-color: rgba(64,255,214,1)'></td>
+  <td width='1' style='background-color: rgba(96,255,215,1)'></td>
   <td width='1' style='background-color: rgba(121,255,217,1)'></td>
   <td width='1' style='background-color: rgba(141,255,218,1)'></td>
-  <td width='1' style='background-color: rgba(157,255,220,1)'></td>
-  <td width='1' style='background-color: rgba(171,255,221,1)'></td>
+  <td width='1' style='background-color: rgba(157,255,219,1)'></td>
+  <td width='1' style='background-color: rgba(171,255,220,1)'></td>
   <td width='1' style='background-color: rgba(184,255,221,1)'></td>
-  <td width='1' style='background-color: rgba(193,255,220,1)'></td>
-  <td width='1' style='background-color: rgba(197,255,217,1)'></td>
-  <td width='1' style='background-color: rgba(196,255,205,1)'></td>
+  <td width='1' style='background-color: rgba(192,255,220,1)'></td>
+  <td width='1' style='background-color: rgba(197,255,216,1)'></td>
+  <td width='1' style='background-color: rgba(195,255,205,1)'></td>
   <td width='1' style='background-color: rgba(203,255,186,1)'></td>
-  <td width='1' style='background-color: rgba(215,255,176,1)'></td>
-  <td width='1' style='background-color: rgba(223,255,165,1)'></td>
+  <td width='1' style='background-color: rgba(214,255,175,1)'></td>
+  <td width='1' style='background-color: rgba(222,255,165,1)'></td>
   <td width='1' style='background-color: rgba(230,255,154,1)'></td>
   <td width='1' style='background-color: rgba(238,255,140,1)'></td>
-  <td width='1' style='background-color: rgba(247,255,127,1)'></td>
+  <td width='1' style='background-color: rgba(246,255,127,1)'></td>
   <td width='1' style='background-color: rgba(254,254,112,1)'></td>
   <td width='1' style='background-color: rgba(255,245,95,1)'></td>
   <td width='1' style='background-color: rgba(255,235,75,1)'></td>
-  <td width='1' style='background-color: rgba(255,225,49,1)'></td>
-  <td width='1' style='background-color: rgba(255,240,204,1)'></td>
+<script type="application/ecmascript">
+if (lcms_has_assembly) {
+  document.write("<td width='1' style='background-color: rgba(255,224,49,1)'></td>");
+} else {
+  document.write("<td width='1' style='background-color: rgba(255,224,50,1)'></td>");
+}
+</script>
+  <td width='1' style='background-color: rgba(255,240,203,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(166,255,234,1)'></td>
-  <td width='1' style='background-color: rgba(75,255,220,1)'></td>
-  <td width='1' style='background-color: rgba(106,255,221,1)'></td>
-  <td width='1' style='background-color: rgba(129,255,222,1)'></td>
-  <td width='1' style='background-color: rgba(148,255,223,1)'></td>
-  <td width='1' style='background-color: rgba(164,255,224,1)'></td>
+  <td width='1' style='background-color: rgba(166,255,233,1)'></td>
+  <td width='1' style='background-color: rgba(75,255,219,1)'></td>
+  <td width='1' style='background-color: rgba(106,255,220,1)'></td>
+  <td width='1' style='background-color: rgba(129,255,221,1)'></td>
+  <td width='1' style='background-color: rgba(147,255,222,1)'></td>
+  <td width='1' style='background-color: rgba(164,255,223,1)'></td>
   <td width='1' style='background-color: rgba(178,255,225,1)'></td>
-  <td width='1' style='background-color: rgba(191,255,226,1)'></td>
-  <td width='1' style='background-color: rgba(201,255,226,1)'></td>
+  <td width='1' style='background-color: rgba(190,255,226,1)'></td>
+  <td width='1' style='background-color: rgba(200,255,226,1)'></td>
   <td width='1' style='background-color: rgba(205,255,223,1)'></td>
   <td width='1' style='background-color: rgba(205,255,213,1)'></td>
   <td width='1' style='background-color: rgba(213,255,196,1)'></td>
-  <td width='1' style='background-color: rgba(223,255,186,1)'></td>
+  <td width='1' style='background-color: rgba(222,255,186,1)'></td>
   <td width='1' style='background-color: rgba(230,255,176,1)'></td>
   <td width='1' style='background-color: rgba(238,255,164,1)'></td>
   <td width='1' style='background-color: rgba(246,255,153,1)'></td>
   <td width='1' style='background-color: rgba(254,254,140,1)'></td>
-  <td width='1' style='background-color: rgba(255,246,126,1)'></td>
+  <td width='1' style='background-color: rgba(255,245,126,1)'></td>
   <td width='1' style='background-color: rgba(255,235,110,1)'></td>
   <td width='1' style='background-color: rgba(255,225,93,1)'></td>
-  <td width='1' style='background-color: rgba(255,216,73,1)'></td>
+  <td width='1' style='background-color: rgba(255,215,73,1)'></td>
   <td width='1' style='background-color: rgba(255,205,46,1)'></td>
   <td width='1' style='background-color: rgba(255,232,199,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -478,500 +500,500 @@
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(98,255,227,1)'></td>
   <td width='1' style='background-color: rgba(86,255,224,1)'></td>
   <td width='1' style='background-color: rgba(114,255,225,1)'></td>
   <td width='1' style='background-color: rgba(136,255,226,1)'></td>
-  <td width='1' style='background-color: rgba(155,255,227,1)'></td>
+  <td width='1' style='background-color: rgba(154,255,227,1)'></td>
   <td width='1' style='background-color: rgba(170,255,228,1)'></td>
-  <td width='1' style='background-color: rgba(185,255,229,1)'></td>
-  <td width='1' style='background-color: rgba(197,255,231,1)'></td>
-  <td width='1' style='background-color: rgba(208,255,231,1)'></td>
+  <td width='1' style='background-color: rgba(184,255,229,1)'></td>
+  <td width='1' style='background-color: rgba(197,255,230,1)'></td>
+  <td width='1' style='background-color: rgba(207,255,231,1)'></td>
   <td width='1' style='background-color: rgba(214,255,229,1)'></td>
-  <td width='1' style='background-color: rgba(215,255,221,1)'></td>
+  <td width='1' style='background-color: rgba(214,255,220,1)'></td>
   <td width='1' style='background-color: rgba(222,255,205,1)'></td>
   <td width='1' style='background-color: rgba(231,255,196,1)'></td>
   <td width='1' style='background-color: rgba(238,255,186,1)'></td>
-  <td width='1' style='background-color: rgba(246,255,176,1)'></td>
-  <td width='1' style='background-color: rgba(254,254,164,1)'></td>
+  <td width='1' style='background-color: rgba(246,255,175,1)'></td>
+  <td width='1' style='background-color: rgba(253,254,163,1)'></td>
   <td width='1' style='background-color: rgba(255,246,152,1)'></td>
   <td width='1' style='background-color: rgba(255,236,139,1)'></td>
   <td width='1' style='background-color: rgba(255,226,125,1)'></td>
-  <td width='1' style='background-color: rgba(255,217,109,1)'></td>
-  <td width='1' style='background-color: rgba(255,207,91,1)'></td>
+  <td width='1' style='background-color: rgba(255,216,109,1)'></td>
+  <td width='1' style='background-color: rgba(255,207,92,1)'></td>
   <td width='1' style='background-color: rgba(255,196,71,1)'></td>
-  <td width='1' style='background-color: rgba(255,187,49,1)'></td>
-  <td width='1' style='background-color: rgba(255,236,221,1)'></td>
+  <td width='1' style='background-color: rgba(255,187,50,1)'></td>
+  <td width='1' style='background-color: rgba(255,236,220,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(234,255,251,1)'></td>
   <td width='1' style='background-color: rgba(55,255,228,1)'></td>
-  <td width='1' style='background-color: rgba(94,255,229,1)'></td>
+  <td width='1' style='background-color: rgba(95,255,229,1)'></td>
   <td width='1' style='background-color: rgba(120,255,230,1)'></td>
   <td width='1' style='background-color: rgba(141,255,231,1)'></td>
-  <td width='1' style='background-color: rgba(160,255,232,1)'></td>
-  <td width='1' style='background-color: rgba(176,255,233,1)'></td>
+  <td width='1' style='background-color: rgba(159,255,232,1)'></td>
+  <td width='1' style='background-color: rgba(176,255,232,1)'></td>
   <td width='1' style='background-color: rgba(190,255,234,1)'></td>
   <td width='1' style='background-color: rgba(203,255,235,1)'></td>
   <td width='1' style='background-color: rgba(214,255,236,1)'></td>
-  <td width='1' style='background-color: rgba(222,255,235,1)'></td>
+  <td width='1' style='background-color: rgba(221,255,235,1)'></td>
   <td width='1' style='background-color: rgba(223,255,228,1)'></td>
   <td width='1' style='background-color: rgba(230,255,214,1)'></td>
   <td width='1' style='background-color: rgba(238,255,206,1)'></td>
   <td width='1' style='background-color: rgba(246,255,196,1)'></td>
-  <td width='1' style='background-color: rgba(254,255,185,1)'></td>
+  <td width='1' style='background-color: rgba(253,254,185,1)'></td>
   <td width='1' style='background-color: rgba(255,246,175,1)'></td>
   <td width='1' style='background-color: rgba(255,237,163,1)'></td>
   <td width='1' style='background-color: rgba(255,227,151,1)'></td>
   <td width='1' style='background-color: rgba(255,218,138,1)'></td>
   <td width='1' style='background-color: rgba(255,208,124,1)'></td>
-  <td width='1' style='background-color: rgba(255,198,108,1)'></td>
+  <td width='1' style='background-color: rgba(255,197,108,1)'></td>
   <td width='1' style='background-color: rgba(255,187,90,1)'></td>
-  <td width='1' style='background-color: rgba(255,176,68,1)'></td>
+  <td width='1' style='background-color: rgba(255,175,69,1)'></td>
   <td width='1' style='background-color: rgba(255,172,81,1)'></td>
   <td width='1' style='background-color: rgba(255,236,227,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(200,255,246,1)'></td>
   <td width='1' style='background-color: rgba(68,255,233,1)'></td>
   <td width='1' style='background-color: rgba(102,255,234,1)'></td>
-  <td width='1' style='background-color: rgba(127,255,235,1)'></td>
+  <td width='1' style='background-color: rgba(127,255,234,1)'></td>
   <td width='1' style='background-color: rgba(147,255,235,1)'></td>
   <td width='1' style='background-color: rgba(164,255,236,1)'></td>
-  <td width='1' style='background-color: rgba(181,255,237,1)'></td>
+  <td width='1' style='background-color: rgba(180,255,237,1)'></td>
   <td width='1' style='background-color: rgba(195,255,238,1)'></td>
-  <td width='1' style='background-color: rgba(208,255,239,1)'></td>
-  <td width='1' style='background-color: rgba(220,255,240,1)'></td>
-  <td width='1' style='background-color: rgba(229,255,241,1)'></td>
-  <td width='1' style='background-color: rgba(232,255,235,1)'></td>
-  <td width='1' style='background-color: rgba(239,255,223,1)'></td>
-  <td width='1' style='background-color: rgba(246,255,215,1)'></td>
-  <td width='1' style='background-color: rgba(253,255,205,1)'></td>
-  <td width='1' style='background-color: rgba(255,247,195,1)'></td>
+  <td width='1' style='background-color: rgba(207,255,238,1)'></td>
+  <td width='1' style='background-color: rgba(219,255,240,1)'></td>
+  <td width='1' style='background-color: rgba(229,255,240,1)'></td>
+  <td width='1' style='background-color: rgba(231,255,235,1)'></td>
+  <td width='1' style='background-color: rgba(238,255,223,1)'></td>
+  <td width='1' style='background-color: rgba(246,255,214,1)'></td>
+  <td width='1' style='background-color: rgba(253,254,205,1)'></td>
+  <td width='1' style='background-color: rgba(255,246,195,1)'></td>
   <td width='1' style='background-color: rgba(255,237,185,1)'></td>
   <td width='1' style='background-color: rgba(255,228,174,1)'></td>
   <td width='1' style='background-color: rgba(255,219,162,1)'></td>
   <td width='1' style='background-color: rgba(255,209,149,1)'></td>
   <td width='1' style='background-color: rgba(255,199,136,1)'></td>
   <td width='1' style='background-color: rgba(255,189,121,1)'></td>
   <td width='1' style='background-color: rgba(255,178,105,1)'></td>
   <td width='1' style='background-color: rgba(255,166,86,1)'></td>
   <td width='1' style='background-color: rgba(255,154,64,1)'></td>
-  <td width='1' style='background-color: rgba(254,149,79,1)'></td>
-  <td width='1' style='background-color: rgba(254,237,232,1)'></td>
+  <td width='1' style='background-color: rgba(253,149,79,1)'></td>
+  <td width='1' style='background-color: rgba(253,237,232,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(170,255,246,1)'></td>
-  <td width='1' style='background-color: rgba(75,255,239,1)'></td>
-  <td width='1' style='background-color: rgba(107,255,239,1)'></td>
-  <td width='1' style='background-color: rgba(131,255,240,1)'></td>
+  <td width='1' style='background-color: rgba(170,255,245,1)'></td>
+  <td width='1' style='background-color: rgba(75,255,238,1)'></td>
+  <td width='1' style='background-color: rgba(108,255,239,1)'></td>
+  <td width='1' style='background-color: rgba(131,255,239,1)'></td>
   <td width='1' style='background-color: rgba(151,255,240,1)'></td>
-  <td width='1' style='background-color: rgba(169,255,241,1)'></td>
-  <td width='1' style='background-color: rgba(185,255,242,1)'></td>
-  <td width='1' style='background-color: rgba(199,255,243,1)'></td>
-  <td width='1' style='background-color: rgba(212,255,244,1)'></td>
-  <td width='1' style='background-color: rgba(224,255,245,1)'></td>
-  <td width='1' style='background-color: rgba(234,255,246,1)'></td>
-  <td width='1' style='background-color: rgba(240,255,242,1)'></td>
+  <td width='1' style='background-color: rgba(169,255,240,1)'></td>
+  <td width='1' style='background-color: rgba(184,255,241,1)'></td>
+  <td width='1' style='background-color: rgba(199,255,242,1)'></td>
+  <td width='1' style='background-color: rgba(212,255,243,1)'></td>
+  <td width='1' style='background-color: rgba(224,255,244,1)'></td>
+  <td width='1' style='background-color: rgba(234,255,245,1)'></td>
+  <td width='1' style='background-color: rgba(239,255,242,1)'></td>
   <td width='1' style='background-color: rgba(246,255,232,1)'></td>
-  <td width='1' style='background-color: rgba(253,255,223,1)'></td>
-  <td width='1' style='background-color: rgba(255,248,215,1)'></td>
+  <td width='1' style='background-color: rgba(253,254,223,1)'></td>
+  <td width='1' style='background-color: rgba(255,247,214,1)'></td>
   <td width='1' style='background-color: rgba(255,238,205,1)'></td>
-  <td width='1' style='background-color: rgba(255,229,195,1)'></td>
+  <td width='1' style='background-color: rgba(255,229,194,1)'></td>
   <td width='1' style='background-color: rgba(255,220,184,1)'></td>
-  <td width='1' style='background-color: rgba(255,211,173,1)'></td>
-  <td width='1' style='background-color: rgba(255,201,160,1)'></td>
-  <td width='1' style='background-color: rgba(255,190,149,1)'></td>
+  <td width='1' style='background-color: rgba(255,210,173,1)'></td>
+  <td width='1' style='background-color: rgba(255,200,160,1)'></td>
+  <td width='1' style='background-color: rgba(255,190,148,1)'></td>
   <td width='1' style='background-color: rgba(255,179,135,1)'></td>
   <td width='1' style='background-color: rgba(255,167,120,1)'></td>
-  <td width='1' style='background-color: rgba(255,154,103,1)'></td>
+  <td width='1' style='background-color: rgba(255,154,104,1)'></td>
   <td width='1' style='background-color: rgba(255,140,85,1)'></td>
   <td width='1' style='background-color: rgba(255,125,64,1)'></td>
   <td width='1' style='background-color: rgba(252,127,86,1)'></td>
-  <td width='1' style='background-color: rgba(254,241,240,1)'></td>
+  <td width='1' style='background-color: rgba(254,241,239,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(133,255,247,1)'></td>
-  <td width='1' style='background-color: rgba(83,255,245,1)'></td>
+  <td width='1' style='background-color: rgba(133,255,246,1)'></td>
+  <td width='1' style='background-color: rgba(83,255,244,1)'></td>
   <td width='1' style='background-color: rgba(113,255,245,1)'></td>
-  <td width='1' style='background-color: rgba(135,255,246,1)'></td>
+  <td width='1' style='background-color: rgba(135,255,245,1)'></td>
   <td width='1' style='background-color: rgba(155,255,246,1)'></td>
   <td width='1' style='background-color: rgba(172,255,246,1)'></td>
-  <td width='1' style='background-color: rgba(188,255,247,1)'></td>
+  <td width='1' style='background-color: rgba(188,255,246,1)'></td>
   <td width='1' style='background-color: rgba(202,255,247,1)'></td>
-  <td width='1' style='background-color: rgba(216,255,248,1)'></td>
-  <td width='1' style='background-color: rgba(228,255,249,1)'></td>
-  <td width='1' style='background-color: rgba(239,255,250,1)'></td>
-  <td width='1' style='background-color: rgba(247,255,249,1)'></td>
+  <td width='1' style='background-color: rgba(215,255,247,1)'></td>
+  <td width='1' style='background-color: rgba(228,255,248,1)'></td>
+  <td width='1' style='background-color: rgba(239,255,249,1)'></td>
+  <td width='1' style='background-color: rgba(247,255,248,1)'></td>
   <td width='1' style='background-color: rgba(253,255,240,1)'></td>
-  <td width='1' style='background-color: rgba(255,249,232,1)'></td>
-  <td width='1' style='background-color: rgba(255,240,223,1)'></td>
-  <td width='1' style='background-color: rgba(255,231,214,1)'></td>
-  <td width='1' style='background-color: rgba(255,221,204,1)'></td>
+  <td width='1' style='background-color: rgba(255,248,232,1)'></td>
+  <td width='1' style='background-color: rgba(255,239,222,1)'></td>
+  <td width='1' style='background-color: rgba(255,230,213,1)'></td>
+  <td width='1' style='background-color: rgba(255,221,203,1)'></td>
   <td width='1' style='background-color: rgba(255,211,194,1)'></td>
-  <td width='1' style='background-color: rgba(255,201,183,1)'></td>
+  <td width='1' style='background-color: rgba(255,200,183,1)'></td>
   <td width='1' style='background-color: rgba(255,189,172,1)'></td>
   <td width='1' style='background-color: rgba(255,176,160,1)'></td>
   <td width='1' style='background-color: rgba(255,163,149,1)'></td>
   <td width='1' style='background-color: rgba(255,148,137,1)'></td>
   <td width='1' style='background-color: rgba(255,132,125,1)'></td>
   <td width='1' style='background-color: rgba(255,114,112,1)'></td>
   <td width='1' style='background-color: rgba(255,95,96,1)'></td>
   <td width='1' style='background-color: rgba(255,71,81,1)'></td>
   <td width='1' style='background-color: rgba(255,110,119,1)'></td>
-  <td width='1' style='background-color: rgba(255,243,244,1)'></td>
+  <td width='1' style='background-color: rgba(255,242,243,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
-  <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(75,255,251,1)'></td>
-  <td width='1' style='background-color: rgba(88,255,251,1)'></td>
+  <td width='1' style='background-color: rgba(254,255,255,1)'></td>
+  <td width='1' style='background-color: rgba(75,255,250,1)'></td>
+  <td width='1' style='background-color: rgba(88,255,250,1)'></td>
   <td width='1' style='background-color: rgba(116,255,251,1)'></td>
   <td width='1' style='background-color: rgba(139,255,251,1)'></td>
-  <td width='1' style='background-color: rgba(158,255,252,1)'></td>
+  <td width='1' style='background-color: rgba(158,255,251,1)'></td>
   <td width='1' style='background-color: rgba(175,255,252,1)'></td>
-  <td width='1' style='background-color: rgba(191,255,253,1)'></td>
-  <td width='1' style='background-color: rgba(205,255,253,1)'></td>
+  <td width='1' style='background-color: rgba(190,255,252,1)'></td>
+  <td width='1' style='background-color: rgba(205,255,252,1)'></td>
   <td width='1' style='background-color: rgba(218,255,253,1)'></td>
-  <td width='1' style='background-color: rgba(230,255,254,1)'></td>
+  <td width='1' style='background-color: rgba(230,255,253,1)'></td>
   <td width='1' style='background-color: rgba(242,255,254,1)'></td>
   <td width='1' style='background-color: rgba(252,254,254,1)'></td>
   <td width='1' style='background-color: rgba(255,249,248,1)'></td>
   <td width='1' style='background-color: rgba(255,241,241,1)'></td>
-  <td width='1' style='background-color: rgba(255,233,234,1)'></td>
+  <td width='1' style='background-color: rgba(255,232,234,1)'></td>
   <td width='1' style='background-color: rgba(255,223,227,1)'></td>
-  <td width='1' style='background-color: rgba(255,214,220,1)'></td>
+  <td width='1' style='background-color: rgba(255,213,219,1)'></td>
   <td width='1' style='background-color: rgba(255,203,212,1)'></td>
-  <td width='1' style='background-color: rgba(255,193,204,1)'></td>
+  <td width='1' style='background-color: rgba(255,192,204,1)'></td>
   <td width='1' style='background-color: rgba(255,182,196,1)'></td>
-  <td width='1' style='background-color: rgba(255,171,189,1)'></td>
+  <td width='1' style='background-color: rgba(255,170,189,1)'></td>
   <td width='1' style='background-color: rgba(255,159,180,1)'></td>
   <td width='1' style='background-color: rgba(255,146,171,1)'></td>
   <td width='1' style='background-color: rgba(255,133,162,1)'></td>
   <td width='1' style='background-color: rgba(255,118,153,1)'></td>
   <td width='1' style='background-color: rgba(255,101,142,1)'></td>
   <td width='1' style='background-color: rgba(255,83,132,1)'></td>
-  <td width='1' style='background-color: rgba(255,58,120,1)'></td>
+  <td width='1' style='background-color: rgba(255,59,120,1)'></td>
   <td width='1' style='background-color: rgba(255,121,152,1)'></td>
   <td width='1' style='background-color: rgba(255,247,249,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(240,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(55,254,254,1)'></td>
-  <td width='1' style='background-color: rgba(93,253,255,1)'></td>
-  <td width='1' style='background-color: rgba(120,253,255,1)'></td>
-  <td width='1' style='background-color: rgba(142,253,255,1)'></td>
+  <td width='1' style='background-color: rgba(55,253,254,1)'></td>
+  <td width='1' style='background-color: rgba(93,253,254,1)'></td>
+  <td width='1' style='background-color: rgba(120,253,254,1)'></td>
+  <td width='1' style='background-color: rgba(142,252,254,1)'></td>
   <td width='1' style='background-color: rgba(161,252,255,1)'></td>
-  <td width='1' style='background-color: rgba(178,252,255,1)'></td>
-  <td width='1' style='background-color: rgba(193,251,255,1)'></td>
-  <td width='1' style='background-color: rgba(207,251,255,1)'></td>
-  <td width='1' style='background-color: rgba(220,251,255,1)'></td>
-  <td width='1' style='background-color: rgba(232,250,255,1)'></td>
-  <td width='1' style='background-color: rgba(243,246,255,1)'></td>
-  <td width='1' style='background-color: rgba(253,239,255,1)'></td>
+  <td width='1' style='background-color: rgba(178,251,255,1)'></td>
+  <td width='1' style='background-color: rgba(192,251,255,1)'></td>
+  <td width='1' style='background-color: rgba(206,251,255,1)'></td>
+  <td width='1' style='background-color: rgba(219,250,255,1)'></td>
+  <td width='1' style='background-color: rgba(231,249,255,1)'></td>
+  <td width='1' style='background-color: rgba(242,246,255,1)'></td>
+  <td width='1' style='background-color: rgba(253,238,254,1)'></td>
   <td width='1' style='background-color: rgba(255,233,248,1)'></td>
-  <td width='1' style='background-color: rgba(255,226,243,1)'></td>
+  <td width='1' style='background-color: rgba(255,226,242,1)'></td>
   <td width='1' style='background-color: rgba(255,220,237,1)'></td>
-  <td width='1' style='background-color: rgba(255,214,232,1)'></td>
-  <td width='1' style='background-color: rgba(255,207,227,1)'></td>
-  <td width='1' style='background-color: rgba(255,200,222,1)'></td>
-  <td width='1' style='background-color: rgba(255,192,216,1)'></td>
+  <td width='1' style='background-color: rgba(255,213,232,1)'></td>
+  <td width='1' style='background-color: rgba(255,206,227,1)'></td>
+  <td width='1' style='background-color: rgba(255,199,221,1)'></td>
+  <td width='1' style='background-color: rgba(255,192,215,1)'></td>
   <td width='1' style='background-color: rgba(255,183,210,1)'></td>
-  <td width='1' style='background-color: rgba(255,174,204,1)'></td>
+  <td width='1' style='background-color: rgba(255,174,203,1)'></td>
   <td width='1' style='background-color: rgba(255,164,197,1)'></td>
   <td width='1' style='background-color: rgba(255,154,190,1)'></td>
-  <td width='1' style='background-color: rgba(255,142,183,1)'></td>
+  <td width='1' style='background-color: rgba(255,142,182,1)'></td>
   <td width='1' style='background-color: rgba(255,130,175,1)'></td>
   <td width='1' style='background-color: rgba(255,115,166,1)'></td>
   <td width='1' style='background-color: rgba(255,99,157,1)'></td>
   <td width='1' style='background-color: rgba(255,79,147,1)'></td>
-  <td width='1' style='background-color: rgba(255,55,136,1)'></td>
+  <td width='1' style='background-color: rgba(255,56,136,1)'></td>
   <td width='1' style='background-color: rgba(255,138,172,1)'></td>
-  <td width='1' style='background-color: rgba(255,251,252,1)'></td>
+  <td width='1' style='background-color: rgba(255,250,251,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(225,253,255,1)'></td>
-  <td width='1' style='background-color: rgba(61,247,255,1)'></td>
-  <td width='1' style='background-color: rgba(98,247,255,1)'></td>
+  <td width='1' style='background-color: rgba(61,246,254,1)'></td>
+  <td width='1' style='background-color: rgba(98,246,255,1)'></td>
   <td width='1' style='background-color: rgba(123,246,255,1)'></td>
   <td width='1' style='background-color: rgba(144,246,255,1)'></td>
-  <td width='1' style='background-color: rgba(163,246,255,1)'></td>
-  <td width='1' style='background-color: rgba(179,245,255,1)'></td>
+  <td width='1' style='background-color: rgba(163,245,255,1)'></td>
+  <td width='1' style='background-color: rgba(179,244,255,1)'></td>
   <td width='1' style='background-color: rgba(194,244,255,1)'></td>
   <td width='1' style='background-color: rgba(207,243,255,1)'></td>
-  <td width='1' style='background-color: rgba(220,241,255,1)'></td>
+  <td width='1' style='background-color: rgba(219,241,255,1)'></td>
   <td width='1' style='background-color: rgba(230,235,255,1)'></td>
-  <td width='1' style='background-color: rgba(244,225,255,1)'></td>
+  <td width='1' style='background-color: rgba(243,224,255,1)'></td>
   <td width='1' style='background-color: rgba(253,218,254,1)'></td>
-  <td width='1' style='background-color: rgba(255,211,247,1)'></td>
-  <td width='1' style='background-color: rgba(255,204,240,1)'></td>
-  <td width='1' style='background-color: rgba(255,198,234,1)'></td>
+  <td width='1' style='background-color: rgba(255,211,246,1)'></td>
+  <td width='1' style='background-color: rgba(255,204,239,1)'></td>
+  <td width='1' style='background-color: rgba(255,197,233,1)'></td>
   <td width='1' style='background-color: rgba(255,190,227,1)'></td>
-  <td width='1' style='background-color: rgba(255,182,222,1)'></td>
-  <td width='1' style='background-color: rgba(255,174,216,1)'></td>
+  <td width='1' style='background-color: rgba(255,182,221,1)'></td>
+  <td width='1' style='background-color: rgba(255,174,215,1)'></td>
   <td width='1' style='background-color: rgba(255,166,210,1)'></td>
   <td width='1' style='background-color: rgba(255,158,204,1)'></td>
-  <td width='1' style='background-color: rgba(255,149,199,1)'></td>
-  <td width='1' style='background-color: rgba(255,140,193,1)'></td>
+  <td width='1' style='background-color: rgba(255,148,199,1)'></td>
+  <td width='1' style='background-color: rgba(255,140,192,1)'></td>
   <td width='1' style='background-color: rgba(255,130,187,1)'></td>
-  <td width='1' style='background-color: rgba(255,119,181,1)'></td>
+  <td width='1' style='background-color: rgba(255,119,180,1)'></td>
   <td width='1' style='background-color: rgba(255,108,174,1)'></td>
-  <td width='1' style='background-color: rgba(255,96,168,1)'></td>
+  <td width='1' style='background-color: rgba(255,96,167,1)'></td>
   <td width='1' style='background-color: rgba(255,83,160,1)'></td>
   <td width='1' style='background-color: rgba(255,66,154,1)'></td>
-  <td width='1' style='background-color: rgba(255,55,148,1)'></td>
+  <td width='1' style='background-color: rgba(255,56,148,1)'></td>
   <td width='1' style='background-color: rgba(255,148,183,1)'></td>
   <td width='1' style='background-color: rgba(255,235,240,1)'></td>
 </tr>
 <tr height='1'>
-  <td width='1' style='background-color: rgba(211,250,255,1)'></td>
+  <td width='1' style='background-color: rgba(210,250,255,1)'></td>
   <td width='1' style='background-color: rgba(66,240,255,1)'></td>
-  <td width='1' style='background-color: rgba(101,240,255,1)'></td>
-  <td width='1' style='background-color: rgba(126,239,255,1)'></td>
+  <td width='1' style='background-color: rgba(101,239,255,1)'></td>
+  <td width='1' style='background-color: rgba(126,238,255,1)'></td>
   <td width='1' style='background-color: rgba(146,238,255,1)'></td>
-  <td width='1' style='background-color: rgba(164,237,255,1)'></td>
+  <td width='1' style='background-color: rgba(163,237,255,1)'></td>
   <td width='1' style='background-color: rgba(179,236,255,1)'></td>
   <td width='1' style='background-color: rgba(193,235,255,1)'></td>
-  <td width='1' style='background-color: rgba(206,233,255,1)'></td>
-  <td width='1' style='background-color: rgba(216,224,255,1)'></td>
+  <td width='1' style='background-color: rgba(206,232,255,1)'></td>
+  <td width='1' style='background-color: rgba(216,223,255,1)'></td>
   <td width='1' style='background-color: rgba(232,210,255,1)'></td>
-  <td width='1' style='background-color: rgba(245,203,255,1)'></td>
-  <td width='1' style='background-color: rgba(253,195,253,1)'></td>
+  <td width='1' style='background-color: rgba(245,202,255,1)'></td>
+  <td width='1' style='background-color: rgba(252,195,252,1)'></td>
   <td width='1' style='background-color: rgba(255,187,246,1)'></td>
   <td width='1' style='background-color: rgba(255,180,238,1)'></td>
   <td width='1' style='background-color: rgba(255,172,231,1)'></td>
-  <td width='1' style='background-color: rgba(255,164,224,1)'></td>
+  <td width='1' style='background-color: rgba(255,163,223,1)'></td>
   <td width='1' style='background-color: rgba(255,155,218,1)'></td>
   <td width='1' style='background-color: rgba(255,146,211,1)'></td>
   <td width='1' style='background-color: rgba(255,136,205,1)'></td>
   <td width='1' style='background-color: rgba(255,126,199,1)'></td>
-  <td width='1' style='background-color: rgba(255,115,193,1)'></td>
+  <td width='1' style='background-color: rgba(255,115,192,1)'></td>
   <td width='1' style='background-color: rgba(255,104,187,1)'></td>
   <td width='1' style='background-color: rgba(255,90,180,1)'></td>
-  <td width='1' style='background-color: rgba(255,77,174,1)'></td>
-  <td width='1' style='background-color: rgba(255,58,167,1)'></td>
+  <td width='1' style='background-color: rgba(255,77,173,1)'></td>
+  <td width='1' style='background-color: rgba(255,59,167,1)'></td>
   <td width='1' style='background-color: rgba(254,42,158,1)'></td>
-  <td width='1' style='background-color: rgba(252,95,163,1)'></td>
-  <td width='1' style='background-color: rgba(253,185,207,1)'></td>
-  <td width='1' style='background-color: rgba(255,241,245,1)'></td>
+  <td width='1' style='background-color: rgba(251,95,163,1)'></td>
+  <td width='1' style='background-color: rgba(252,185,207,1)'></td>
+  <td width='1' style='background-color: rgba(254,241,245,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(199,246,255,1)'></td>
-  <td width='1' style='background-color: rgba(68,233,255,1)'></td>
-  <td width='1' style='background-color: rgba(101,232,255,1)'></td>
-  <td width='1' style='background-color: rgba(125,231,255,1)'></td>
+  <td width='1' style='background-color: rgba(68,232,255,1)'></td>
+  <td width='1' style='background-color: rgba(101,231,255,1)'></td>
+  <td width='1' style='background-color: rgba(125,230,255,1)'></td>
   <td width='1' style='background-color: rgba(145,229,255,1)'></td>
   <td width='1' style='background-color: rgba(163,228,255,1)'></td>
   <td width='1' style='background-color: rgba(178,226,255,1)'></td>
   <td width='1' style='background-color: rgba(191,222,255,1)'></td>
   <td width='1' style='background-color: rgba(201,211,255,1)'></td>
-  <td width='1' style='background-color: rgba(219,195,255,1)'></td>
-  <td width='1' style='background-color: rgba(235,185,255,1)'></td>
-  <td width='1' style='background-color: rgba(246,178,255,1)'></td>
-  <td width='1' style='background-color: rgba(252,170,251,1)'></td>
-  <td width='1' style='background-color: rgba(255,160,245,1)'></td>
+  <td width='1' style='background-color: rgba(219,194,255,1)'></td>
+  <td width='1' style='background-color: rgba(234,185,255,1)'></td>
+  <td width='1' style='background-color: rgba(245,178,255,1)'></td>
+  <td width='1' style='background-color: rgba(251,170,251,1)'></td>
+  <td width='1' style='background-color: rgba(255,160,244,1)'></td>
   <td width='1' style='background-color: rgba(255,152,236,1)'></td>
   <td width='1' style='background-color: rgba(255,143,228,1)'></td>
-  <td width='1' style='background-color: rgba(255,134,222,1)'></td>
-  <td width='1' style='background-color: rgba(255,124,215,1)'></td>
+  <td width='1' style='background-color: rgba(255,134,221,1)'></td>
+  <td width='1' style='background-color: rgba(255,124,214,1)'></td>
   <td width='1' style='background-color: rgba(255,113,208,1)'></td>
-  <td width='1' style='background-color: rgba(255,99,201,1)'></td>
-  <td width='1' style='background-color: rgba(255,86,195,1)'></td>
+  <td width='1' style='background-color: rgba(255,99,200,1)'></td>
+  <td width='1' style='background-color: rgba(255,86,194,1)'></td>
   <td width='1' style='background-color: rgba(255,71,187,1)'></td>
   <td width='1' style='background-color: rgba(255,53,180,1)'></td>
-  <td width='1' style='background-color: rgba(252,33,170,1)'></td>
-  <td width='1' style='background-color: rgba(245,33,155,1)'></td>
-  <td width='1' style='background-color: rgba(245,146,185,1)'></td>
-  <td width='1' style='background-color: rgba(250,216,226,1)'></td>
-  <td width='1' style='background-color: rgba(255,254,254,1)'></td>
+  <td width='1' style='background-color: rgba(252,34,170,1)'></td>
+  <td width='1' style='background-color: rgba(245,34,155,1)'></td>
+  <td width='1' style='background-color: rgba(244,146,185,1)'></td>
+  <td width='1' style='background-color: rgba(249,216,226,1)'></td>
+  <td width='1' style='background-color: rgba(255,253,254,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
-  <td width='1' style='background-color: rgba(200,243,255,1)'></td>
+  <td width='1' style='background-color: rgba(200,242,255,1)'></td>
   <td width='1' style='background-color: rgba(66,223,255,1)'></td>
-  <td width='1' style='background-color: rgba(101,222,255,1)'></td>
-  <td width='1' style='background-color: rgba(125,221,255,1)'></td>
+  <td width='1' style='background-color: rgba(101,221,255,1)'></td>
+  <td width='1' style='background-color: rgba(125,220,255,1)'></td>
   <td width='1' style='background-color: rgba(144,219,255,1)'></td>
-  <td width='1' style='background-color: rgba(160,216,255,1)'></td>
+  <td width='1' style='background-color: rgba(160,215,255,1)'></td>
   <td width='1' style='background-color: rgba(174,211,255,1)'></td>
-  <td width='1' style='background-color: rgba(185,198,255,1)'></td>
-  <td width='1' style='background-color: rgba(205,179,255,1)'></td>
+  <td width='1' style='background-color: rgba(185,197,255,1)'></td>
+  <td width='1' style='background-color: rgba(205,178,255,1)'></td>
   <td width='1' style='background-color: rgba(223,167,255,1)'></td>
-  <td width='1' style='background-color: rgba(236,159,255,1)'></td>
+  <td width='1' style='background-color: rgba(235,159,255,1)'></td>
   <td width='1' style='background-color: rgba(246,150,255,1)'></td>
-  <td width='1' style='background-color: rgba(252,140,250,1)'></td>
+  <td width='1' style='background-color: rgba(251,140,250,1)'></td>
   <td width='1' style='background-color: rgba(255,130,243,1)'></td>
-  <td width='1' style='background-color: rgba(255,119,236,1)'></td>
+  <td width='1' style='background-color: rgba(255,119,235,1)'></td>
   <td width='1' style='background-color: rgba(255,108,227,1)'></td>
   <td width='1' style='background-color: rgba(255,96,219,1)'></td>
   <td width='1' style='background-color: rgba(255,83,212,1)'></td>
-  <td width='1' style='background-color: rgba(255,68,205,1)'></td>
-  <td width='1' style='background-color: rgba(255,49,196,1)'></td>
-  <td width='1' style='background-color: rgba(251,28,184,1)'></td>
-  <td width='1' style='background-color: rgba(240,12,164,1)'></td>
-  <td width='1' style='background-color: rgba(232,90,160,1)'></td>
-  <td width='1' style='background-color: rgba(239,185,204,1)'></td>
+  <td width='1' style='background-color: rgba(255,69,205,1)'></td>
+  <td width='1' style='background-color: rgba(255,50,196,1)'></td>
+  <td width='1' style='background-color: rgba(250,28,184,1)'></td>
+  <td width='1' style='background-color: rgba(240,13,164,1)'></td>
+  <td width='1' style='background-color: rgba(231,90,159,1)'></td>
+  <td width='1' style='background-color: rgba(239,185,203,1)'></td>
   <td width='1' style='background-color: rgba(251,241,244,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
-  <td width='1' style='background-color: rgba(203,239,255,1)'></td>
+  <td width='1' style='background-color: rgba(202,239,255,1)'></td>
   <td width='1' style='background-color: rgba(66,213,255,1)'></td>
   <td width='1' style='background-color: rgba(98,211,255,1)'></td>
   <td width='1' style='background-color: rgba(122,209,255,1)'></td>
   <td width='1' style='background-color: rgba(141,205,255,1)'></td>
   <td width='1' style='background-color: rgba(155,199,255,1)'></td>
   <td width='1' style='background-color: rgba(167,183,255,1)'></td>
   <td width='1' style='background-color: rgba(189,161,255,1)'></td>
-  <td width='1' style='background-color: rgba(211,147,255,1)'></td>
+  <td width='1' style='background-color: rgba(210,147,255,1)'></td>
   <td width='1' style='background-color: rgba(225,137,255,1)'></td>
-  <td width='1' style='background-color: rgba(237,128,255,1)'></td>
+  <td width='1' style='background-color: rgba(236,128,255,1)'></td>
   <td width='1' style='background-color: rgba(246,118,255,1)'></td>
   <td width='1' style='background-color: rgba(251,105,249,1)'></td>
-  <td width='1' style='background-color: rgba(254,91,242,1)'></td>
+  <td width='1' style='background-color: rgba(254,92,241,1)'></td>
   <td width='1' style='background-color: rgba(255,77,234,1)'></td>
   <td width='1' style='background-color: rgba(255,61,226,1)'></td>
   <td width='1' style='background-color: rgba(254,42,215,1)'></td>
-  <td width='1' style='background-color: rgba(249,21,201,1)'></td>
+  <td width='1' style='background-color: rgba(248,22,200,1)'></td>
   <td width='1' style='background-color: rgba(237,0,178,1)'></td>
   <td width='1' style='background-color: rgba(220,28,149,1)'></td>
-  <td width='1' style='background-color: rgba(224,146,177,1)'></td>
-  <td width='1' style='background-color: rgba(241,216,223,1)'></td>
-  <td width='1' style='background-color: rgba(255,254,254,1)'></td>
+  <td width='1' style='background-color: rgba(223,146,177,1)'></td>
+  <td width='1' style='background-color: rgba(240,216,223,1)'></td>
+  <td width='1' style='background-color: rgba(254,253,254,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
-  <td width='1' style='background-color: rgba(215,240,255,1)'></td>
+  <td width='1' style='background-color: rgba(214,239,255,1)'></td>
   <td width='1' style='background-color: rgba(61,201,255,1)'></td>
   <td width='1' style='background-color: rgba(95,199,255,1)'></td>
   <td width='1' style='background-color: rgba(118,194,255,1)'></td>
   <td width='1' style='background-color: rgba(134,186,255,1)'></td>
   <td width='1' style='background-color: rgba(147,168,255,1)'></td>
-  <td width='1' style='background-color: rgba(171,142,255,1)'></td>
+  <td width='1' style='background-color: rgba(170,142,255,1)'></td>
   <td width='1' style='background-color: rgba(197,125,255,1)'></td>
   <td width='1' style='background-color: rgba(213,113,255,1)'></td>
   <td width='1' style='background-color: rgba(226,101,255,1)'></td>
   <td width='1' style='background-color: rgba(237,88,255,1)'></td>
   <td width='1' style='background-color: rgba(246,75,254,1)'></td>
   <td width='1' style='background-color: rgba(250,56,247,1)'></td>
-  <td width='1' style='background-color: rgba(251,33,237,1)'></td>
-  <td width='1' style='background-color: rgba(245,12,219,1)'></td>
+  <td width='1' style='background-color: rgba(251,34,237,1)'></td>
+  <td width='1' style='background-color: rgba(245,13,219,1)'></td>
   <td width='1' style='background-color: rgba(232,0,193,1)'></td>
-  <td width='1' style='background-color: rgba(213,0,160,1)'></td>
+  <td width='1' style='background-color: rgba(213,0,159,1)'></td>
   <td width='1' style='background-color: rgba(203,90,149,1)'></td>
-  <td width='1' style='background-color: rgba(224,185,199,1)'></td>
+  <td width='1' style='background-color: rgba(223,185,199,1)'></td>
   <td width='1' style='background-color: rgba(248,241,243,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
-  <td width='1' style='background-color: rgba(230,244,255,1)'></td>
-  <td width='1' style='background-color: rgba(55,187,255,1)'></td>
+  <td width='1' style='background-color: rgba(230,243,255,1)'></td>
+  <td width='1' style='background-color: rgba(56,187,255,1)'></td>
   <td width='1' style='background-color: rgba(88,181,255,1)'></td>
   <td width='1' style='background-color: rgba(108,171,255,1)'></td>
   <td width='1' style='background-color: rgba(124,151,255,1)'></td>
   <td width='1' style='background-color: rgba(149,121,255,1)'></td>
   <td width='1' style='background-color: rgba(182,99,255,1)'></td>
   <td width='1' style='background-color: rgba(200,83,255,1)'></td>
-  <td width='1' style='background-color: rgba(214,68,255,1)'></td>
-  <td width='1' style='background-color: rgba(226,49,255,1)'></td>
-  <td width='1' style='background-color: rgba(235,33,251,1)'></td>
-  <td width='1' style='background-color: rgba(235,12,237,1)'></td>
+  <td width='1' style='background-color: rgba(214,69,255,1)'></td>
+  <td width='1' style='background-color: rgba(226,50,255,1)'></td>
+  <td width='1' style='background-color: rgba(234,34,251,1)'></td>
+  <td width='1' style='background-color: rgba(234,13,237,1)'></td>
   <td width='1' style='background-color: rgba(223,0,210,1)'></td>
   <td width='1' style='background-color: rgba(206,0,175,1)'></td>
   <td width='1' style='background-color: rgba(185,28,140,1)'></td>
   <td width='1' style='background-color: rgba(200,146,170,1)'></td>
-  <td width='1' style='background-color: rgba(232,216,221,1)'></td>
-  <td width='1' style='background-color: rgba(254,254,254,1)'></td>
+  <td width='1' style='background-color: rgba(232,215,220,1)'></td>
+  <td width='1' style='background-color: rgba(254,253,253,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
-  <td width='1' style='background-color: rgba(252,254,255,1)'></td>
+  <td width='1' style='background-color: rgba(252,253,255,1)'></td>
   <td width='1' style='background-color: rgba(90,178,255,1)'></td>
   <td width='1' style='background-color: rgba(73,155,255,1)'></td>
   <td width='1' style='background-color: rgba(93,132,255,1)'></td>
   <td width='1' style='background-color: rgba(126,98,255,1)'></td>
-  <td width='1' style='background-color: rgba(164,68,255,1)'></td>
+  <td width='1' style='background-color: rgba(164,69,255,1)'></td>
   <td width='1' style='background-color: rgba(185,42,254,1)'></td>
-  <td width='1' style='background-color: rgba(195,21,248,1)'></td>
-  <td width='1' style='background-color: rgba(200,0,236,1)'></td>
-  <td width='1' style='background-color: rgba(198,0,218,1)'></td>
+  <td width='1' style='background-color: rgba(195,22,248,1)'></td>
+  <td width='1' style='background-color: rgba(199,0,236,1)'></td>
+  <td width='1' style='background-color: rgba(197,0,218,1)'></td>
   <td width='1' style='background-color: rgba(192,0,193,1)'></td>
-  <td width='1' style='background-color: rgba(174,0,155,1)'></td>
+  <td width='1' style='background-color: rgba(173,0,155,1)'></td>
   <td width='1' style='background-color: rgba(169,90,140,1)'></td>
-  <td width='1' style='background-color: rgba(208,185,195,1)'></td>
+  <td width='1' style='background-color: rgba(208,185,194,1)'></td>
   <td width='1' style='background-color: rgba(245,241,242,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -983,28 +1005,28 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(217,228,255,1)'></td>
+  <td width='1' style='background-color: rgba(216,228,255,1)'></td>
   <td width='1' style='background-color: rgba(77,124,255,1)'></td>
-  <td width='1' style='background-color: rgba(86,71,253,1)'></td>
-  <td width='1' style='background-color: rgba(120,42,245,1)'></td>
-  <td width='1' style='background-color: rgba(134,21,230,1)'></td>
-  <td width='1' style='background-color: rgba(136,12,209,1)'></td>
+  <td width='1' style='background-color: rgba(86,71,252,1)'></td>
+  <td width='1' style='background-color: rgba(120,42,244,1)'></td>
+  <td width='1' style='background-color: rgba(134,22,230,1)'></td>
+  <td width='1' style='background-color: rgba(136,13,209,1)'></td>
   <td width='1' style='background-color: rgba(135,0,186,1)'></td>
-  <td width='1' style='background-color: rgba(133,0,160,1)'></td>
+  <td width='1' style='background-color: rgba(133,0,159,1)'></td>
   <td width='1' style='background-color: rgba(130,28,132,1)'></td>
   <td width='1' style='background-color: rgba(174,146,165,1)'></td>
   <td width='1' style='background-color: rgba(223,216,219,1)'></td>
-  <td width='1' style='background-color: rgba(254,254,254,1)'></td>
+  <td width='1' style='background-color: rgba(254,253,253,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -1019,23 +1041,23 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(251,251,255,1)'></td>
-  <td width='1' style='background-color: rgba(240,240,252,1)'></td>
-  <td width='1' style='background-color: rgba(240,240,250,1)'></td>
+  <td width='1' style='background-color: rgba(239,240,252,1)'></td>
+  <td width='1' style='background-color: rgba(239,239,250,1)'></td>
   <td width='1' style='background-color: rgba(229,229,239,1)'></td>
-  <td width='1' style='background-color: rgba(222,222,230,1)'></td>
+  <td width='1' style='background-color: rgba(221,221,230,1)'></td>
   <td width='1' style='background-color: rgba(222,221,227,1)'></td>
-  <td width='1' style='background-color: rgba(222,221,224,1)'></td>
-  <td width='1' style='background-color: rgba(244,243,244,1)'></td>
+  <td width='1' style='background-color: rgba(222,221,223,1)'></td>
+  <td width='1' style='background-color: rgba(244,243,243,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -1084,9 +1106,9 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 </table>
-</body></html>
\ No newline at end of file
+</body></html>
--- a/modules/libpr0n/test/reftest/pngsuite-ancillary/ccwn3p08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-ancillary/ccwn3p08.html
@@ -1,9 +1,13 @@
-<html><body>
+<html>
+<head>
+<script src="lcms-asm-check.js" type="application/ecmascript"></script>
+</head>
+<body>
 <table cellpadding='0' cellspacing='0' width='32' height='32'>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -77,17 +81,17 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(228,255,232,1)'></td>
   <td width='1' style='background-color: rgba(163,255,190,1)'></td>
   <td width='1' style='background-color: rgba(114,255,164,1)'></td>
   <td width='1' style='background-color: rgba(163,255,187,1)'></td>
   <td width='1' style='background-color: rgba(216,255,222,1)'></td>
-  <td width='1' style='background-color: rgba(254,255,253,1)'></td>
+  <td width='1' style='background-color: rgba(253,255,253,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -105,21 +109,21 @@
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(189,255,220,1)'></td>
+  <td width='1' style='background-color: rgba(188,255,219,1)'></td>
   <td width='1' style='background-color: rgba(52,255,163,1)'></td>
   <td width='1' style='background-color: rgba(52,255,163,1)'></td>
-  <td width='1' style='background-color: rgba(70,255,144,1)'></td>
-  <td width='1' style='background-color: rgba(70,255,144,1)'></td>
+  <td width='1' style='background-color: rgba(71,255,144,1)'></td>
+  <td width='1' style='background-color: rgba(71,255,144,1)'></td>
   <td width='1' style='background-color: rgba(90,255,120,1)'></td>
   <td width='1' style='background-color: rgba(134,255,127,1)'></td>
   <td width='1' style='background-color: rgba(228,255,232,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -138,26 +142,26 @@
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(197,255,224,1)'></td>
-  <td width='1' style='background-color: rgba(63,255,173,1)'></td>
-  <td width='1' style='background-color: rgba(63,255,173,1)'></td>
-  <td width='1' style='background-color: rgba(100,255,166,1)'></td>
+  <td width='1' style='background-color: rgba(197,255,223,1)'></td>
+  <td width='1' style='background-color: rgba(64,255,173,1)'></td>
+  <td width='1' style='background-color: rgba(64,255,173,1)'></td>
+  <td width='1' style='background-color: rgba(101,255,166,1)'></td>
   <td width='1' style='background-color: rgba(86,255,159,1)'></td>
-  <td width='1' style='background-color: rgba(70,255,144,1)'></td>
+  <td width='1' style='background-color: rgba(71,255,144,1)'></td>
   <td width='1' style='background-color: rgba(90,255,120,1)'></td>
   <td width='1' style='background-color: rgba(90,255,120,1)'></td>
   <td width='1' style='background-color: rgba(127,255,95,1)'></td>
-  <td width='1' style='background-color: rgba(207,255,188,1)'></td>
+  <td width='1' style='background-color: rgba(206,255,188,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -175,25 +179,31 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(230,255,243,1)'></td>
   <td width='1' style='background-color: rgba(52,255,187,1)'></td>
   <td width='1' style='background-color: rgba(77,255,185,1)'></td>
   <td width='1' style='background-color: rgba(77,255,185,1)'></td>
-  <td width='1' style='background-color: rgba(100,255,166,1)'></td>
+  <td width='1' style='background-color: rgba(101,255,166,1)'></td>
   <td width='1' style='background-color: rgba(114,255,164,1)'></td>
   <td width='1' style='background-color: rgba(114,255,164,1)'></td>
   <td width='1' style='background-color: rgba(99,255,130,1)'></td>
   <td width='1' style='background-color: rgba(90,255,120,1)'></td>
   <td width='1' style='background-color: rgba(127,255,95,1)'></td>
-  <td width='1' style='background-color: rgba(164,255,91,1)'></td>
+<script type="application/ecmascript">
+if (lcms_has_assembly) {
+  document.write("<td width='1' style='background-color: rgba(163,255,91,1)'></td>");
+} else {
+  document.write("<td width='1' style='background-color: rgba(163,255,92,1)'></td>");
+}
+</script>
   <td width='1' style='background-color: rgba(199,255,148,1)'></td>
-  <td width='1' style='background-color: rgba(254,255,253,1)'></td>
+  <td width='1' style='background-color: rgba(253,255,253,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -214,19 +224,26 @@
   <td width='1' style='background-color: rgba(73,255,185,1)'></td>
   <td width='1' style='background-color: rgba(77,255,185,1)'></td>
   <td width='1' style='background-color: rgba(116,255,190,1)'></td>
   <td width='1' style='background-color: rgba(116,255,190,1)'></td>
   <td width='1' style='background-color: rgba(138,255,169,1)'></td>
   <td width='1' style='background-color: rgba(114,255,164,1)'></td>
   <td width='1' style='background-color: rgba(123,255,159,1)'></td>
   <td width='1' style='background-color: rgba(134,255,127,1)'></td>
-  <td width='1' style='background-color: rgba(153,255,103,1)'></td>
-  <td width='1' style='background-color: rgba(164,255,91,1)'></td>
-  <td width='1' style='background-color: rgba(164,255,91,1)'></td>
+  <td width='1' style='background-color: rgba(153,255,104,1)'></td>
+<script type="application/ecmascript">
+if (lcms_has_assembly) {
+  document.write("<td width='1' style='background-color: rgba(163,255,91,1)'></td>");
+  document.write("<td width='1' style='background-color: rgba(163,255,91,1)'></td>");
+} else {
+  document.write("<td width='1' style='background-color: rgba(163,255,92,1)'></td>");
+  document.write("<td width='1' style='background-color: rgba(163,255,92,1)'></td>");
+}
+</script>
   <td width='1' style='background-color: rgba(205,255,136,1)'></td>
   <td width='1' style='background-color: rgba(253,255,246,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -238,29 +255,35 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(220,255,240,1)'></td>
+  <td width='1' style='background-color: rgba(219,255,240,1)'></td>
   <td width='1' style='background-color: rgba(52,255,187,1)'></td>
   <td width='1' style='background-color: rgba(90,255,198,1)'></td>
   <td width='1' style='background-color: rgba(105,255,193,1)'></td>
   <td width='1' style='background-color: rgba(116,255,190,1)'></td>
   <td width='1' style='background-color: rgba(134,255,195,1)'></td>
   <td width='1' style='background-color: rgba(151,255,182,1)'></td>
   <td width='1' style='background-color: rgba(138,255,169,1)'></td>
   <td width='1' style='background-color: rgba(123,255,159,1)'></td>
   <td width='1' style='background-color: rgba(134,255,127,1)'></td>
-  <td width='1' style='background-color: rgba(164,255,91,1)'></td>
-  <td width='1' style='background-color: rgba(187,255,96,1)'></td>
-  <td width='1' style='background-color: rgba(187,255,96,1)'></td>
+<script type="application/ecmascript">
+if (lcms_has_assembly) {
+  document.write("<td width='1' style='background-color: rgba(163,255,91,1)'></td>");
+} else {
+  document.write("<td width='1' style='background-color: rgba(163,255,92,1)'></td>");
+}
+</script>
+  <td width='1' style='background-color: rgba(186,255,96,1)'></td>
+  <td width='1' style='background-color: rgba(186,255,96,1)'></td>
   <td width='1' style='background-color: rgba(195,255,79,1)'></td>
   <td width='1' style='background-color: rgba(217,255,115,1)'></td>
   <td width='1' style='background-color: rgba(253,255,246,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -283,20 +306,20 @@
   <td width='1' style='background-color: rgba(134,255,195,1)'></td>
   <td width='1' style='background-color: rgba(134,255,195,1)'></td>
   <td width='1' style='background-color: rgba(144,255,196,1)'></td>
   <td width='1' style='background-color: rgba(144,255,196,1)'></td>
   <td width='1' style='background-color: rgba(151,255,182,1)'></td>
   <td width='1' style='background-color: rgba(138,255,169,1)'></td>
   <td width='1' style='background-color: rgba(172,255,140,1)'></td>
   <td width='1' style='background-color: rgba(172,255,140,1)'></td>
-  <td width='1' style='background-color: rgba(187,255,96,1)'></td>
+  <td width='1' style='background-color: rgba(186,255,96,1)'></td>
   <td width='1' style='background-color: rgba(195,255,79,1)'></td>
-  <td width='1' style='background-color: rgba(209,255,68,1)'></td>
-  <td width='1' style='background-color: rgba(209,255,68,1)'></td>
+  <td width='1' style='background-color: rgba(209,255,69,1)'></td>
+  <td width='1' style='background-color: rgba(209,255,69,1)'></td>
   <td width='1' style='background-color: rgba(234,255,124,1)'></td>
   <td width='1' style='background-color: rgba(255,255,253,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -310,18 +333,18 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(230,255,243,1)'></td>
   <td width='1' style='background-color: rgba(68,255,207,1)'></td>
   <td width='1' style='background-color: rgba(91,255,202,1)'></td>
   <td width='1' style='background-color: rgba(111,255,208,1)'></td>
   <td width='1' style='background-color: rgba(137,255,206,1)'></td>
-  <td width='1' style='background-color: rgba(148,255,208,1)'></td>
-  <td width='1' style='background-color: rgba(148,255,208,1)'></td>
+  <td width='1' style='background-color: rgba(147,255,208,1)'></td>
+  <td width='1' style='background-color: rgba(147,255,208,1)'></td>
   <td width='1' style='background-color: rgba(163,255,190,1)'></td>
   <td width='1' style='background-color: rgba(163,255,190,1)'></td>
   <td width='1' style='background-color: rgba(163,255,187,1)'></td>
   <td width='1' style='background-color: rgba(172,255,140,1)'></td>
   <td width='1' style='background-color: rgba(172,255,140,1)'></td>
   <td width='1' style='background-color: rgba(205,255,136,1)'></td>
   <td width='1' style='background-color: rgba(209,255,121,1)'></td>
   <td width='1' style='background-color: rgba(217,255,115,1)'></td>
@@ -343,23 +366,23 @@
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(169,255,229,1)'></td>
   <td width='1' style='background-color: rgba(68,255,207,1)'></td>
   <td width='1' style='background-color: rgba(96,255,205,1)'></td>
   <td width='1' style='background-color: rgba(111,255,208,1)'></td>
-  <td width='1' style='background-color: rgba(148,255,208,1)'></td>
-  <td width='1' style='background-color: rgba(148,255,208,1)'></td>
+  <td width='1' style='background-color: rgba(147,255,208,1)'></td>
+  <td width='1' style='background-color: rgba(147,255,208,1)'></td>
   <td width='1' style='background-color: rgba(165,255,212,1)'></td>
   <td width='1' style='background-color: rgba(176,255,209,1)'></td>
   <td width='1' style='background-color: rgba(176,255,209,1)'></td>
   <td width='1' style='background-color: rgba(163,255,187,1)'></td>
-  <td width='1' style='background-color: rgba(187,255,179,1)'></td>
+  <td width='1' style='background-color: rgba(186,255,178,1)'></td>
   <td width='1' style='background-color: rgba(199,255,148,1)'></td>
   <td width='1' style='background-color: rgba(205,255,136,1)'></td>
   <td width='1' style='background-color: rgba(209,255,121,1)'></td>
   <td width='1' style='background-color: rgba(222,255,114,1)'></td>
   <td width='1' style='background-color: rgba(230,255,79,1)'></td>
   <td width='1' style='background-color: rgba(243,255,66,1)'></td>
   <td width='1' style='background-color: rgba(243,255,66,1)'></td>
   <td width='1' style='background-color: rgba(254,254,168,1)'></td>
@@ -373,543 +396,550 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(248,255,251,1)'></td>
-  <td width='1' style='background-color: rgba(68,255,217,1)'></td>
-  <td width='1' style='background-color: rgba(96,255,211,1)'></td>
+  <td width='1' style='background-color: rgba(68,255,216,1)'></td>
+  <td width='1' style='background-color: rgba(96,255,210,1)'></td>
   <td width='1' style='background-color: rgba(111,255,208,1)'></td>
   <td width='1' style='background-color: rgba(137,255,216,1)'></td>
   <td width='1' style='background-color: rgba(155,255,219,1)'></td>
-  <td width='1' style='background-color: rgba(169,255,216,1)'></td>
-  <td width='1' style='background-color: rgba(169,255,216,1)'></td>
-  <td width='1' style='background-color: rgba(189,255,220,1)'></td>
+  <td width='1' style='background-color: rgba(169,255,215,1)'></td>
+  <td width='1' style='background-color: rgba(169,255,215,1)'></td>
+  <td width='1' style='background-color: rgba(188,255,219,1)'></td>
   <td width='1' style='background-color: rgba(176,255,209,1)'></td>
   <td width='1' style='background-color: rgba(190,255,194,1)'></td>
-  <td width='1' style='background-color: rgba(194,255,181,1)'></td>
-  <td width='1' style='background-color: rgba(210,255,170,1)'></td>
-  <td width='1' style='background-color: rgba(210,255,170,1)'></td>
+  <td width='1' style='background-color: rgba(194,255,180,1)'></td>
+  <td width='1' style='background-color: rgba(209,255,170,1)'></td>
+  <td width='1' style='background-color: rgba(209,255,170,1)'></td>
   <td width='1' style='background-color: rgba(226,255,148,1)'></td>
   <td width='1' style='background-color: rgba(234,255,124,1)'></td>
   <td width='1' style='background-color: rgba(234,255,124,1)'></td>
-  <td width='1' style='background-color: rgba(252,254,95,1)'></td>
-  <td width='1' style='background-color: rgba(252,254,95,1)'></td>
+  <td width='1' style='background-color: rgba(251,254,95,1)'></td>
+  <td width='1' style='background-color: rgba(251,254,95,1)'></td>
   <td width='1' style='background-color: rgba(255,245,96,1)'></td>
-  <td width='1' style='background-color: rgba(255,249,185,1)'></td>
+  <td width='1' style='background-color: rgba(254,249,185,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(204,255,242,1)'></td>
-  <td width='1' style='background-color: rgba(68,255,217,1)'></td>
-  <td width='1' style='background-color: rgba(96,255,211,1)'></td>
+  <td width='1' style='background-color: rgba(203,255,242,1)'></td>
+  <td width='1' style='background-color: rgba(68,255,216,1)'></td>
+  <td width='1' style='background-color: rgba(96,255,210,1)'></td>
   <td width='1' style='background-color: rgba(123,255,220,1)'></td>
   <td width='1' style='background-color: rgba(137,255,216,1)'></td>
   <td width='1' style='background-color: rgba(155,255,219,1)'></td>
-  <td width='1' style='background-color: rgba(169,255,216,1)'></td>
-  <td width='1' style='background-color: rgba(189,255,220,1)'></td>
-  <td width='1' style='background-color: rgba(189,255,220,1)'></td>
-  <td width='1' style='background-color: rgba(197,255,224,1)'></td>
+  <td width='1' style='background-color: rgba(169,255,215,1)'></td>
+  <td width='1' style='background-color: rgba(188,255,219,1)'></td>
+  <td width='1' style='background-color: rgba(188,255,219,1)'></td>
+  <td width='1' style='background-color: rgba(197,255,223,1)'></td>
   <td width='1' style='background-color: rgba(190,255,194,1)'></td>
-  <td width='1' style='background-color: rgba(207,255,188,1)'></td>
-  <td width='1' style='background-color: rgba(210,255,170,1)'></td>
+  <td width='1' style='background-color: rgba(206,255,188,1)'></td>
+  <td width='1' style='background-color: rgba(209,255,170,1)'></td>
   <td width='1' style='background-color: rgba(226,255,148,1)'></td>
   <td width='1' style='background-color: rgba(226,255,148,1)'></td>
   <td width='1' style='background-color: rgba(241,255,147,1)'></td>
-  <td width='1' style='background-color: rgba(251,255,133,1)'></td>
-  <td width='1' style='background-color: rgba(252,254,95,1)'></td>
+  <td width='1' style='background-color: rgba(250,254,133,1)'></td>
+  <td width='1' style='background-color: rgba(251,254,95,1)'></td>
   <td width='1' style='background-color: rgba(255,245,96,1)'></td>
   <td width='1' style='background-color: rgba(255,225,95,1)'></td>
   <td width='1' style='background-color: rgba(255,225,95,1)'></td>
-  <td width='1' style='background-color: rgba(255,243,196,1)'></td>
+  <td width='1' style='background-color: rgba(255,242,196,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(170,255,234,1)'></td>
-  <td width='1' style='background-color: rgba(68,255,217,1)'></td>
+  <td width='1' style='background-color: rgba(170,255,233,1)'></td>
+  <td width='1' style='background-color: rgba(68,255,216,1)'></td>
   <td width='1' style='background-color: rgba(114,255,219,1)'></td>
-  <td width='1' style='background-color: rgba(134,255,223,1)'></td>
+  <td width='1' style='background-color: rgba(134,255,222,1)'></td>
   <td width='1' style='background-color: rgba(142,255,224,1)'></td>
   <td width='1' style='background-color: rgba(169,255,229,1)'></td>
-  <td width='1' style='background-color: rgba(179,255,232,1)'></td>
+  <td width='1' style='background-color: rgba(179,255,231,1)'></td>
   <td width='1' style='background-color: rgba(187,255,227,1)'></td>
-  <td width='1' style='background-color: rgba(197,255,224,1)'></td>
+  <td width='1' style='background-color: rgba(197,255,223,1)'></td>
   <td width='1' style='background-color: rgba(205,255,218,1)'></td>
   <td width='1' style='background-color: rgba(205,255,218,1)'></td>
-  <td width='1' style='background-color: rgba(218,255,191,1)'></td>
-  <td width='1' style='background-color: rgba(218,255,191,1)'></td>
+  <td width='1' style='background-color: rgba(218,255,190,1)'></td>
+  <td width='1' style='background-color: rgba(218,255,190,1)'></td>
   <td width='1' style='background-color: rgba(230,255,196,1)'></td>
   <td width='1' style='background-color: rgba(242,255,159,1)'></td>
   <td width='1' style='background-color: rgba(242,255,159,1)'></td>
-  <td width='1' style='background-color: rgba(251,255,133,1)'></td>
+  <td width='1' style='background-color: rgba(250,254,133,1)'></td>
   <td width='1' style='background-color: rgba(255,245,96,1)'></td>
-  <td width='1' style='background-color: rgba(255,233,116,1)'></td>
+  <td width='1' style='background-color: rgba(255,232,117,1)'></td>
   <td width='1' style='background-color: rgba(255,225,95,1)'></td>
-  <td width='1' style='background-color: rgba(255,207,93,1)'></td>
-  <td width='1' style='background-color: rgba(255,207,93,1)'></td>
+  <td width='1' style='background-color: rgba(255,206,93,1)'></td>
+  <td width='1' style='background-color: rgba(255,206,93,1)'></td>
   <td width='1' style='background-color: rgba(255,231,206,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(106,255,234,1)'></td>
-  <td width='1' style='background-color: rgba(68,255,217,1)'></td>
+  <td width='1' style='background-color: rgba(68,255,216,1)'></td>
   <td width='1' style='background-color: rgba(114,255,219,1)'></td>
-  <td width='1' style='background-color: rgba(134,255,223,1)'></td>
+  <td width='1' style='background-color: rgba(134,255,222,1)'></td>
   <td width='1' style='background-color: rgba(142,255,224,1)'></td>
   <td width='1' style='background-color: rgba(169,255,229,1)'></td>
   <td width='1' style='background-color: rgba(187,255,227,1)'></td>
-  <td width='1' style='background-color: rgba(202,255,231,1)'></td>
-  <td width='1' style='background-color: rgba(211,255,235,1)'></td>
-  <td width='1' style='background-color: rgba(211,255,235,1)'></td>
+  <td width='1' style='background-color: rgba(202,255,230,1)'></td>
+  <td width='1' style='background-color: rgba(211,255,234,1)'></td>
+  <td width='1' style='background-color: rgba(211,255,234,1)'></td>
   <td width='1' style='background-color: rgba(216,255,222,1)'></td>
-  <td width='1' style='background-color: rgba(225,255,195,1)'></td>
+  <td width='1' style='background-color: rgba(224,255,195,1)'></td>
   <td width='1' style='background-color: rgba(230,255,196,1)'></td>
   <td width='1' style='background-color: rgba(238,255,196,1)'></td>
   <td width='1' style='background-color: rgba(254,254,168,1)'></td>
   <td width='1' style='background-color: rgba(254,254,168,1)'></td>
   <td width='1' style='background-color: rgba(255,236,151,1)'></td>
   <td width='1' style='background-color: rgba(255,236,151,1)'></td>
-  <td width='1' style='background-color: rgba(255,233,116,1)'></td>
+  <td width='1' style='background-color: rgba(255,232,117,1)'></td>
   <td width='1' style='background-color: rgba(255,212,119,1)'></td>
-  <td width='1' style='background-color: rgba(255,207,93,1)'></td>
-  <td width='1' style='background-color: rgba(255,197,91,1)'></td>
+  <td width='1' style='background-color: rgba(255,206,93,1)'></td>
+  <td width='1' style='background-color: rgba(255,197,92,1)'></td>
   <td width='1' style='background-color: rgba(255,179,66,1)'></td>
-  <td width='1' style='background-color: rgba(255,236,226,1)'></td>
+  <td width='1' style='background-color: rgba(254,236,226,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(234,255,248,1)'></td>
-  <td width='1' style='background-color: rgba(61,255,231,1)'></td>
+  <td width='1' style='background-color: rgba(61,255,230,1)'></td>
   <td width='1' style='background-color: rgba(106,255,234,1)'></td>
   <td width='1' style='background-color: rgba(106,255,234,1)'></td>
   <td width='1' style='background-color: rgba(142,255,224,1)'></td>
   <td width='1' style='background-color: rgba(169,255,229,1)'></td>
-  <td width='1' style='background-color: rgba(179,255,232,1)'></td>
+  <td width='1' style='background-color: rgba(179,255,231,1)'></td>
   <td width='1' style='background-color: rgba(188,255,236,1)'></td>
-  <td width='1' style='background-color: rgba(202,255,231,1)'></td>
-  <td width='1' style='background-color: rgba(211,255,235,1)'></td>
-  <td width='1' style='background-color: rgba(220,255,240,1)'></td>
+  <td width='1' style='background-color: rgba(202,255,230,1)'></td>
+  <td width='1' style='background-color: rgba(211,255,234,1)'></td>
+  <td width='1' style='background-color: rgba(219,255,240,1)'></td>
   <td width='1' style='background-color: rgba(228,255,232,1)'></td>
   <td width='1' style='background-color: rgba(230,255,196,1)'></td>
   <td width='1' style='background-color: rgba(238,255,196,1)'></td>
   <td width='1' style='background-color: rgba(246,255,196,1)'></td>
-  <td width='1' style='background-color: rgba(255,249,185,1)'></td>
-  <td width='1' style='background-color: rgba(255,242,170,1)'></td>
-  <td width='1' style='background-color: rgba(255,242,170,1)'></td>
+  <td width='1' style='background-color: rgba(254,249,185,1)'></td>
+  <td width='1' style='background-color: rgba(255,241,170,1)'></td>
+  <td width='1' style='background-color: rgba(255,241,170,1)'></td>
   <td width='1' style='background-color: rgba(255,236,151,1)'></td>
   <td width='1' style='background-color: rgba(255,217,125,1)'></td>
   <td width='1' style='background-color: rgba(255,212,119,1)'></td>
-  <td width='1' style='background-color: rgba(255,197,91,1)'></td>
-  <td width='1' style='background-color: rgba(255,197,91,1)'></td>
+  <td width='1' style='background-color: rgba(255,197,92,1)'></td>
+  <td width='1' style='background-color: rgba(255,197,92,1)'></td>
   <td width='1' style='background-color: rgba(255,179,66,1)'></td>
   <td width='1' style='background-color: rgba(255,176,88,1)'></td>
-  <td width='1' style='background-color: rgba(255,236,226,1)'></td>
+  <td width='1' style='background-color: rgba(254,236,226,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(202,255,248,1)'></td>
-  <td width='1' style='background-color: rgba(61,255,231,1)'></td>
+  <td width='1' style='background-color: rgba(202,255,247,1)'></td>
+  <td width='1' style='background-color: rgba(61,255,230,1)'></td>
   <td width='1' style='background-color: rgba(106,255,234,1)'></td>
-  <td width='1' style='background-color: rgba(135,255,239,1)'></td>
+  <td width='1' style='background-color: rgba(135,255,238,1)'></td>
   <td width='1' style='background-color: rgba(154,255,238,1)'></td>
   <td width='1' style='background-color: rgba(167,255,238,1)'></td>
-  <td width='1' style='background-color: rgba(185,255,240,1)'></td>
+  <td width='1' style='background-color: rgba(185,255,239,1)'></td>
   <td width='1' style='background-color: rgba(188,255,236,1)'></td>
-  <td width='1' style='background-color: rgba(204,255,242,1)'></td>
-  <td width='1' style='background-color: rgba(220,255,240,1)'></td>
+  <td width='1' style='background-color: rgba(203,255,242,1)'></td>
+  <td width='1' style='background-color: rgba(219,255,240,1)'></td>
   <td width='1' style='background-color: rgba(230,255,243,1)'></td>
-  <td width='1' style='background-color: rgba(235,255,234,1)'></td>
+  <td width='1' style='background-color: rgba(235,255,233,1)'></td>
   <td width='1' style='background-color: rgba(243,255,228,1)'></td>
-  <td width='1' style='background-color: rgba(253,255,215,1)'></td>
-  <td width='1' style='background-color: rgba(253,255,215,1)'></td>
-  <td width='1' style='background-color: rgba(255,243,196,1)'></td>
+  <td width='1' style='background-color: rgba(253,254,214,1)'></td>
+  <td width='1' style='background-color: rgba(253,254,214,1)'></td>
+  <td width='1' style='background-color: rgba(255,242,196,1)'></td>
   <td width='1' style='background-color: rgba(255,229,185,1)'></td>
   <td width='1' style='background-color: rgba(255,229,185,1)'></td>
   <td width='1' style='background-color: rgba(255,220,184,1)'></td>
-  <td width='1' style='background-color: rgba(255,200,149,1)'></td>
-  <td width='1' style='background-color: rgba(255,200,149,1)'></td>
-  <td width='1' style='background-color: rgba(255,197,91,1)'></td>
+  <td width='1' style='background-color: rgba(255,199,148,1)'></td>
+  <td width='1' style='background-color: rgba(255,199,148,1)'></td>
+  <td width='1' style='background-color: rgba(255,197,92,1)'></td>
   <td width='1' style='background-color: rgba(255,176,88,1)'></td>
   <td width='1' style='background-color: rgba(255,176,88,1)'></td>
   <td width='1' style='background-color: rgba(255,151,106,1)'></td>
   <td width='1' style='background-color: rgba(255,151,106,1)'></td>
-  <td width='1' style='background-color: rgba(255,236,226,1)'></td>
+  <td width='1' style='background-color: rgba(254,236,226,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(169,254,251,1)'></td>
-  <td width='1' style='background-color: rgba(66,255,246,1)'></td>
-  <td width='1' style='background-color: rgba(107,255,239,1)'></td>
-  <td width='1' style='background-color: rgba(135,255,239,1)'></td>
+  <td width='1' style='background-color: rgba(66,254,246,1)'></td>
+  <td width='1' style='background-color: rgba(108,255,239,1)'></td>
+  <td width='1' style='background-color: rgba(135,255,238,1)'></td>
   <td width='1' style='background-color: rgba(154,255,238,1)'></td>
   <td width='1' style='background-color: rgba(167,255,238,1)'></td>
-  <td width='1' style='background-color: rgba(185,255,240,1)'></td>
-  <td width='1' style='background-color: rgba(199,255,243,1)'></td>
-  <td width='1' style='background-color: rgba(213,254,246,1)'></td>
-  <td width='1' style='background-color: rgba(227,255,249,1)'></td>
+  <td width='1' style='background-color: rgba(185,255,239,1)'></td>
+  <td width='1' style='background-color: rgba(199,255,242,1)'></td>
+  <td width='1' style='background-color: rgba(213,253,246,1)'></td>
+  <td width='1' style='background-color: rgba(227,255,248,1)'></td>
   <td width='1' style='background-color: rgba(234,255,248,1)'></td>
   <td width='1' style='background-color: rgba(237,253,249,1)'></td>
   <td width='1' style='background-color: rgba(243,255,228,1)'></td>
   <td width='1' style='background-color: rgba(255,248,223,1)'></td>
-  <td width='1' style='background-color: rgba(253,255,215,1)'></td>
+  <td width='1' style='background-color: rgba(253,254,214,1)'></td>
   <td width='1' style='background-color: rgba(255,231,206,1)'></td>
   <td width='1' style='background-color: rgba(255,229,185,1)'></td>
   <td width='1' style='background-color: rgba(255,220,184,1)'></td>
   <td width='1' style='background-color: rgba(255,220,184,1)'></td>
-  <td width='1' style='background-color: rgba(255,200,149,1)'></td>
-  <td width='1' style='background-color: rgba(255,189,149,1)'></td>
-  <td width='1' style='background-color: rgba(255,178,149,1)'></td>
-  <td width='1' style='background-color: rgba(255,168,140,1)'></td>
+  <td width='1' style='background-color: rgba(255,199,148,1)'></td>
+  <td width='1' style='background-color: rgba(255,189,148,1)'></td>
+  <td width='1' style='background-color: rgba(255,178,148,1)'></td>
+  <td width='1' style='background-color: rgba(255,167,140,1)'></td>
   <td width='1' style='background-color: rgba(255,151,106,1)'></td>
   <td width='1' style='background-color: rgba(255,132,95,1)'></td>
   <td width='1' style='background-color: rgba(255,132,95,1)'></td>
   <td width='1' style='background-color: rgba(255,132,95,1)'></td>
   <td width='1' style='background-color: rgba(254,241,242,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(136,255,249,1)'></td>
+  <td width='1' style='background-color: rgba(136,255,248,1)'></td>
   <td width='1' style='background-color: rgba(79,255,247,1)'></td>
   <td width='1' style='background-color: rgba(98,255,245,1)'></td>
-  <td width='1' style='background-color: rgba(136,255,249,1)'></td>
-  <td width='1' style='background-color: rgba(155,255,246,1)'></td>
+  <td width='1' style='background-color: rgba(136,255,248,1)'></td>
+  <td width='1' style='background-color: rgba(154,255,246,1)'></td>
   <td width='1' style='background-color: rgba(169,254,251,1)'></td>
-  <td width='1' style='background-color: rgba(185,255,240,1)'></td>
-  <td width='1' style='background-color: rgba(202,255,248,1)'></td>
-  <td width='1' style='background-color: rgba(213,254,246,1)'></td>
-  <td width='1' style='background-color: rgba(227,255,249,1)'></td>
+  <td width='1' style='background-color: rgba(185,255,239,1)'></td>
+  <td width='1' style='background-color: rgba(202,255,247,1)'></td>
+  <td width='1' style='background-color: rgba(213,253,246,1)'></td>
+  <td width='1' style='background-color: rgba(227,255,248,1)'></td>
   <td width='1' style='background-color: rgba(237,253,249,1)'></td>
   <td width='1' style='background-color: rgba(248,255,251,1)'></td>
   <td width='1' style='background-color: rgba(253,255,246,1)'></td>
   <td width='1' style='background-color: rgba(255,248,223,1)'></td>
-  <td width='1' style='background-color: rgba(255,236,226,1)'></td>
+  <td width='1' style='background-color: rgba(254,236,226,1)'></td>
   <td width='1' style='background-color: rgba(255,231,206,1)'></td>
   <td width='1' style='background-color: rgba(255,231,206,1)'></td>
   <td width='1' style='background-color: rgba(255,212,196,1)'></td>
   <td width='1' style='background-color: rgba(255,202,198,1)'></td>
   <td width='1' style='background-color: rgba(255,185,155,1)'></td>
   <td width='1' style='background-color: rgba(255,185,155,1)'></td>
-  <td width='1' style='background-color: rgba(255,168,140,1)'></td>
-  <td width='1' style='background-color: rgba(255,168,140,1)'></td>
+  <td width='1' style='background-color: rgba(255,167,140,1)'></td>
+  <td width='1' style='background-color: rgba(255,167,140,1)'></td>
   <td width='1' style='background-color: rgba(255,108,125,1)'></td>
   <td width='1' style='background-color: rgba(255,108,125,1)'></td>
   <td width='1' style='background-color: rgba(255,88,115,1)'></td>
   <td width='1' style='background-color: rgba(255,88,115,1)'></td>
   <td width='1' style='background-color: rgba(255,108,125,1)'></td>
-  <td width='1' style='background-color: rgba(255,242,242,1)'></td>
+  <td width='1' style='background-color: rgba(255,241,242,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(79,255,247,1)'></td>
   <td width='1' style='background-color: rgba(79,255,247,1)'></td>
-  <td width='1' style='background-color: rgba(109,250,255,1)'></td>
-  <td width='1' style='background-color: rgba(136,255,249,1)'></td>
-  <td width='1' style='background-color: rgba(155,255,246,1)'></td>
+  <td width='1' style='background-color: rgba(109,250,254,1)'></td>
+  <td width='1' style='background-color: rgba(136,255,248,1)'></td>
+  <td width='1' style='background-color: rgba(154,255,246,1)'></td>
   <td width='1' style='background-color: rgba(169,254,251,1)'></td>
   <td width='1' style='background-color: rgba(185,251,255,1)'></td>
-  <td width='1' style='background-color: rgba(202,255,248,1)'></td>
-  <td width='1' style='background-color: rgba(222,252,255,1)'></td>
-  <td width='1' style='background-color: rgba(227,255,249,1)'></td>
-  <td width='1' style='background-color: rgba(241,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(253,254,254,1)'></td>
-  <td width='1' style='background-color: rgba(255,249,250,1)'></td>
-  <td width='1' style='background-color: rgba(255,242,242,1)'></td>
-  <td width='1' style='background-color: rgba(255,230,238,1)'></td>
-  <td width='1' style='background-color: rgba(255,230,238,1)'></td>
+  <td width='1' style='background-color: rgba(202,255,247,1)'></td>
+  <td width='1' style='background-color: rgba(222,251,255,1)'></td>
+  <td width='1' style='background-color: rgba(227,255,248,1)'></td>
+  <td width='1' style='background-color: rgba(241,255,254,1)'></td>
+  <td width='1' style='background-color: rgba(253,253,254,1)'></td>
+  <td width='1' style='background-color: rgba(255,248,249,1)'></td>
+  <td width='1' style='background-color: rgba(255,241,242,1)'></td>
+  <td width='1' style='background-color: rgba(255,229,238,1)'></td>
+  <td width='1' style='background-color: rgba(255,229,238,1)'></td>
   <td width='1' style='background-color: rgba(255,198,227,1)'></td>
-  <td width='1' style='background-color: rgba(255,191,216,1)'></td>
+  <td width='1' style='background-color: rgba(255,191,215,1)'></td>
   <td width='1' style='background-color: rgba(255,202,198,1)'></td>
   <td width='1' style='background-color: rgba(246,185,205,1)'></td>
-  <td width='1' style='background-color: rgba(255,149,181,1)'></td>
-  <td width='1' style='background-color: rgba(255,149,181,1)'></td>
+  <td width='1' style='background-color: rgba(255,149,180,1)'></td>
+  <td width='1' style='background-color: rgba(255,149,180,1)'></td>
   <td width='1' style='background-color: rgba(255,135,167,1)'></td>
   <td width='1' style='background-color: rgba(255,135,167,1)'></td>
-  <td width='1' style='background-color: rgba(255,126,164,1)'></td>
+  <td width='1' style='background-color: rgba(255,126,163,1)'></td>
   <td width='1' style='background-color: rgba(255,77,134,1)'></td>
   <td width='1' style='background-color: rgba(255,77,134,1)'></td>
-  <td width='1' style='background-color: rgba(255,55,135,1)'></td>
-  <td width='1' style='background-color: rgba(255,126,164,1)'></td>
-  <td width='1' style='background-color: rgba(255,249,250,1)'></td>
+  <td width='1' style='background-color: rgba(255,56,135,1)'></td>
+  <td width='1' style='background-color: rgba(255,126,163,1)'></td>
+  <td width='1' style='background-color: rgba(255,248,249,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
-  <td width='1' style='background-color: rgba(241,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(79,250,255,1)'></td>
-  <td width='1' style='background-color: rgba(79,250,255,1)'></td>
-  <td width='1' style='background-color: rgba(109,250,255,1)'></td>
-  <td width='1' style='background-color: rgba(133,249,255,1)'></td>
+  <td width='1' style='background-color: rgba(241,255,254,1)'></td>
+  <td width='1' style='background-color: rgba(79,250,254,1)'></td>
+  <td width='1' style='background-color: rgba(79,250,254,1)'></td>
+  <td width='1' style='background-color: rgba(109,250,254,1)'></td>
+  <td width='1' style='background-color: rgba(133,249,254,1)'></td>
   <td width='1' style='background-color: rgba(169,254,251,1)'></td>
   <td width='1' style='background-color: rgba(185,251,255,1)'></td>
   <td width='1' style='background-color: rgba(185,251,255,1)'></td>
   <td width='1' style='background-color: rgba(203,248,255,1)'></td>
-  <td width='1' style='background-color: rgba(222,252,255,1)'></td>
-  <td width='1' style='background-color: rgba(222,252,255,1)'></td>
-  <td width='1' style='background-color: rgba(247,249,255,1)'></td>
+  <td width='1' style='background-color: rgba(222,251,255,1)'></td>
+  <td width='1' style='background-color: rgba(222,251,255,1)'></td>
+  <td width='1' style='background-color: rgba(246,248,255,1)'></td>
   <td width='1' style='background-color: rgba(251,240,247,1)'></td>
   <td width='1' style='background-color: rgba(255,234,244,1)'></td>
-  <td width='1' style='background-color: rgba(255,230,238,1)'></td>
-  <td width='1' style='background-color: rgba(251,223,240,1)'></td>
-  <td width='1' style='background-color: rgba(255,205,234,1)'></td>
-  <td width='1' style='background-color: rgba(255,205,234,1)'></td>
+  <td width='1' style='background-color: rgba(255,229,238,1)'></td>
+  <td width='1' style='background-color: rgba(251,222,240,1)'></td>
+  <td width='1' style='background-color: rgba(255,205,233,1)'></td>
+  <td width='1' style='background-color: rgba(255,205,233,1)'></td>
   <td width='1' style='background-color: rgba(255,198,227,1)'></td>
-  <td width='1' style='background-color: rgba(255,191,216,1)'></td>
-  <td width='1' style='background-color: rgba(255,191,216,1)'></td>
-  <td width='1' style='background-color: rgba(255,164,211,1)'></td>
-  <td width='1' style='background-color: rgba(255,164,211,1)'></td>
-  <td width='1' style='background-color: rgba(255,149,181,1)'></td>
-  <td width='1' style='background-color: rgba(255,149,181,1)'></td>
+  <td width='1' style='background-color: rgba(255,191,215,1)'></td>
+  <td width='1' style='background-color: rgba(255,191,215,1)'></td>
+  <td width='1' style='background-color: rgba(255,163,210,1)'></td>
+  <td width='1' style='background-color: rgba(255,163,210,1)'></td>
+  <td width='1' style='background-color: rgba(255,149,180,1)'></td>
+  <td width='1' style='background-color: rgba(255,149,180,1)'></td>
   <td width='1' style='background-color: rgba(255,135,167,1)'></td>
-  <td width='1' style='background-color: rgba(255,118,168,1)'></td>
+  <td width='1' style='background-color: rgba(255,118,167,1)'></td>
   <td width='1' style='background-color: rgba(255,98,162,1)'></td>
   <td width='1' style='background-color: rgba(255,77,134,1)'></td>
-  <td width='1' style='background-color: rgba(255,55,135,1)'></td>
+  <td width='1' style='background-color: rgba(255,56,135,1)'></td>
   <td width='1' style='background-color: rgba(255,135,167,1)'></td>
-  <td width='1' style='background-color: rgba(255,249,250,1)'></td>
+  <td width='1' style='background-color: rgba(255,248,249,1)'></td>
 </tr>
 <tr height='1'>
-  <td width='1' style='background-color: rgba(222,252,255,1)'></td>
-  <td width='1' style='background-color: rgba(79,250,255,1)'></td>
-  <td width='1' style='background-color: rgba(109,250,255,1)'></td>
-  <td width='1' style='background-color: rgba(133,249,255,1)'></td>
+  <td width='1' style='background-color: rgba(222,251,255,1)'></td>
+  <td width='1' style='background-color: rgba(79,250,254,1)'></td>
+  <td width='1' style='background-color: rgba(109,250,254,1)'></td>
+  <td width='1' style='background-color: rgba(133,249,254,1)'></td>
   <td width='1' style='background-color: rgba(145,242,255,1)'></td>
   <td width='1' style='background-color: rgba(168,242,255,1)'></td>
   <td width='1' style='background-color: rgba(168,242,255,1)'></td>
   <td width='1' style='background-color: rgba(197,243,255,1)'></td>
   <td width='1' style='background-color: rgba(205,241,255,1)'></td>
   <td width='1' style='background-color: rgba(221,241,255,1)'></td>
-  <td width='1' style='background-color: rgba(229,233,247,1)'></td>
-  <td width='1' style='background-color: rgba(240,240,251,1)'></td>
-  <td width='1' style='background-color: rgba(251,217,240,1)'></td>
+  <td width='1' style='background-color: rgba(229,232,247,1)'></td>
+  <td width='1' style='background-color: rgba(239,239,251,1)'></td>
+  <td width='1' style='background-color: rgba(251,216,240,1)'></td>
   <td width='1' style='background-color: rgba(255,212,239,1)'></td>
-  <td width='1' style='background-color: rgba(255,205,234,1)'></td>
+  <td width='1' style='background-color: rgba(255,205,233,1)'></td>
   <td width='1' style='background-color: rgba(255,198,227,1)'></td>
-  <td width='1' style='background-color: rgba(254,189,233,1)'></td>
+  <td width='1' style='background-color: rgba(254,189,232,1)'></td>
   <td width='1' style='background-color: rgba(255,177,227,1)'></td>
-  <td width='1' style='background-color: rgba(255,171,215,1)'></td>
-  <td width='1' style='background-color: rgba(255,164,211,1)'></td>
+  <td width='1' style='background-color: rgba(255,170,215,1)'></td>
+  <td width='1' style='background-color: rgba(255,163,210,1)'></td>
   <td width='1' style='background-color: rgba(255,156,211,1)'></td>
   <td width='1' style='background-color: rgba(255,137,187,1)'></td>
   <td width='1' style='background-color: rgba(255,137,187,1)'></td>
   <td width='1' style='background-color: rgba(255,137,187,1)'></td>
   <td width='1' style='background-color: rgba(255,112,170,1)'></td>
   <td width='1' style='background-color: rgba(255,112,170,1)'></td>
   <td width='1' style='background-color: rgba(255,98,162,1)'></td>
   <td width='1' style='background-color: rgba(255,98,162,1)'></td>
-  <td width='1' style='background-color: rgba(255,55,160,1)'></td>
-  <td width='1' style='background-color: rgba(255,55,135,1)'></td>
-  <td width='1' style='background-color: rgba(255,149,181,1)'></td>
+  <td width='1' style='background-color: rgba(255,56,159,1)'></td>
+  <td width='1' style='background-color: rgba(255,56,135,1)'></td>
+  <td width='1' style='background-color: rgba(255,149,180,1)'></td>
   <td width='1' style='background-color: rgba(255,234,244,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(203,248,255,1)'></td>
-  <td width='1' style='background-color: rgba(79,235,255,1)'></td>
+  <td width='1' style='background-color: rgba(79,234,255,1)'></td>
   <td width='1' style='background-color: rgba(114,239,255,1)'></td>
   <td width='1' style='background-color: rgba(114,239,255,1)'></td>
   <td width='1' style='background-color: rgba(145,242,255,1)'></td>
   <td width='1' style='background-color: rgba(168,242,255,1)'></td>
   <td width='1' style='background-color: rgba(173,230,255,1)'></td>
   <td width='1' style='background-color: rgba(197,230,255,1)'></td>
   <td width='1' style='background-color: rgba(197,230,255,1)'></td>
   <td width='1' style='background-color: rgba(216,226,255,1)'></td>
-  <td width='1' style='background-color: rgba(243,210,240,1)'></td>
-  <td width='1' style='background-color: rgba(243,210,240,1)'></td>
+  <td width='1' style='background-color: rgba(242,209,239,1)'></td>
+  <td width='1' style='background-color: rgba(242,209,239,1)'></td>
   <td width='1' style='background-color: rgba(255,212,239,1)'></td>
   <td width='1' style='background-color: rgba(255,185,234,1)'></td>
   <td width='1' style='background-color: rgba(255,185,234,1)'></td>
   <td width='1' style='background-color: rgba(255,177,227,1)'></td>
-  <td width='1' style='background-color: rgba(255,171,215,1)'></td>
-  <td width='1' style='background-color: rgba(255,149,216,1)'></td>
-  <td width='1' style='background-color: rgba(255,149,216,1)'></td>
-  <td width='1' style='background-color: rgba(255,135,214,1)'></td>
+  <td width='1' style='background-color: rgba(255,170,215,1)'></td>
+  <td width='1' style='background-color: rgba(255,148,216,1)'></td>
+  <td width='1' style='background-color: rgba(255,148,216,1)'></td>
+  <td width='1' style='background-color: rgba(255,135,213,1)'></td>
   <td width='1' style='background-color: rgba(255,120,196,1)'></td>
   <td width='1' style='background-color: rgba(255,120,196,1)'></td>
-  <td width='1' style='background-color: rgba(255,91,192,1)'></td>
+  <td width='1' style='background-color: rgba(255,92,192,1)'></td>
   <td width='1' style='background-color: rgba(255,66,180,1)'></td>
   <td width='1' style='background-color: rgba(255,66,180,1)'></td>
-  <td width='1' style='background-color: rgba(255,55,160,1)'></td>
-  <td width='1' style='background-color: rgba(255,55,160,1)'></td>
+  <td width='1' style='background-color: rgba(255,56,159,1)'></td>
+  <td width='1' style='background-color: rgba(255,56,159,1)'></td>
   <td width='1' style='background-color: rgba(255,98,162,1)'></td>
   <td width='1' style='background-color: rgba(246,185,205,1)'></td>
   <td width='1' style='background-color: rgba(254,241,242,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(197,243,255,1)'></td>
-  <td width='1' style='background-color: rgba(79,235,255,1)'></td>
-  <td width='1' style='background-color: rgba(79,235,255,1)'></td>
+  <td width='1' style='background-color: rgba(79,234,255,1)'></td>
+  <td width='1' style='background-color: rgba(79,234,255,1)'></td>
   <td width='1' style='background-color: rgba(138,226,255,1)'></td>
   <td width='1' style='background-color: rgba(138,226,255,1)'></td>
   <td width='1' style='background-color: rgba(173,230,255,1)'></td>
   <td width='1' style='background-color: rgba(173,230,255,1)'></td>
   <td width='1' style='background-color: rgba(197,230,255,1)'></td>
   <td width='1' style='background-color: rgba(188,211,255,1)'></td>
   <td width='1' style='background-color: rgba(226,188,238,1)'></td>
-  <td width='1' style='background-color: rgba(235,172,255,1)'></td>
-  <td width='1' style='background-color: rgba(235,172,255,1)'></td>
-  <td width='1' style='background-color: rgba(253,165,248,1)'></td>
-  <td width='1' style='background-color: rgba(253,165,248,1)'></td>
+  <td width='1' style='background-color: rgba(234,172,255,1)'></td>
+  <td width='1' style='background-color: rgba(234,172,255,1)'></td>
+  <td width='1' style='background-color: rgba(253,165,247,1)'></td>
+  <td width='1' style='background-color: rgba(253,165,247,1)'></td>
   <td width='1' style='background-color: rgba(255,136,236,1)'></td>
   <td width='1' style='background-color: rgba(255,136,236,1)'></td>
   <td width='1' style='background-color: rgba(255,121,225,1)'></td>
-  <td width='1' style='background-color: rgba(252,125,213,1)'></td>
+  <td width='1' style='background-color: rgba(251,125,213,1)'></td>
   <td width='1' style='background-color: rgba(255,108,208,1)'></td>
   <td width='1' style='background-color: rgba(255,108,208,1)'></td>
-  <td width='1' style='background-color: rgba(255,91,192,1)'></td>
+  <td width='1' style='background-color: rgba(255,92,192,1)'></td>
   <td width='1' style='background-color: rgba(255,66,180,1)'></td>
   <td width='1' style='background-color: rgba(255,66,180,1)'></td>
-  <td width='1' style='background-color: rgba(252,28,177,1)'></td>
-  <td width='1' style='background-color: rgba(243,21,160,1)'></td>
-  <td width='1' style='background-color: rgba(255,149,181,1)'></td>
-  <td width='1' style='background-color: rgba(255,205,234,1)'></td>
-  <td width='1' style='background-color: rgba(255,254,254,1)'></td>
+  <td width='1' style='background-color: rgba(251,28,177,1)'></td>
+  <td width='1' style='background-color: rgba(242,22,159,1)'></td>
+  <td width='1' style='background-color: rgba(255,149,180,1)'></td>
+  <td width='1' style='background-color: rgba(255,205,233,1)'></td>
+  <td width='1' style='background-color: rgba(254,253,254,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(197,243,255,1)'></td>
-  <td width='1' style='background-color: rgba(101,222,255,1)'></td>
-  <td width='1' style='background-color: rgba(101,222,255,1)'></td>
+  <td width='1' style='background-color: rgba(101,221,255,1)'></td>
+  <td width='1' style='background-color: rgba(101,221,255,1)'></td>
   <td width='1' style='background-color: rgba(138,226,255,1)'></td>
   <td width='1' style='background-color: rgba(138,226,255,1)'></td>
-  <td width='1' style='background-color: rgba(151,211,255,1)'></td>
+  <td width='1' style='background-color: rgba(151,210,255,1)'></td>
   <td width='1' style='background-color: rgba(188,211,255,1)'></td>
   <td width='1' style='background-color: rgba(188,211,255,1)'></td>
   <td width='1' style='background-color: rgba(178,173,255,1)'></td>
-  <td width='1' style='background-color: rgba(235,172,255,1)'></td>
-  <td width='1' style='background-color: rgba(235,172,255,1)'></td>
-  <td width='1' style='background-color: rgba(253,165,248,1)'></td>
-  <td width='1' style='background-color: rgba(253,165,248,1)'></td>
+  <td width='1' style='background-color: rgba(234,172,255,1)'></td>
+  <td width='1' style='background-color: rgba(234,172,255,1)'></td>
+  <td width='1' style='background-color: rgba(253,165,247,1)'></td>
+  <td width='1' style='background-color: rgba(253,165,247,1)'></td>
   <td width='1' style='background-color: rgba(255,136,236,1)'></td>
   <td width='1' style='background-color: rgba(255,136,236,1)'></td>
   <td width='1' style='background-color: rgba(255,121,225,1)'></td>
   <td width='1' style='background-color: rgba(255,90,215,1)'></td>
   <td width='1' style='background-color: rgba(255,90,215,1)'></td>
-  <td width='1' style='background-color: rgba(255,58,201,1)'></td>
-  <td width='1' style='background-color: rgba(255,58,201,1)'></td>
-  <td width='1' style='background-color: rgba(252,28,177,1)'></td>
-  <td width='1' style='background-color: rgba(243,21,160,1)'></td>
-  <td width='1' style='background-color: rgba(230,12,174,1)'></td>
+  <td width='1' style='background-color: rgba(255,59,200,1)'></td>
+  <td width='1' style='background-color: rgba(255,59,200,1)'></td>
+  <td width='1' style='background-color: rgba(251,28,177,1)'></td>
+  <td width='1' style='background-color: rgba(242,22,159,1)'></td>
+  <td width='1' style='background-color: rgba(229,13,174,1)'></td>
   <td width='1' style='background-color: rgba(246,185,205,1)'></td>
   <td width='1' style='background-color: rgba(254,241,242,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(205,241,255,1)'></td>
-  <td width='1' style='background-color: rgba(83,212,255,1)'></td>
-  <td width='1' style='background-color: rgba(83,212,255,1)'></td>
+<script type="application/ecmascript">
+if (lcms_has_assembly) {
+  document.write("<td width='1' style='background-color: rgba(83,212,255,1)'></td>");
+  document.write("<td width='1' style='background-color: rgba(83,212,255,1)'></td>");
+} else {
+  document.write("<td width='1' style='background-color: rgba(83,211,255,1)'></td>");
+  document.write("<td width='1' style='background-color: rgba(83,211,255,1)'></td>");
+}
+</script>
   <td width='1' style='background-color: rgba(98,205,255,1)'></td>
-  <td width='1' style='background-color: rgba(151,211,255,1)'></td>
-  <td width='1' style='background-color: rgba(160,194,255,1)'></td>
-  <td width='1' style='background-color: rgba(160,194,255,1)'></td>
+  <td width='1' style='background-color: rgba(151,210,255,1)'></td>
+  <td width='1' style='background-color: rgba(159,194,255,1)'></td>
+  <td width='1' style='background-color: rgba(159,194,255,1)'></td>
   <td width='1' style='background-color: rgba(178,173,255,1)'></td>
   <td width='1' style='background-color: rgba(219,126,255,1)'></td>
   <td width='1' style='background-color: rgba(219,126,255,1)'></td>
   <td width='1' style='background-color: rgba(241,122,255,1)'></td>
   <td width='1' style='background-color: rgba(241,122,255,1)'></td>
   <td width='1' style='background-color: rgba(241,122,255,1)'></td>
-  <td width='1' style='background-color: rgba(255,85,238,1)'></td>
-  <td width='1' style='background-color: rgba(255,85,238,1)'></td>
-  <td width='1' style='background-color: rgba(255,53,221,1)'></td>
-  <td width='1' style='background-color: rgba(255,53,221,1)'></td>
-  <td width='1' style='background-color: rgba(247,12,210,1)'></td>
-  <td width='1' style='background-color: rgba(230,12,174,1)'></td>
-  <td width='1' style='background-color: rgba(210,0,168,1)'></td>
-  <td width='1' style='background-color: rgba(245,148,155,1)'></td>
-  <td width='1' style='background-color: rgba(229,214,233,1)'></td>
-  <td width='1' style='background-color: rgba(255,254,254,1)'></td>
+  <td width='1' style='background-color: rgba(254,85,238,1)'></td>
+  <td width='1' style='background-color: rgba(254,85,238,1)'></td>
+  <td width='1' style='background-color: rgba(254,53,220,1)'></td>
+  <td width='1' style='background-color: rgba(254,53,220,1)'></td>
+  <td width='1' style='background-color: rgba(247,13,210,1)'></td>
+  <td width='1' style='background-color: rgba(229,13,174,1)'></td>
+  <td width='1' style='background-color: rgba(209,0,167,1)'></td>
+  <td width='1' style='background-color: rgba(244,148,155,1)'></td>
+  <td width='1' style='background-color: rgba(229,214,232,1)'></td>
+  <td width='1' style='background-color: rgba(254,253,254,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(221,241,255,1)'></td>
   <td width='1' style='background-color: rgba(98,205,255,1)'></td>
   <td width='1' style='background-color: rgba(93,193,255,1)'></td>
   <td width='1' style='background-color: rgba(93,193,255,1)'></td>
-  <td width='1' style='background-color: rgba(160,194,255,1)'></td>
+  <td width='1' style='background-color: rgba(159,194,255,1)'></td>
   <td width='1' style='background-color: rgba(119,158,255,1)'></td>
   <td width='1' style='background-color: rgba(184,133,255,1)'></td>
   <td width='1' style='background-color: rgba(184,133,255,1)'></td>
   <td width='1' style='background-color: rgba(219,126,255,1)'></td>
   <td width='1' style='background-color: rgba(219,126,255,1)'></td>
-  <td width='1' style='background-color: rgba(241,81,255,1)'></td>
-  <td width='1' style='background-color: rgba(241,81,255,1)'></td>
-  <td width='1' style='background-color: rgba(243,33,244,1)'></td>
-  <td width='1' style='background-color: rgba(255,85,238,1)'></td>
-  <td width='1' style='background-color: rgba(247,12,210,1)'></td>
-  <td width='1' style='background-color: rgba(230,12,174,1)'></td>
-  <td width='1' style='background-color: rgba(210,0,168,1)'></td>
-  <td width='1' style='background-color: rgba(210,0,168,1)'></td>
+  <td width='1' style='background-color: rgba(241,81,254,1)'></td>
+  <td width='1' style='background-color: rgba(241,81,254,1)'></td>
+  <td width='1' style='background-color: rgba(242,34,244,1)'></td>
+  <td width='1' style='background-color: rgba(254,85,238,1)'></td>
+  <td width='1' style='background-color: rgba(247,13,210,1)'></td>
+  <td width='1' style='background-color: rgba(229,13,174,1)'></td>
+  <td width='1' style='background-color: rgba(209,0,167,1)'></td>
+  <td width='1' style='background-color: rgba(209,0,167,1)'></td>
   <td width='1' style='background-color: rgba(246,185,205,1)'></td>
-  <td width='1' style='background-color: rgba(245,242,243,1)'></td>
+  <td width='1' style='background-color: rgba(244,242,242,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -923,56 +953,56 @@
   <td width='1' style='background-color: rgba(93,193,255,1)'></td>
   <td width='1' style='background-color: rgba(95,176,255,1)'></td>
   <td width='1' style='background-color: rgba(95,176,255,1)'></td>
   <td width='1' style='background-color: rgba(119,158,255,1)'></td>
   <td width='1' style='background-color: rgba(138,110,255,1)'></td>
   <td width='1' style='background-color: rgba(184,133,255,1)'></td>
   <td width='1' style='background-color: rgba(219,126,255,1)'></td>
   <td width='1' style='background-color: rgba(219,126,255,1)'></td>
-  <td width='1' style='background-color: rgba(241,81,255,1)'></td>
-  <td width='1' style='background-color: rgba(241,81,255,1)'></td>
+  <td width='1' style='background-color: rgba(241,81,254,1)'></td>
+  <td width='1' style='background-color: rgba(241,81,254,1)'></td>
   <td width='1' style='background-color: rgba(228,28,235,1)'></td>
-  <td width='1' style='background-color: rgba(224,86,229,1)'></td>
-  <td width='1' style='background-color: rgba(210,0,168,1)'></td>
-  <td width='1' style='background-color: rgba(210,0,168,1)'></td>
-  <td width='1' style='background-color: rgba(196,146,203,1)'></td>
-  <td width='1' style='background-color: rgba(229,214,233,1)'></td>
-  <td width='1' style='background-color: rgba(254,254,254,1)'></td>
+  <td width='1' style='background-color: rgba(223,86,229,1)'></td>
+  <td width='1' style='background-color: rgba(209,0,167,1)'></td>
+  <td width='1' style='background-color: rgba(209,0,167,1)'></td>
+  <td width='1' style='background-color: rgba(196,146,202,1)'></td>
+  <td width='1' style='background-color: rgba(229,214,232,1)'></td>
+  <td width='1' style='background-color: rgba(253,253,254,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
-  <td width='1' style='background-color: rgba(253,254,254,1)'></td>
+  <td width='1' style='background-color: rgba(253,253,254,1)'></td>
   <td width='1' style='background-color: rgba(95,176,255,1)'></td>
   <td width='1' style='background-color: rgba(95,176,255,1)'></td>
   <td width='1' style='background-color: rgba(85,128,255,1)'></td>
   <td width='1' style='background-color: rgba(138,110,255,1)'></td>
   <td width='1' style='background-color: rgba(138,110,255,1)'></td>
   <td width='1' style='background-color: rgba(184,133,255,1)'></td>
   <td width='1' style='background-color: rgba(198,0,227,1)'></td>
   <td width='1' style='background-color: rgba(198,0,227,1)'></td>
   <td width='1' style='background-color: rgba(198,0,227,1)'></td>
-  <td width='1' style='background-color: rgba(187,0,204,1)'></td>
-  <td width='1' style='background-color: rgba(132,12,161,1)'></td>
-  <td width='1' style='background-color: rgba(132,12,161,1)'></td>
-  <td width='1' style='background-color: rgba(196,146,203,1)'></td>
-  <td width='1' style='background-color: rgba(245,242,243,1)'></td>
+  <td width='1' style='background-color: rgba(187,0,203,1)'></td>
+  <td width='1' style='background-color: rgba(132,13,161,1)'></td>
+  <td width='1' style='background-color: rgba(132,13,161,1)'></td>
+  <td width='1' style='background-color: rgba(196,146,202,1)'></td>
+  <td width='1' style='background-color: rgba(244,242,242,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -989,22 +1019,22 @@
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(216,226,255,1)'></td>
   <td width='1' style='background-color: rgba(85,128,255,1)'></td>
   <td width='1' style='background-color: rgba(85,128,255,1)'></td>
   <td width='1' style='background-color: rgba(130,28,228,1)'></td>
   <td width='1' style='background-color: rgba(130,28,228,1)'></td>
   <td width='1' style='background-color: rgba(146,77,224,1)'></td>
-  <td width='1' style='background-color: rgba(132,12,161,1)'></td>
-  <td width='1' style='background-color: rgba(132,12,161,1)'></td>
-  <td width='1' style='background-color: rgba(132,12,161,1)'></td>
-  <td width='1' style='background-color: rgba(196,146,203,1)'></td>
-  <td width='1' style='background-color: rgba(222,221,227,1)'></td>
-  <td width='1' style='background-color: rgba(254,254,254,1)'></td>
+  <td width='1' style='background-color: rgba(132,13,161,1)'></td>
+  <td width='1' style='background-color: rgba(132,13,161,1)'></td>
+  <td width='1' style='background-color: rgba(132,13,161,1)'></td>
+  <td width='1' style='background-color: rgba(196,146,202,1)'></td>
+  <td width='1' style='background-color: rgba(221,221,227,1)'></td>
+  <td width='1' style='background-color: rgba(253,253,254,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -1018,24 +1048,24 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 <tr height='1'>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
-  <td width='1' style='background-color: rgba(253,254,254,1)'></td>
-  <td width='1' style='background-color: rgba(240,240,251,1)'></td>
-  <td width='1' style='background-color: rgba(240,240,251,1)'></td>
-  <td width='1' style='background-color: rgba(229,233,247,1)'></td>
-  <td width='1' style='background-color: rgba(222,221,227,1)'></td>
-  <td width='1' style='background-color: rgba(222,221,227,1)'></td>
-  <td width='1' style='background-color: rgba(222,221,227,1)'></td>
-  <td width='1' style='background-color: rgba(245,242,243,1)'></td>
+  <td width='1' style='background-color: rgba(253,253,254,1)'></td>
+  <td width='1' style='background-color: rgba(239,239,251,1)'></td>
+  <td width='1' style='background-color: rgba(239,239,251,1)'></td>
+  <td width='1' style='background-color: rgba(229,232,247,1)'></td>
+  <td width='1' style='background-color: rgba(221,221,227,1)'></td>
+  <td width='1' style='background-color: rgba(221,221,227,1)'></td>
+  <td width='1' style='background-color: rgba(221,221,227,1)'></td>
+  <td width='1' style='background-color: rgba(244,242,242,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
@@ -1084,9 +1114,9 @@
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
   <td width='1' style='background-color: rgba(255,255,255,1)'></td>
 </tr>
 </table>
-</body></html>
\ No newline at end of file
+</body></html>
--- a/toolkit/library/libxul-rules.mk
+++ b/toolkit/library/libxul-rules.mk
@@ -35,17 +35,17 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS) \
-	$(QCMS_LIBS) \
+	$(LCMS_LIBS) \
 	$(MOZ_JS_LIBS) \
 	$(NSS_LIBS) \
 	$(MOZ_CAIRO_LIBS) \
 	$(NULL)
 
 ifdef MOZ_NATIVE_ZLIB
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
 else
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -750,18 +750,20 @@ MAKEFILES_zlib="
 "
 
 MAKEFILES_libmar="
   modules/libmar/Makefile
   modules/libmar/src/Makefile
   modules/libmar/tool/Makefile
 "
 
-MAKEFILES_qcms="
-  modules/qcms/Makefile
+MAKEFILES_lcms="
+  modules/lcms/Makefile
+  modules/lcms/include/Makefile
+  modules/lcms/src/Makefile
 "
 
 add_makefiles "
   $MAKEFILES_db
   $MAKEFILES_dom
   $MAKEFILES_editor
   $MAKEFILES_expat
   $MAKEFILES_gfx
@@ -797,17 +799,16 @@ add_makefiles "
   $MAKEFILES_xpfe
   $MAKEFILES_embedding
   $MAKEFILES_xulapp
   $MAKEFILES_libpr0n
   $MAKEFILES_accessible
   $MAKEFILES_zlib
   $MAKEFILES_libmar
   $MAKEFILES_lcms
-  $MAKEFILES_qcms
 "
 
 #
 # Conditional makefiles
 #
 
 if [ "$MOZ_ZIPWRITER" ]; then
   add_makefiles "
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -65,17 +65,17 @@ endif
 
 ifdef MOZ_UPDATER
 ifndef MOZ_NATIVE_BZ2
 tier_external_dirs += modules/libbz2
 endif
 tier_external_dirs += modules/libmar
 endif
 
-tier_external_dirs	+= gfx/qcms
+tier_external_dirs	+= modules/lcms
 
 #
 # tier "gecko" - core components
 #
 
 tier_gecko_dirs += \
 		js/src/xpconnect \
 		intl/chardet \
--- a/widget/src/build/Makefile.in
+++ b/widget/src/build/Makefile.in
@@ -85,17 +85,17 @@ SHARED_LIBRARY_LIBS = \
 		../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
-		$(QCMS_LIBS)
+		$(LCMS_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_WIDGET -DMOZ_UNICODE
 
 
 
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -61,17 +61,17 @@ REQUIRES = xpcom \
 		  layout \
 		  view \
 		  necko \
 		  locale \
 		  pref \
 		  intl \
 		  exthandler \
 		  appshell \
-		  qcms \
+		  lcms \
 		  thebes \
 		  js \
 		  xpconnect \
 		  imglib2 \
 		  $(NULL)
 
 ifdef ACCESSIBILITY
 REQUIRES += accessibility
@@ -120,17 +120,17 @@ XPIDLSRCS	+= \
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(TK_LIBS) \
 		$(call EXPAND_LIBNAME_PATH,gkgfx,$(DEPTH)/gfx/src) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lthebes \
-		$(QCMS_LIBS) \
+		$(LCMS_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 NIB_FILES = \
 	classes.nib \
 	info.nib \
 	keyedobjects.nib \
--- a/widget/src/cocoa/nsCocoaWindow.mm
+++ b/widget/src/cocoa/nsCocoaWindow.mm
@@ -59,17 +59,17 @@
 #include "nsPrintfCString.h"
 #include "nsThreadUtils.h"
 #include "nsMenuBarX.h"
 #include "nsMenuUtilsX.h"
 #include "nsStyleConsts.h"
 #include "nsNativeThemeColors.h"
 
 #include "gfxPlatform.h"
-#include "qcms.h"
+#include "lcms.h"
 
 // defined in nsAppShell.mm
 extern nsCocoaAppModalWindowList *gCocoaAppModalWindowList;
 
 PRInt32 gXULModalLevel = 0;
 
 // In principle there should be only one app-modal window at any given time.
 // But sometimes, despite our best efforts, another window appears above the
@@ -1349,23 +1349,23 @@ NS_IMETHODIMP nsCocoaWindow::SetWindowTi
   // native titlebar appearance.
   if (NS_GET_A(aColor) == 0) {
     [(ToolbarWindow*)mWindow setTitlebarColor:nil forActiveWindow:(BOOL)aActive]; 
   } else {
     // Transform from sRGBA to monitor RGBA. This seems like it would make trying
     // to match the system appearance lame, so probably we just shouldn't color 
     // correct chrome.
     if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
-      qcms_transform *transform = gfxPlatform::GetCMSRGBATransform();
+      cmsHTRANSFORM transform = gfxPlatform::GetCMSRGBATransform();
       if (transform) {
         PRUint8 color[3];
         color[0] = NS_GET_R(aColor);
         color[1] = NS_GET_G(aColor);
         color[2] = NS_GET_B(aColor);
-        qcms_transform_data(transform, color, color, 1);
+        cmsDoTransform(transform, color, color, 1);
         aColor = NS_RGB(color[0], color[1], color[2]);
       }
     }
 
     [(ToolbarWindow*)mWindow setTitlebarColor:[NSColor colorWithDeviceRed:NS_GET_R(aColor)/255.0
                                                                     green:NS_GET_G(aColor)/255.0
                                                                      blue:NS_GET_B(aColor)/255.0
                                                                     alpha:NS_GET_A(aColor)/255.0]
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -64,17 +64,16 @@ REQUIRES	= xpcom \
 		  imglib2 \
 		  view \
 		  content \
 		  layout \
 		  util \
 		  locale \
 		  thebes \
 		  cairo \
-		  qcms \
 		  $(NULL)
 
 ifdef MOZ_X11
 REQUIRES += gtkxtbin
 endif
 
 CSRCS		= \
 		mozcontainer.c \
@@ -138,17 +137,17 @@ EXTRA_DSO_LDOPTS += \
 		-lgkgfx \
                 $(MOZ_STARTUP_NOTIFICATION_LIBS) \
 		$(XLDFLAGS) \
 		$(XLIBS) \
 		$(XEXT_LIBS) \
 		$(XCOMPOSITE_LIBS) \
 		$(MOZ_GTK2_LIBS) \
 		-lthebes \
-		$(QCMS_LIBS) \
+		$(LCMS_LIBS) \
 		$(NULL)
 
 ifdef MOZ_PLATFORM_HILDON
 ifdef MOZ_ENABLE_GCONF
 EXTRA_DSO_LDOPTS += $(MOZ_GCONF_LIBS)
 endif
 endif
 
--- a/widget/src/os2/Makefile.in
+++ b/widget/src/os2/Makefile.in
@@ -102,17 +102,17 @@ SHARED_LIBRARY_LIBS = \
 
 EXTRA_DSO_LIBS	= gkgfx
 
 EXTRA_DSO_LDOPTS = \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lthebes \
-		$(QCMS_LIBS) \
+		$(LCMS_LIBS) \
 		$(NULL)
 
 ifdef ENABLE_TESTS
 HAS_EXTRAEXPORTS = 1
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/widget/src/qt/Makefile.in
+++ b/widget/src/qt/Makefile.in
@@ -101,20 +101,20 @@ CPPSRCS	= \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
 		-lgkgfx \
 		-lthebes \
+		$(LCMS_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_QT_LIBS) \
 		$(GLIB_LIBS) \
-		$(QCMS_LIBS) \
 		$(NULL)
 
 
 EXTRA_DSO_LDOPTS += -L$(DIST)/lib $(MOZ_XLIB_LDFLAGS) $(XLIBS)
 
 # If not primary toolkit, install in secondary path
 ifneq (qt,$(MOZ_WIDGET_TOOLKIT))
 INACTIVE_COMPONENT = 1
--- a/widget/src/windows/Makefile.in
+++ b/widget/src/windows/Makefile.in
@@ -66,17 +66,16 @@ REQUIRES	= xpcom \
 			xuldoc \
 			view \
 			imglib2 \
 			uriloader \
 			webbrowserpersist \
 			unicharutil \
 			thebes \
 			cairo \
-			qcms \
 			$(NULL)
 
 CPPSRCS		= \
 	nsWindow.cpp         \
 	nsAppShell.cpp       \
 	nsToolkit.cpp        \
 	nsFilePicker.cpp     \
 	nsScreenWin.cpp	\
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -56,17 +56,17 @@ REQUIRES	= xpcom \
 		  pref \
 		  locale \
 		  necko \
 		  htmlparser \
 		  uconv \
 		  unicharutil \
 		  view \
 		  windowwatcher \
-		  qcms \
+		  lcms \
 		  thebes \
 		  $(NULL)
 
 DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT
 
 CPPSRCS		= \
 		nsBaseAppShell.cpp \
 		nsBaseWidget.cpp \
--- a/widget/src/xpwidgets/nsXPLookAndFeel.cpp
+++ b/widget/src/xpwidgets/nsXPLookAndFeel.cpp
@@ -42,17 +42,17 @@
 #include "nsIPrefBranch2.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
 #include "nsIObserver.h"
 #include "nsCRT.h"
 #include "nsFont.h"
 
 #include "gfxPlatform.h"
-#include "qcms.h"
+#include "lcms.h"
 
 #ifdef DEBUG
 #include "nsSize.h"
 #endif
 
 NS_IMPL_ISUPPORTS2(nsXPLookAndFeel, nsILookAndFeel, nsIObserver)
 
 nsLookAndFeelIntPref nsXPLookAndFeel::sIntPrefs[] =
@@ -627,23 +627,23 @@ nsXPLookAndFeel::GetColor(const nsColorI
     // The foreground color for the matched text in findbar highlighting
     // Used with nsISelectionController::SELECTION_FIND
     aColor = NS_RGB(0xff, 0xff, 0xff);
     return NS_OK;
   }
 
   if (sUseNativeColors && NS_SUCCEEDED(NativeGetColor(aID, aColor))) {
     if ((gfxPlatform::GetCMSMode() == eCMSMode_All) && !IsSpecialColor(aID, aColor)) {
-      qcms_transform *transform = gfxPlatform::GetCMSInverseRGBTransform();
+      cmsHTRANSFORM transform = gfxPlatform::GetCMSInverseRGBTransform();
       if (transform) {
         PRUint8 color[3];
         color[0] = NS_GET_R(aColor);
         color[1] = NS_GET_G(aColor);
         color[2] = NS_GET_B(aColor);
-        qcms_transform_data(transform, color, color, 1);
+        cmsDoTransform(transform, color, color, 1);
         aColor = NS_RGB(color[0], color[1], color[2]);
       }
     }
 
     CACHE_COLOR(aID, aColor);
     return NS_OK;
   }