Rename lcms2art to lcms2mt, Remove cmsChangeBuffersFormat

Since cmsChangeBuffersFormat is NOT threadsafe, we want it to remove it
so that it would not be part of this package which is inteded for multi-
threaded used. The internal use in CreateNamedColorDevicelink was replaced
with the appropriate code from the removed function, but that does not
cause a thread safety issue since the link returned is new and not shared
when the buffer formatters are changed.

Note: All internal references to lcms2art are replaced with lcms2mt

9 files changed, 79 insertions, 76 deletions

diff --git a/base/gsicc_lcms2art.c b/base/gsicc_lcms2mt.c
index fdaa2d88d..0914c6deb 100644
--- a/base/gsicc_lcms2art.c
+++ b/base/gsicc_lcms2mt.c
@@ -14,11 +14,11 @@
 */
 
 
-/* gsicc interface to littleCMS2Art */
+/* gsicc interface to LittleCMS2-MT */
 
 #include "memory_.h"
-#include "lcms2art.h"
-#include "lcms2art_plugin.h"
+#include "lcms2mt.h"
+#include "lcms2mt_plugin.h"
 #include "gslibctx.h"
 #include "gserrors.h"
 #include "gp.h"
@@ -44,11 +44,11 @@
      (bigendianIN != 0) << 3 | (bigendianOUT != 0) << 2 | \
      (bytesIN == 1) << 1 | (bytesOUT == 1))
 
-typedef struct gsicc_lcms2art_link_list_s {
+typedef struct gsicc_lcms2mt_link_list_s {
     int flags;
     cmsHTRANSFORM *hTransform;
-    struct gsicc_lcms2art_link_list_s *next;
-} gsicc_lcms2art_link_list_t;
+    struct gsicc_lcms2mt_link_list_s *next;
+} gsicc_lcms2mt_link_list_t;
 
 /* Only provide warning about issues in lcms if debug build */
 static void
@@ -333,7 +333,7 @@ gscms_transform_color_buffer(gx_device *dev, gsicc_link_t *icclink,
                              gsicc_bufferdesc_t *output_buff_desc,
                              void *inputbuffer, void *outputbuffer)
 {
-    gsicc_lcms2art_link_list_t *link_handle = (gsicc_lcms2art_link_list_t *)(icclink->link_handle);
+    gsicc_lcms2mt_link_list_t *link_handle = (gsicc_lcms2mt_link_list_t *)(icclink->link_handle);
     cmsHTRANSFORM hTransform = (cmsHTRANSFORM)link_handle->hTransform;
     cmsUInt32Number dwInputFormat, dwOutputFormat, num_src_lcms, num_des_lcms;
     int  hasalpha, planarIN, planarOUT, numbytesIN, numbytesOUT, big_endianIN, big_endianOUT;
@@ -388,9 +388,9 @@ gscms_transform_color_buffer(gx_device *dev, gsicc_link_t *icclink,
     }
     if (hTransform == NULL) {
         /* the variant we want wasn't present, clone it from the last on the list */
-        gsicc_lcms2art_link_list_t *new_link_handle =
-            (gsicc_lcms2art_link_list_t *)gs_alloc_bytes(icclink->memory->non_gc_memory,
-                                                         sizeof(gsicc_lcms2art_link_list_t),
+        gsicc_lcms2mt_link_list_t *new_link_handle =
+            (gsicc_lcms2mt_link_list_t *)gs_alloc_bytes(icclink->memory->non_gc_memory,
+                                                         sizeof(gsicc_lcms2mt_link_list_t),
                                                          "gscms_transform_color_buffer");
         if (new_link_handle == NULL) {
             return_error(gs_error_VMerror);
@@ -540,7 +540,7 @@ int
 gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor,
                              void *outputcolor, int num_bytes)
 {
-    gsicc_lcms2art_link_list_t *link_handle = (gsicc_lcms2art_link_list_t *)(icclink->link_handle);
+    gsicc_lcms2mt_link_list_t *link_handle = (gsicc_lcms2mt_link_list_t *)(icclink->link_handle);
     cmsHTRANSFORM hTransform = (cmsHTRANSFORM)link_handle->hTransform;
     cmsUInt32Number dwInputFormat,dwOutputFormat;
     cmsContext ctx = gs_lib_ctx_get_cms_context(icclink->memory);
@@ -569,9 +569,9 @@ gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor,
         }
     }
     if (hTransform == NULL) {
-        gsicc_lcms2art_link_list_t *new_link_handle =
-            (gsicc_lcms2art_link_list_t *)gs_alloc_bytes(icclink->memory->non_gc_memory,
-                                                         sizeof(gsicc_lcms2art_link_list_t),
+        gsicc_lcms2mt_link_list_t *new_link_handle =
+            (gsicc_lcms2mt_link_list_t *)gs_alloc_bytes(icclink->memory->non_gc_memory,
+                                                         sizeof(gsicc_lcms2mt_link_list_t),
                                                          "gscms_transform_color_buffer");
         if (new_link_handle == NULL) {
             return_error(gs_error_VMerror);
@@ -627,7 +627,7 @@ gscms_get_link_dim(gcmmhlink_t link, int *num_inputs, int *num_outputs,
     gs_memory_t *memory)
 {
     cmsContext ctx = gs_lib_ctx_get_cms_context(memory);
-    gsicc_lcms2art_link_list_t *link_handle = (gsicc_lcms2art_link_list_t *)(link);
+    gsicc_lcms2mt_link_list_t *link_handle = (gsicc_lcms2mt_link_list_t *)(link);
     cmsHTRANSFORM hTransform = (cmsHTRANSFORM)link_handle->hTransform;
 
     *num_inputs = T_CHANNELS(cmsGetTransformInputFormat(ctx, hTransform));
@@ -646,7 +646,7 @@ gscms_get_link(gcmmhprofile_t  lcms_srchandle, gcmmhprofile_t lcms_deshandle,
     int lcms_src_color_space, lcms_des_color_space;
     unsigned int flag;
     cmsContext ctx = gs_lib_ctx_get_cms_context(memory);
-    gsicc_lcms2art_link_list_t *link_handle;
+    gsicc_lcms2mt_link_list_t *link_handle;
 
     /* Check for case of request for a transfrom from a device link profile
        in that case, the destination profile is NULL */
@@ -721,8 +721,8 @@ gscms_get_link(gcmmhprofile_t  lcms_srchandle, gcmmhprofile_t lcms_deshandle,
     }
 
     /* Create the link */
-    link_handle = (gsicc_lcms2art_link_list_t *)gs_alloc_bytes(memory->non_gc_memory,
-                                                         sizeof(gsicc_lcms2art_link_list_t),
+    link_handle = (gsicc_lcms2mt_link_list_t *)gs_alloc_bytes(memory->non_gc_memory,
+                                                         sizeof(gsicc_lcms2mt_link_list_t),
                                                          "gscms_transform_color_buffer");
     if (link_handle == NULL)
         return NULL;
@@ -762,10 +762,10 @@ gscms_get_link_proof_devlink(gcmmhprofile_t lcms_srchandle,
     int nProfiles = 0;
     unsigned int flag;
     cmsContext ctx = gs_lib_ctx_get_cms_context(memory);
-    gsicc_lcms2art_link_list_t *link_handle;
+    gsicc_lcms2mt_link_list_t *link_handle;
 
-    link_handle = (gsicc_lcms2art_link_list_t *)gs_alloc_bytes(memory->non_gc_memory,
-                                                         sizeof(gsicc_lcms2art_link_list_t),
+    link_handle = (gsicc_lcms2mt_link_list_t *)gs_alloc_bytes(memory->non_gc_memory,
+                                                         sizeof(gsicc_lcms2mt_link_list_t),
                                                          "gscms_transform_color_buffer");
     if (link_handle == NULL)
          return NULL;
@@ -943,10 +943,10 @@ void
 gscms_release_link(gsicc_link_t *icclink)
 {
     cmsContext ctx = gs_lib_ctx_get_cms_context(icclink->memory);
-    gsicc_lcms2art_link_list_t *link_handle = (gsicc_lcms2art_link_list_t *)(icclink->link_handle);
+    gsicc_lcms2mt_link_list_t *link_handle = (gsicc_lcms2mt_link_list_t *)(icclink->link_handle);
 
     while (link_handle != NULL) {
-        gsicc_lcms2art_link_list_t *next_handle;
+        gsicc_lcms2mt_link_list_t *next_handle;
         cmsDeleteTransform(ctx, link_handle->hTransform);
         next_handle = link_handle->next;
         gs_free_object(icclink->memory->non_gc_memory, link_handle, "gscms_release_link");
@@ -992,7 +992,7 @@ int
 gscms_transform_named_color(gsicc_link_t *icclink,  float tint_value,
                             const char* ColorName, gx_color_value device_values[])
 {
-    gsicc_lcms2art_link_list_t *link_handle = (gsicc_lcms2art_link_list_t *)(icclink->link_handle);
+    gsicc_lcms2mt_link_list_t *link_handle = (gsicc_lcms2mt_link_list_t *)(icclink->link_handle);
     cmsHTRANSFORM hTransform = (cmsHTRANSFORM)link_handle->hTransform;
     unsigned short *deviceptr = device_values;
     int index;
@@ -1028,7 +1028,7 @@ gscms_get_name2device_link(gsicc_link_t *icclink,
     cmsUInt32Number lcms_proof_flag;
     int number_colors;
     cmsContext ctx = gs_lib_ctx_get_cms_context(icclink->memory);
-    gsicc_lcms2art_link_list_t *link_handle;
+    gsicc_lcms2mt_link_list_t *link_handle;
 
     icclink->link_handle = NULL;		/* in case of failure */
     /* NOTE:  We need to add a test here to check that we even HAVE
@@ -1064,8 +1064,8 @@ gscms_get_name2device_link(gsicc_link_t *icclink,
     cmsDeleteTransform(ctx, hTransform);	/* release the original after cloning */
     if (hTransformNew == NULL)
         return;					/* bail */
-    link_handle = (gsicc_lcms2art_link_list_t *)gs_alloc_bytes(icclink->memory->non_gc_memory,
-                                                         sizeof(gsicc_lcms2art_link_list_t),
+    link_handle = (gsicc_lcms2mt_link_list_t *)gs_alloc_bytes(icclink->memory->non_gc_memory,
+                                                         sizeof(gsicc_lcms2mt_link_list_t),
                                                          "gscms_transform_color_buffer");
     if (link_handle == NULL) {
         cmsDeleteTransform(ctx, hTransformNew);
diff --git a/base/lcms2art.mak b/base/lcms2mt.mak
index c5e7b1a20..f0f192bd2 100644
--- a/base/lcms2art.mak
+++ b/base/lcms2mt.mak
@@ -13,10 +13,10 @@
 # CA 94945, U.S.A., +1(415)492-9861, for further information.
 #
 
-# makefile for the lcms2art library code.
+# makefile for the lcms2mt library code.
 # Users of this makefile must define the following:
 #	SHARE_LCMS - whether to compile in or link to the library
-#	LCMS2ARTSRCDIR - the library source directory
+#	LCMS2MTSRCDIR - the library source directory
 #
 # gs.mak and friends define the following:
 #	LCMS2OBJDIR - the output obj directory
@@ -25,14 +25,14 @@
 
 # We define the lcms2.dev target and its dependencies
 #
-# This partial makefile compiles the lcms2art library for use in
+# This partial makefile compiles the lcms2mt library for use in
 # Ghostscript.
 
 
 # Define the name of this makefile.
-LCMS2_MAK=$(GLSRC)lcms2art.mak $(TOP_MAKEFILES)
+LCMS2_MAK=$(GLSRC)lcms2mt.mak $(TOP_MAKEFILES)
 
-LCMS2SRC=$(LCMS2ARTSRCDIR)$(D)src$(D)
+LCMS2SRC=$(LCMS2MTSRCDIR)$(D)src$(D)
 LCMS2GEN=$(LCMS2GENDIR)$(D)
 LCMS2OBJ=$(LCMS2OBJDIR)$(D)
 
@@ -66,34 +66,34 @@ lcms2_OBJS=\
 	$(LCMS2OBJ)cmsalpha.$(OBJ)
 
 LCMS2_DEPS=\
-        $(LCMS2ARTSRCDIR)$(D)include$(D)lcms2art.h \
+        $(LCMS2MTSRCDIR)$(D)include$(D)lcms2mt.h \
 	$(GLSRC)icc34.h $(LCMS2_MAK) $(MAKEDIRS)
 
 lcms2.clean : lcms2.config-clean lcms2.clean-not-config-clean
 
 lcms2.clean-not-config-clean :
-	$(EXP)$(ECHOGS_XE) $(LCMS2ARTSRCDIR) $(LCMS2OBJDIR)
+	$(EXP)$(ECHOGS_XE) $(LCMS2MTSRCDIR) $(LCMS2OBJDIR)
 	$(RM_) $(lcms2_OBJS)
 
 lcms2.config-clean :
-	$(RMN_) $(LCMS2GEN)$(D)lcms2art*.dev
+	$(RMN_) $(LCMS2GEN)$(D)lcms2mt*.dev
 
 # NB: we can't use the normal $(CC_) here because msvccmd.mak
 # adds /Za which conflicts with the lcms source.
-LCMS2_CC=$(CC) $(D_)SHARE_LCMS=$(SHARE_LCMS)$(_D) $(CFLAGS) $(LCMS2_CFLAGS) $(I_)$(LCMS2ARTSRCDIR)$(D)include $(LCMS2CF_)
+LCMS2_CC=$(CC) $(D_)SHARE_LCMS=$(SHARE_LCMS)$(_D) $(CFLAGS) $(LCMS2_CFLAGS) $(I_)$(LCMS2MTSRCDIR)$(D)include $(LCMS2CF_)
 LCMS2O_=$(O_)$(LCMS2OBJ)
 
-# switch in the version of lcms2art.dev we're actually using
-$(LCMS2GEN)lcms2art.dev : $(LCMS2GEN)lcms2art_$(SHARE_LCMS).dev $(MAKEDIRS)
-	$(CP_) $(LCMS2GEN)lcms2art_$(SHARE_LCMS).dev $(LCMS2GEN)lcms2art.dev
+# switch in the version of lcms2mt.dev we're actually using
+$(LCMS2GEN)lcms2mt.dev : $(LCMS2GEN)lcms2mt_$(SHARE_LCMS).dev $(MAKEDIRS)
+	$(CP_) $(LCMS2GEN)lcms2mt_$(SHARE_LCMS).dev $(LCMS2GEN)lcms2mt.dev
 
 # dev file for shared (separately built) lcms library
-$(LCMS2GEN)lcms2art_1.dev : $(LCMS2_MAK) $(ECHOGS_XE) $(MAKEDIRS)
-	$(SETMOD) $(LCMS2GEN)lcms2art_1 -lib lcms2
+$(LCMS2GEN)lcms2mt_1.dev : $(LCMS2_MAK) $(ECHOGS_XE) $(MAKEDIRS)
+	$(SETMOD) $(LCMS2GEN)lcms2mt_1 -lib lcms2
 
 # dev file for compiling our own from source
-$(LCMS2GEN)lcms2art_0.dev : $(LCMS2_MAK) $(ECHOGS_XE) $(lcms2_OBJS) $(LCMS2_DEPS)
-	$(SETMOD) $(LCMS2GEN)lcms2art_0 $(lcms2_OBJS)
+$(LCMS2GEN)lcms2mt_0.dev : $(LCMS2_MAK) $(ECHOGS_XE) $(lcms2_OBJS) $(LCMS2_DEPS)
+	$(SETMOD) $(LCMS2GEN)lcms2mt_0 $(lcms2_OBJS)
 
 # explicit rules for building the source files.
 
diff --git a/base/lib.mak b/base/lib.mak
index 59504bd8c..ff1f3eb15 100644
--- a/base/lib.mak
+++ b/base/lib.mak
@@ -26,7 +26,7 @@
 #       ZGENDIR - zlib object code directory
 #       LCMSGENDIR - Little CMS object code directory
 # One of:
-#       LCMS2ARTSRCDIR - Artifex (Thread Safe) Little CMS 2 source directory
+#       LCMS2MTSRCDIR - Artifex (Thread Safe) Little CMS 2 source directory
 #       LCMS2SRCDIR - Little CMS verion 2 source directory
 #
 # For dependencies:
@@ -52,12 +52,12 @@ GLLDFJB2CC=$(CC_) $(I_)$(LDF_JB2I_) $(II)$(GLI_)$(_I) $(JB2CF_) $(GLF_)
 GLLWFJPXCC=$(CC_) $(I_)$(LWF_JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_)
 GLJPXOPJCC=$(CC_) $(I_)$(JPX_OPENJPEG_I_)$(D).. $(I_)$(JPX_OPENJPEG_I_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_)
 GLCCSHARED=$(CC_SHARED) $(GLCCFLAGS)
-# We can't use $(CC_) for GLLCMSARTCC because that includes /Za on
+# We can't use $(CC_) for GLLCMS2MTCC because that includes /Za on
 # msvc builds, and lcms configures itself to depend on msvc extensions
 # (inline asm, including windows.h) when compiled under msvc.
-GLLCMSARTCC=$(CC) $(LCMS2ART_CFLAGS) $(CFLAGS) $(I_)$(GLI_) $(II)$(LCMS2ARTSRCDIR)$(D)include$(_I) $(GLF_)
-lcms2art_h=$(LCMS2ARTSRCDIR)$(D)include$(D)lcms2art.h
-lcms2art_plugin_h=$(LCMS2ARTSRCDIR)$(D)include$(D)lcms2art_plugin.h
+GLLCMS2MTCC=$(CC) $(LCMS2MT_CFLAGS) $(CFLAGS) $(I_)$(GLI_) $(II)$(LCMS2MTSRCDIR)$(D)include$(_I) $(GLF_)
+lcms2mt_h=$(LCMS2MTSRCDIR)$(D)include$(D)lcms2mt.h
+lcms2mt_plugin_h=$(LCMS2MTSRCDIR)$(D)include$(D)lcms2mt_plugin.h
 icc34_h=$(GLSRC)icc34.h
 # We can't use $(CC_) for GLLCMS2CC because that includes /Za on
 # msvc builds, and lcms configures itself to depend on msvc extensions
@@ -2889,16 +2889,16 @@ $(GLOBJ)gsicc_profilecache.$(OBJ) : $(GLSRC)gsicc_profilecache.c $(AK)\
  $(LIB_MAK) $(MAKEDIRS)
 	$(GLCC) $(GLO_)gsicc_profilecache.$(OBJ) $(C_) $(GLSRC)gsicc_profilecache.c
 
-$(GLOBJ)gsicc_lcms2art_1.$(OBJ) : $(GLSRC)gsicc_lcms2art.c\
+$(GLOBJ)gsicc_lcms2mt_1.$(OBJ) : $(GLSRC)gsicc_lcms2mt.c\
  $(memory__h) $(gsicc_cms_h) $(gslibctx_h) $(gserrors_h) $(gxdevice_h) $(LIB_MAK) $(MAKEDIRS)
-	$(GLLCMSARTCC) $(GLO_)gsicc_lcms2art_1.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2art.c
-$(GLOBJ)gsicc_lcms2art_0.$(OBJ) : $(GLSRC)gsicc_lcms2art.c\
- $(memory__h) $(gsicc_cms_h) $(lcms2art_h) $(gslibctx_h) $(lcms2art_plugin_h) $(gserrors_h) \
+	$(GLLCMS2MTCC) $(GLO_)gsicc_lcms2mt_1.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2mt.c
+$(GLOBJ)gsicc_lcms2mt_0.$(OBJ) : $(GLSRC)gsicc_lcms2mt.c\
+ $(memory__h) $(gsicc_cms_h) $(lcms2mt_h) $(gslibctx_h) $(lcms2mt_plugin_h) $(gserrors_h) \
  $(gxdevice_h) $(LIB_MAK) $(MAKEDIRS)
-	$(GLLCMSARTCC) $(GLO_)gsicc_lcms2art_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2art.c
-$(GLOBJ)gsicc_lcms2art.$(OBJ) : $(GLOBJ)gsicc_lcms2art_$(SHARE_LCMS).$(OBJ) $(gp_h) \
+	$(GLLCMS2MTCC) $(GLO_)gsicc_lcms2mt_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2mt.c
+$(GLOBJ)gsicc_lcms2mt.$(OBJ) : $(GLOBJ)gsicc_lcms2mt_$(SHARE_LCMS).$(OBJ) $(gp_h) \
  $(gxsync_h) $(LIB_MAK) $(MAKEDIRS)
-	$(CP_) $(GLOBJ)gsicc_lcms2art_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2art.$(OBJ)
+	$(CP_) $(GLOBJ)gsicc_lcms2mt_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2mt.$(OBJ)
 $(GLOBJ)gsicc_lcms2_1.$(OBJ) : $(GLSRC)gsicc_lcms2.c\
  $(memory__h) $(gsicc_cms_h) $(gslibctx_h) $(gserrors_h) $(gxdevice_h) $(LIB_MAK) $(MAKEDIRS)
 	$(GLLCMS2CC) $(GLO_)gsicc_lcms2_1.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2.c
@@ -2921,13 +2921,13 @@ $(GLOBJ)gsicc_create_1.$(OBJ) : $(GLSRC)gsicc_create.c $(AK) $(string__h)\
  $(gsmemory_h) $(gx_h) $(gxgstate_h) $(gstypes_h) $(gscspace_h)\
  $(gscie_h) $(gsicc_create_h) $(gxarith_h) $(gsicc_manage_h) $(gsicc_cache_h)\
  $(math__h) $(gscolor2_h) $(gxcie_h) $(LIB_MAK) $(MAKEDIRS)
-	$(GLLCMSARTCC) $(GLO_)gsicc_create_1.$(OBJ) $(C_) $(GLSRC)gsicc_create.c
+	$(GLLCMS2MTCC) $(GLO_)gsicc_create_1.$(OBJ) $(C_) $(GLSRC)gsicc_create.c
 
 $(GLOBJ)gsicc_create_0.$(OBJ) : $(GLSRC)gsicc_create.c $(AK) $(string__h)\
  $(gsmemory_h) $(gx_h) $(gxgstate_h) $(gstypes_h) $(gscspace_h)\
  $(gscie_h) $(gsicc_create_h) $(gxarith_h) $(gsicc_manage_h) $(gsicc_cache_h)\
  $(math__h) $(gscolor2_h) $(gxcie_h) $(icc34_h) $(LIB_MAK) $(MAKEDIRS)
-	$(GLLCMSARTCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c
+	$(GLLCMS2MTCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c
 
 $(GLOBJ)gsicc_create.$(OBJ) : $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(LIB_MAK) $(MAKEDIRS)
 	$(CP_) $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_create.$(OBJ)
diff --git a/base/msvclib.mak b/base/msvclib.mak
index 140f59cc3..7e6b9ed54 100644
--- a/base/msvclib.mak
+++ b/base/msvclib.mak
@@ -185,11 +185,11 @@ JBIG2_LIB=jbig2dec
 JBIG2SRCDIR=jbig2dec
 !endif
 
-# Define the directory where the lcms2art source is stored.
-# See lcms2art.mak for more information
+# Define the directory where the lcms2mt source is stored.
+# See lcms2mt.mak for more information
 
-!ifndef LCMS2ARTSRCDIR
-LCMS2ARTSRCDIR=lcms2art
+!ifndef LCMS2MTSRCDIR
+LCMS2MTSRCDIR=lcms2mt
 !endif
 
 # Define the directory where the lcms2 source is stored.
diff --git a/base/openvms.mak b/base/openvms.mak
index 2b77dba72..a272b5f3d 100644
--- a/base/openvms.mak
+++ b/base/openvms.mak
@@ -128,10 +128,10 @@ JBIG2SRCDIR=[.jbig2dec]
 
 # Define the jpeg2k library and source location.
 
-# Define the directory where the lcms2art source is stored.
-# See lcms2art.mak for more information
+# Define the directory where the lcms2mt source is stored.
+# See lcms2mt.mak for more information
 
-LCMS2ARTSRCDIR=[.lcms2art]
+LCMS2MTSRCDIR=[.lcms2mt]
 
 
 # Define the directory where the lcms2 source is stored.
@@ -140,9 +140,9 @@ LCMS2ARTSRCDIR=[.lcms2art]
 LCMS2SRCDIR=[.lcms2]
 
 # Which CMS are we using?
-# Options are currently lcms2art or lcms2
+# Options are currently lcms2mt or lcms2
 
-WHICH_CMS=lcms2art
+WHICH_CMS=lcms2mt
 
 # IJS has not been ported to OpenVMS. If you do the port,
 # you'll need to set these values. You'll also need to
diff --git a/base/ugcclib.mak b/base/ugcclib.mak
index 2f31170fe..f3c50051a 100644
--- a/base/ugcclib.mak
+++ b/base/ugcclib.mak
@@ -62,11 +62,11 @@ SHARE_JBIG2=0
 JBIG2_LIB=jbig2dec
 JBIG2SRCDIR=jbig2dec
 
-# Define the directory where the lcms2art source is stored.
-# See lcms2art.mak for more information
+# Define the directory where the lcms2mt source is stored.
+# See lcms2mt.mak for more information
 
 SHARE_LCMS=0
-LCMS2ARTSRCDIR=lcms2art
+LCMS2MTSRCDIR=lcms2mt
 
 # Define the directory where the lcms2 source is stored.
 # See lcms2.mak for more information
diff --git a/base/unix-gcc.mak b/base/unix-gcc.mak
index a44671c41..4d11dbeea 100644
--- a/base/unix-gcc.mak
+++ b/base/unix-gcc.mak
@@ -298,12 +298,15 @@ JPX_CFLAGS=  -DUSE_JPIP -DUSE_OPENJPEG_JP2 -DOPJ_HAVE_STDINT_H=1 -DOPJ_HAVE_INTT
 
 # options for lcms color management library
 SHARE_LCMS=0
-LCMS2SRCDIR=./lcms2art
+LCMS2SRCDIR=./lcms2mt
+LCMS2_CFLAGS=-DSHARE_LCMS=$(SHARE_LCMS) -DCMS_USE_BIG_ENDIAN=0   
+
+LCMS2MTSRCDIR=./lcms2mt
 LCMS2_CFLAGS=-DSHARE_LCMS=$(SHARE_LCMS) -DCMS_USE_BIG_ENDIAN=0   
 
 # Which CMS are we using?
-# Options are currently lcms2art or lcms2
-WHICH_CMS=lcms2art
+# Options are currently lcms2mt or lcms2
+WHICH_CMS=lcms2mt
 
 EXPATSRCDIR=./expat
 EXPAT_CFLAGS=-DHAVE_MEMMOVE
diff --git a/base/unixansi.mak b/base/unixansi.mak
index ccd6e6660..450ccb916 100644
--- a/base/unixansi.mak
+++ b/base/unixansi.mak
@@ -178,7 +178,7 @@ JBIG2SRCDIR=jbig2dec
 # See lcms.mak for more information
 
 SHARE_LCMS=0
-LCMSSRCDIR=lcms2art
+LCMS2MTSRCDIR=lcms2mt
 
 # Define the directory where the lcms2 source is stored.
 # See lcms2.mak for more information
@@ -186,9 +186,9 @@ LCMSSRCDIR=lcms2art
 LCMS2SRCDIR=lcms2
 
 # Which CMS are we using?
-# Options are currently lcms2art or lcms2
+# Options are currently lcms2mt or lcms2
 
-WHICH_CMS=lcms2art
+WHICH_CMS=lcms2mt
 
 # Define the directory where the ijs source is stored,
 # and the process forking method to use for the server.
diff --git a/base/winlib.mak b/base/winlib.mak
index 18f9388dd..5d6831bdf 100644
--- a/base/winlib.mak
+++ b/base/winlib.mak
@@ -117,7 +117,7 @@ FT_BRIDGE = 0
 
 # Which CMS are we using?
 !ifndef WHICH_CMS
-WHICH_CMS=lcms2art
+WHICH_CMS=lcms2mt
 !endif
 
 # Define the files to be removed by `make clean'.