From 248d76d86d0e191d748a06a5e57b2ab8e977322c Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Mon, 30 Aug 2021 16:50:10 +0100 Subject: Fix lcms2mt plugin version handling for transforms. lcms2mt uses version numbers BELOW that of lcms2. This meant that we were incorrectly spotting CALs plugin as being an old style one. --- lcms2mt/src/cmsplugin.c | 2 +- lcms2mt/src/cmsxform.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'lcms2mt') diff --git a/lcms2mt/src/cmsplugin.c b/lcms2mt/src/cmsplugin.c index d03d059a8..279bcbd11 100644 --- a/lcms2mt/src/cmsplugin.c +++ b/lcms2mt/src/cmsplugin.c @@ -571,7 +571,7 @@ cmsBool CMSEXPORT cmsPlugin(cmsContext id, void* Plug_in) if (Plugin ->ExpectedVersion < LCMS2MT_VERSION_MIN || Plugin ->ExpectedVersion > LCMS2MT_VERSION_MAX) { - cmsSignalError(id, cmsERROR_UNKNOWN_EXTENSION, "plugin version %d not in acceptable version range. LCMS2.art cannot use LCMS2 plugins!", + cmsSignalError(id, cmsERROR_UNKNOWN_EXTENSION, "plugin version %d not in acceptable version range. LCMS2MT cannot use LCMS2 plugins!", Plugin ->ExpectedVersion); return FALSE; } diff --git a/lcms2mt/src/cmsxform.c b/lcms2mt/src/cmsxform.c index 689656f9a..7f4e15896 100644 --- a/lcms2mt/src/cmsxform.c +++ b/lcms2mt/src/cmsxform.c @@ -1881,8 +1881,10 @@ cmsBool _cmsRegisterTransformPlugin(cmsContext ContextID, cmsPluginBase* Data) if (fl == NULL) return FALSE; // Check for full xform plug-ins previous to 2.8, we would need an adapter in that case - if (Plugin->base.ExpectedVersion < 2080) { - + if ((Plugin->base.ExpectedVersion <= LCMS2MT_VERSION_MAX && + Plugin->base.ExpectedVersion < 2080-2000) || + (Plugin->base.ExpectedVersion > LCMS2MT_VERSION_MAX && + Plugin->base.ExpectedVersion < 2080)) { fl->OldXform = TRUE; } else -- cgit v1.2.1