diff options
| author | Robin Watts <robin.watts@artifex.com> | 2017-07-05 19:56:31 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2017-07-19 19:41:23 +0100 |
| commit | 29cb4a2040860ce0a5e825aa6bcf10a0825d4831 (patch) | |
| tree | d198d2d915f6c9e7dce2f9ce5f535fb92fbcb28b | |
| parent | 7a25da923d28e55e39dd7a62360960e3f5aa1994 (diff) | |
| download | mupdf-29cb4a2040860ce0a5e825aa6bcf10a0825d4831.tar.xz | |
Update LCMS2 to LCMS2ART to reflect our fork.
Pull in latest lcms2 fixes, and update our fork to be lcms2art.
| -rw-r--r-- | platform/win32/libthirdparty.vcproj | 4 | ||||
| -rw-r--r-- | source/fitz/color-lcms.c | 6 | ||||
| m--------- | thirdparty/lcms2 | 0 |
3 files changed, 5 insertions, 5 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 @@ > </File> <File - RelativePath="..\..\thirdparty\lcms2\include\lcms2.h" + RelativePath="..\..\thirdparty\lcms2\include\lcms2art.h" > </File> <File @@ -1868,7 +1868,7 @@ > </File> <File - RelativePath="..\..\thirdparty\lcms2\include\lcms2_plugin.h" + RelativePath="..\..\thirdparty\lcms2\include\lcms2art_plugin.h" > </File> </Filter> 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 -Subproject 6b4828a5c9156c2f7a656e69a20ec3d760635c0 +Subproject 1079c80803b51d0ea50b80ebb9920aa1da467cc |