From 29cb4a2040860ce0a5e825aa6bcf10a0825d4831 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Wed, 5 Jul 2017 19:56:31 +0100 Subject: Update LCMS2 to LCMS2ART to reflect our fork. Pull in latest lcms2 fixes, and update our fork to be lcms2art. --- platform/win32/libthirdparty.vcproj | 4 ++-- source/fitz/color-lcms.c | 6 +++--- thirdparty/lcms2 | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index 49e07c3e..4f4450a5 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -1860,7 +1860,7 @@ > diff --git a/source/fitz/color-lcms.c b/source/fitz/color-lcms.c index 8563f9bf..82d05c98 100644 --- a/source/fitz/color-lcms.c +++ b/source/fitz/color-lcms.c @@ -1,6 +1,6 @@ #include "mupdf/fitz.h" -#include "lcms2.h" -#include "lcms2_plugin.h" +#include "lcms2art.h" +#include "lcms2art_plugin.h" #include "colorspace-imp.h" #define LCMS_BYTES_MASK 0x7 @@ -51,7 +51,7 @@ static cmsPluginMemHandler fz_lcms_memhandler = { { cmsPluginMagicNumber, - 2000, + LCMS_VERSION, cmsPluginMemHandlerSig, NULL }, diff --git a/thirdparty/lcms2 b/thirdparty/lcms2 index 6b4828a5..1079c808 160000 --- a/thirdparty/lcms2 +++ b/thirdparty/lcms2 @@ -1 +1 @@ -Subproject commit 6b4828a5c9156c2f7a656e69a20ec3d760635c0b +Subproject commit 1079c80803b51d0ea50b80ebb9920aa1da467cc0 -- cgit v1.2.3