diff options
author | Marti Maria <marti.maria@littlecms.com> | 2023-02-17 16:52:21 +0100 |
---|---|---|
committer | Marti Maria <marti.maria@littlecms.com> | 2023-02-17 16:52:21 +0100 |
commit | c46703c1e909abc34cc18c1d085e51f9b5be2ea3 (patch) | |
tree | 42baa9d50e2e6539e6035f4810963b293b1a2637 | |
parent | 9a614c03bf78591de079f1c53d9fdddab3cb3af2 (diff) | |
parent | dbb23ff16cf90c47482f6c9eac484c5bdde8b14f (diff) | |
download | lcms2-c46703c1e909abc34cc18c1d085e51f9b5be2ea3.tar.gz |
Merge branch 'master' of https://github.com/mm2/Little-CMS
72 files changed, 105 insertions, 90 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0c3865..8c4b85a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,7 +77,7 @@ jobs: - name: Build Ubuntu run: | - meson setup build + meson setup build -Dfastfloat=true meson compile -C build meson test -C build diff --git a/Projects/VC2022/lcms2.rc b/Projects/VC2022/lcms2.rc index 00b6c61..07a41c5 100644 --- a/Projects/VC2022/lcms2.rc +++ b/Projects/VC2022/lcms2.rc @@ -27,8 +27,8 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN // 1 VERSIONINFO - FILEVERSION 2,13,0,0 - PRODUCTVERSION 2,13,0,0 + FILEVERSION 2,15,0,0 + PRODUCTVERSION 2,15,0,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG FILEFLAGS 0x1L @@ -45,12 +45,12 @@ BEGIN BEGIN VALUE "CompanyName", "Marti Maria" VALUE "FileDescription", "lcms color engine" - VALUE "FileVersion", "2.13.0.0" + VALUE "FileVersion", "2.15.0.0" VALUE "InternalName", "lcms2" - VALUE "LegalCopyright", "Copyright � Marti Maria 2022" + VALUE "LegalCopyright", "Copyright � Marti Maria 2023" VALUE "OriginalFilename", "lcms2.dll" VALUE "ProductName", "LittleCMS color engine" - VALUE "ProductVersion", "2.13.0.0" + VALUE "ProductVersion", "2.15.0.0" END END BLOCK "VarFileInfo" diff --git a/include/lcms2.h b/include/lcms2.h index 22bf1db..0dfe205 100644 --- a/include/lcms2.h +++ b/include/lcms2.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -23,7 +23,7 @@ // //--------------------------------------------------------------------------------- // -// Version 2.14 +// Version 2.15rc0 // #ifndef _lcms2_H diff --git a/include/lcms2_plugin.h b/include/lcms2_plugin.h index 33540b8..906defb 100644 --- a/include/lcms2_plugin.h +++ b/include/lcms2_plugin.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/plugins/fast_float/include/lcms2_fast_float.h b/plugins/fast_float/include/lcms2_fast_float.h index 83afd3f..6dacd7a 100644 --- a/plugins/fast_float/include/lcms2_fast_float.h +++ b/plugins/fast_float/include/lcms2_fast_float.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/include/meson.build b/plugins/fast_float/include/meson.build new file mode 100644 index 0000000..4527b4a --- /dev/null +++ b/plugins/fast_float/include/meson.build @@ -0,0 +1 @@ +install_headers('lcms2_fast_float.h') diff --git a/plugins/fast_float/meson.build b/plugins/fast_float/meson.build index b5d2552..8f0114e 100644 --- a/plugins/fast_float/meson.build +++ b/plugins/fast_float/meson.build @@ -1,2 +1,3 @@ +subdir('include') subdir('src') subdir('testbed') diff --git a/plugins/fast_float/src/fast_16_tethra.c b/plugins/fast_float/src/fast_16_tethra.c index 8f7f769..9953b6f 100644 --- a/plugins/fast_float/src/fast_16_tethra.c +++ b/plugins/fast_float/src/fast_16_tethra.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_8_curves.c b/plugins/fast_float/src/fast_8_curves.c index aaaa760..b4d45c3 100644 --- a/plugins/fast_float/src/fast_8_curves.c +++ b/plugins/fast_float/src/fast_8_curves.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_8_matsh.c b/plugins/fast_float/src/fast_8_matsh.c index f39c669..d46e5ec 100644 --- a/plugins/fast_float/src/fast_8_matsh.c +++ b/plugins/fast_float/src/fast_8_matsh.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_8_matsh_sse.c b/plugins/fast_float/src/fast_8_matsh_sse.c index efeac2d..a5b810d 100644 --- a/plugins/fast_float/src/fast_8_matsh_sse.c +++ b/plugins/fast_float/src/fast_8_matsh_sse.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_8_tethra.c b/plugins/fast_float/src/fast_8_tethra.c index a843813..544f773 100644 --- a/plugins/fast_float/src/fast_8_tethra.c +++ b/plugins/fast_float/src/fast_8_tethra.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_float_15bits.c b/plugins/fast_float/src/fast_float_15bits.c index 33a41b9..f20b4fe 100644 --- a/plugins/fast_float/src/fast_float_15bits.c +++ b/plugins/fast_float/src/fast_float_15bits.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_float_15mats.c b/plugins/fast_float/src/fast_float_15mats.c index 19e2378..142da12 100644 --- a/plugins/fast_float/src/fast_float_15mats.c +++ b/plugins/fast_float/src/fast_float_15mats.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_float_cmyk.c b/plugins/fast_float/src/fast_float_cmyk.c index bdb7348..fc68189 100644 --- a/plugins/fast_float/src/fast_float_cmyk.c +++ b/plugins/fast_float/src/fast_float_cmyk.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_float_curves.c b/plugins/fast_float/src/fast_float_curves.c index 2cfca90..d0b0686 100644 --- a/plugins/fast_float/src/fast_float_curves.c +++ b/plugins/fast_float/src/fast_float_curves.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_float_internal.h b/plugins/fast_float/src/fast_float_internal.h index 58cb66f..35d7c25 100644 --- a/plugins/fast_float/src/fast_float_internal.h +++ b/plugins/fast_float/src/fast_float_internal.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_float_lab.c b/plugins/fast_float/src/fast_float_lab.c index 2ffbad5..b7efbff 100644 --- a/plugins/fast_float/src/fast_float_lab.c +++ b/plugins/fast_float/src/fast_float_lab.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_float_matsh.c b/plugins/fast_float/src/fast_float_matsh.c index 19e8aa5..a7601c4 100644 --- a/plugins/fast_float/src/fast_float_matsh.c +++ b/plugins/fast_float/src/fast_float_matsh.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_float_separate.c b/plugins/fast_float/src/fast_float_separate.c index ec297bb..e3eb764 100644 --- a/plugins/fast_float/src/fast_float_separate.c +++ b/plugins/fast_float/src/fast_float_separate.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_float_sup.c b/plugins/fast_float/src/fast_float_sup.c index 961ed55..a3362b4 100644 --- a/plugins/fast_float/src/fast_float_sup.c +++ b/plugins/fast_float/src/fast_float_sup.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/fast_float_tethra.c b/plugins/fast_float/src/fast_float_tethra.c index 6c49774..2493aad 100644 --- a/plugins/fast_float/src/fast_float_tethra.c +++ b/plugins/fast_float/src/fast_float_tethra.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/fast_float/src/meson.build b/plugins/fast_float/src/meson.build index 93f0b34..e907c3b 100644 --- a/plugins/fast_float/src/meson.build +++ b/plugins/fast_float/src/meson.build @@ -32,7 +32,7 @@ liblcms2_fast_float = library( 'lcms2_fast_float', lcms2_fast_float_sources, gnu_symbol_visibility: 'hidden', - dependencies: liblcms2_dep, + dependencies: [liblcms2_dep, m_dep], include_directories: lcms2_fast_float_incdir, c_args: cargs, install: true, diff --git a/plugins/fast_float/testbed/fast_float_testbed.c b/plugins/fast_float/testbed/fast_float_testbed.c index 005bee6..f00b4cf 100644 --- a/plugins/fast_float/testbed/fast_float_testbed.c +++ b/plugins/fast_float/testbed/fast_float_testbed.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify @@ -2461,7 +2461,7 @@ int main() #endif trace("FastFloating point extensions testbed - 1.6\n"); - trace("Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved\n"); + trace("Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved\n"); trace("\nInstalling error logger ... "); cmsSetLogErrorHandler(FatalErrorQuit); diff --git a/plugins/fast_float/testbed/meson.build b/plugins/fast_float/testbed/meson.build index 5aa2d1a..db55170 100644 --- a/plugins/fast_float/testbed/meson.build +++ b/plugins/fast_float/testbed/meson.build @@ -5,7 +5,7 @@ fast_float_testbed_srcs = files( fast_float_testbed = executable( 'fast_float_testbed', fast_float_testbed_srcs, - dependencies: [liblcms2_fast_float_dep, liblcms2_dep], + dependencies: [liblcms2_fast_float_dep, liblcms2_dep, m_dep], c_args: cargs + ['-DPROFILES_DIR="@0@"'.format(profiles_dir / '')], ) diff --git a/plugins/threaded/include/lcms2_threaded.h b/plugins/threaded/include/lcms2_threaded.h index db2cdba..3006e86 100644 --- a/plugins/threaded/include/lcms2_threaded.h +++ b/plugins/threaded/include/lcms2_threaded.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, multithread extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/threaded/include/meson.build b/plugins/threaded/include/meson.build index 8b13789..d38e63d 100644 --- a/plugins/threaded/include/meson.build +++ b/plugins/threaded/include/meson.build @@ -1 +1 @@ - +install_headers('lcms2_threaded.h') diff --git a/plugins/threaded/meson.build b/plugins/threaded/meson.build index b5d2552..8f0114e 100644 --- a/plugins/threaded/meson.build +++ b/plugins/threaded/meson.build @@ -1,2 +1,3 @@ +subdir('include') subdir('src') subdir('testbed') diff --git a/plugins/threaded/src/threaded_core.c b/plugins/threaded/src/threaded_core.c index d4f6d28..385d7f5 100644 --- a/plugins/threaded/src/threaded_core.c +++ b/plugins/threaded/src/threaded_core.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, multithread extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/threaded/src/threaded_internal.h b/plugins/threaded/src/threaded_internal.h index e5dc9ff..3df3e2d 100644 --- a/plugins/threaded/src/threaded_internal.h +++ b/plugins/threaded/src/threaded_internal.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, multithreaded extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/plugins/threaded/src/threaded_main.c b/plugins/threaded/src/threaded_main.c index e11eec6..c4efe6d 100644 --- a/plugins/threaded/src/threaded_main.c +++ b/plugins/threaded/src/threaded_main.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/threaded/src/threaded_scheduler.c b/plugins/threaded/src/threaded_scheduler.c index 6c54076..eeba1c9 100644 --- a/plugins/threaded/src/threaded_scheduler.c +++ b/plugins/threaded/src/threaded_scheduler.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, multithreaded extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/threaded/src/threaded_split.c b/plugins/threaded/src/threaded_split.c index cb96f34..b3ea6e5 100644 --- a/plugins/threaded/src/threaded_split.c +++ b/plugins/threaded/src/threaded_split.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, fast floating point extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // // This program is free software: you can redistribute it and/or modify diff --git a/plugins/threaded/testbed/threaded_testbed.c b/plugins/threaded/testbed/threaded_testbed.c index ef8d90e..eae94c3 100644 --- a/plugins/threaded/testbed/threaded_testbed.c +++ b/plugins/threaded/testbed/threaded_testbed.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System, multithreaded extensions -// Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved +// Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -851,7 +851,7 @@ int main() #endif trace("Multithreaded extensions testbed - 1.1\n"); - trace("Copyright (c) 1998-2022 Marti Maria Saguer, all rights reserved\n"); + trace("Copyright (c) 1998-2023 Marti Maria Saguer, all rights reserved\n"); trace("\nInstalling error logger ... "); cmsSetLogErrorHandler(FatalErrorQuit); diff --git a/src/cmsalpha.c b/src/cmsalpha.c index d0cd189..806577f 100644 --- a/src/cmsalpha.c +++ b/src/cmsalpha.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmscam02.c b/src/cmscam02.c index f7838ee..3f080a1 100644 --- a/src/cmscam02.c +++ b/src/cmscam02.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -324,7 +324,7 @@ CAM02COLOR HPEtoCAT02(CAM02COLOR clr) M[5] = ((-0.7036 * 0.201908) + (1.6975 * 0.000008) + 0.0061); M[6] = (( 0.0030 * 1.910197) + (0.0136 * 0.370950)); M[7] = (( 0.0030 * -1.112124) + (0.0136 * 0.629054)); - M[8] = (( 0.0030 * 0.201908) + (0.0136 * 0.000008) + 0.9834);; + M[8] = (( 0.0030 * 0.201908) + (0.0136 * 0.000008) + 0.9834); clr.RGBc[0] = (clr.RGBp[0] * M[0]) + (clr.RGBp[1] * M[1]) + (clr.RGBp[2] * M[2]); clr.RGBc[1] = (clr.RGBp[0] * M[3]) + (clr.RGBp[1] * M[4]) + (clr.RGBp[2] * M[5]); diff --git a/src/cmscgats.c b/src/cmscgats.c index 845c18a..51fc2a6 100644 --- a/src/cmscgats.c +++ b/src/cmscgats.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -1939,13 +1939,15 @@ cmsBool CMSEXPORT cmsIT8SaveToMem(cmsHANDLE hIT8, void *MemPtr, cmsUInt32Number* memset(&sd, 0, sizeof(sd)); sd.stream = NULL; - sd.Base = (cmsUInt8Number*) MemPtr; + sd.Base = (cmsUInt8Number*) MemPtr; sd.Ptr = sd.Base; sd.Used = 0; - if (sd.Base) - sd.Max = *BytesNeeded; // Write to memory? + if (sd.Base && (*BytesNeeded > 0)) { + + sd.Max = (*BytesNeeded) - 1; // Write to memory? + } else sd.Max = 0; // Just counting the needed bytes diff --git a/src/cmscnvrt.c b/src/cmscnvrt.c index bca5796..de63975 100644 --- a/src/cmscnvrt.c +++ b/src/cmscnvrt.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmserr.c b/src/cmserr.c index 0078886..ccb40f9 100644 --- a/src/cmserr.c +++ b/src/cmserr.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsgamma.c b/src/cmsgamma.c index 5abbf16..1031fc1 100644 --- a/src/cmsgamma.c +++ b/src/cmsgamma.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmshalf.c b/src/cmshalf.c index 57cb5b0..043ee53 100644 --- a/src/cmshalf.c +++ b/src/cmshalf.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsintrp.c b/src/cmsintrp.c index 5eb98e6..2b5c634 100644 --- a/src/cmsintrp.c +++ b/src/cmsintrp.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsio0.c b/src/cmsio0.c index 222f7c7..945140a 100644 --- a/src/cmsio0.c +++ b/src/cmsio0.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -1922,7 +1922,7 @@ cmsUInt32Number CMSEXPORT cmsReadRawTag(cmsHPROFILE hProfile, cmsTagSignature si if (data != NULL) { if (BufferSize < TagSize) - goto Error; + TagSize = BufferSize; if (!Icc ->IOhandler ->Seek(Icc ->IOhandler, Offset)) goto Error; if (!Icc ->IOhandler ->Read(Icc ->IOhandler, data, 1, TagSize)) goto Error; @@ -1935,7 +1935,7 @@ cmsUInt32Number CMSEXPORT cmsReadRawTag(cmsHPROFILE hProfile, cmsTagSignature si return Icc ->TagSizes[i]; } - // The data has been already read, or written. But wait!, maybe the user chose to save as + // The data has been already read, or written. But wait!, maybe the user choose to save as // raw data. In this case, return the raw data directly if (Icc ->TagSaveAsRaw[i]) { @@ -1944,7 +1944,7 @@ cmsUInt32Number CMSEXPORT cmsReadRawTag(cmsHPROFILE hProfile, cmsTagSignature si TagSize = Icc ->TagSizes[i]; if (BufferSize < TagSize) - goto Error; + TagSize = BufferSize; memmove(data, Icc ->TagPtrs[i], TagSize); diff --git a/src/cmsio1.c b/src/cmsio1.c index 5df75fa..b923739 100644 --- a/src/cmsio1.c +++ b/src/cmsio1.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmslut.c b/src/cmslut.c index 6f8012a..77977fc 100644 --- a/src/cmslut.c +++ b/src/cmslut.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsmd5.c b/src/cmsmd5.c index f0af214..cd6ce97 100644 --- a/src/cmsmd5.c +++ b/src/cmsmd5.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsmtrx.c b/src/cmsmtrx.c index 86a66f7..5f5a3c8 100644 --- a/src/cmsmtrx.c +++ b/src/cmsmtrx.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsnamed.c b/src/cmsnamed.c index bc580aa..54d1abf 100644 --- a/src/cmsnamed.c +++ b/src/cmsnamed.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -763,7 +763,13 @@ cmsStage* CMSEXPORT _cmsStageAllocNamedColor(cmsNAMEDCOLORLIST* NamedColorList, cmsNAMEDCOLORLIST* CMSEXPORT cmsGetNamedColorList(cmsHTRANSFORM xform) { _cmsTRANSFORM* v = (_cmsTRANSFORM*) xform; - cmsStage* mpe = v ->Lut->Elements; + cmsStage* mpe; + + if (v == NULL) return NULL; + if (v->Lut == NULL) return NULL; + + mpe = v->Lut->Elements; + if (mpe == NULL) return NULL; if (mpe ->Type != cmsSigNamedColorElemType) return NULL; return (cmsNAMEDCOLORLIST*) mpe ->Data; diff --git a/src/cmsopt.c b/src/cmsopt.c index 8d64d17..b3d831c 100644 --- a/src/cmsopt.c +++ b/src/cmsopt.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmspack.c b/src/cmspack.c index 72b4785..5a96712 100644 --- a/src/cmspack.c +++ b/src/cmspack.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmspcs.c b/src/cmspcs.c index a0f1952..e11f87c 100644 --- a/src/cmspcs.c +++ b/src/cmspcs.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsplugin.c b/src/cmsplugin.c index 1d8c358..3876506 100644 --- a/src/cmsplugin.c +++ b/src/cmsplugin.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsps2.c b/src/cmsps2.c index 4bb17b0..9aeea36 100644 --- a/src/cmsps2.c +++ b/src/cmsps2.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmssamp.c b/src/cmssamp.c index 124deff..4888f1e 100644 --- a/src/cmssamp.c +++ b/src/cmssamp.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmssm.c b/src/cmssm.c index fb6965e..5c1e430 100644 --- a/src/cmssm.c +++ b/src/cmssm.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmstypes.c b/src/cmstypes.c index 2a565b0..ec1909f 100644 --- a/src/cmstypes.c +++ b/src/cmstypes.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsvirt.c b/src/cmsvirt.c index b8ef607..951a8ee 100644 --- a/src/cmsvirt.c +++ b/src/cmsvirt.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmswtpnt.c b/src/cmswtpnt.c index 07d4746..a73eaa7 100644 --- a/src/cmswtpnt.c +++ b/src/cmswtpnt.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsxform.c b/src/cmsxform.c index 38ea624..c70b7cb 100644 --- a/src/cmsxform.c +++ b/src/cmsxform.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/lcms2_internal.h b/src/lcms2_internal.h index 94282a4..1fc99fb 100644 --- a/src/lcms2_internal.h +++ b/src/lcms2_internal.h @@ -1,7 +1,7 @@ // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/testbed/testplugin.c b/testbed/testplugin.c index 8a32fe3..43b98a4 100755 --- a/testbed/testplugin.c +++ b/testbed/testplugin.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/testbed/zoo_icc.c b/testbed/zoo_icc.c index d208e9a..c589493 100755 --- a/testbed/zoo_icc.c +++ b/testbed/zoo_icc.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/utils/common/utils.h b/utils/common/utils.h index eed90cb..3f040f9 100644 --- a/utils/common/utils.h +++ b/utils/common/utils.h @@ -2,7 +2,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/utils/common/vprf.c b/utils/common/vprf.c index 9417932..ae23d70 100644 --- a/utils/common/vprf.c +++ b/utils/common/vprf.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/utils/common/xgetopt.c b/utils/common/xgetopt.c index 339ba2d..2a93456 100644 --- a/utils/common/xgetopt.c +++ b/utils/common/xgetopt.c @@ -2,7 +2,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/utils/jpgicc/jpgicc.c b/utils/jpgicc/jpgicc.c index 2caf1b3..e4ac4c4 100644 --- a/utils/jpgicc/jpgicc.c +++ b/utils/jpgicc/jpgicc.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -1251,7 +1251,7 @@ int main(int argc, char* argv[]) { fprintf(stderr, "Little CMS ICC profile applier for JPEG - v3.4 [LittleCMS %2.2f]\n\n", cmsGetEncodedCMMversion() / 1000.0); - fprintf(stderr, "Copyright (c) 1998-2022 Marti Maria Saguer. See COPYING file for details.\n"); + fprintf(stderr, "Copyright (c) 1998-2023 Marti Maria Saguer. See COPYING file for details.\n"); fflush(stderr); InitUtils("jpgicc"); diff --git a/utils/linkicc/linkicc.c b/utils/linkicc/linkicc.c index b028d11..a227ed2 100644 --- a/utils/linkicc/linkicc.c +++ b/utils/linkicc/linkicc.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -271,7 +271,7 @@ int main(int argc, char *argv[]) // Here we are fprintf(stderr, "Little CMS ICC device link generator - v3.2 [LittleCMS %2.2f]\n", cmsGetEncodedCMMversion() / 1000.0); - fprintf(stderr, "Copyright (c) 1998-2022 Marti Maria Saguer. See COPYING file for details.\n"); + fprintf(stderr, "Copyright (c) 1998-2023 Marti Maria Saguer. See COPYING file for details.\n"); fflush(stderr); // Initialize diff --git a/utils/meson.build b/utils/meson.build index 4789323..49316b1 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -1,6 +1,10 @@ subdir('common') -subdir('jpgicc') +if jpeg_dep.found() + subdir('jpgicc') +endif subdir('linkicc') subdir('psicc') -subdir('tificc') +if tiff_dep.found() + subdir('tificc') +endif subdir('transicc') diff --git a/utils/psicc/psicc.c b/utils/psicc/psicc.c index 38f9ab2..97d3f07 100644 --- a/utils/psicc/psicc.c +++ b/utils/psicc/psicc.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -213,7 +213,7 @@ int main(int argc, char *argv[]) int nargs; fprintf(stderr, "Little CMS ICC PostScript generator - v2.1 [LittleCMS %2.2f]\n", cmsGetEncodedCMMversion() / 1000.0); - fprintf(stderr, "Copyright (c) 1998-2022 Marti Maria Saguer. See COPYING file for details.\n"); + fprintf(stderr, "Copyright (c) 1998-2023 Marti Maria Saguer. See COPYING file for details.\n"); fflush(stderr); // Initialize diff --git a/utils/tificc/tifdiff.c b/utils/tificc/tifdiff.c index 14a91b0..b1f8d5b 100644 --- a/utils/tificc/tifdiff.c +++ b/utils/tificc/tifdiff.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/utils/tificc/tificc.c b/utils/tificc/tificc.c index 7407a34..65881c0 100644 --- a/utils/tificc/tificc.c +++ b/utils/tificc/tificc.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -1190,7 +1190,7 @@ int main(int argc, char* argv[]) fprintf(stderr, "Little CMS ICC profile applier for TIFF - v7.2 [LittleCMS %2.2f]\n\n", cmsGetEncodedCMMversion() / 1000.0); - fprintf(stderr, "Copyright (c) 1998-2022 Marti Maria Saguer. See COPYING file for details.\n"); + fprintf(stderr, "Copyright (c) 1998-2023 Marti Maria Saguer. See COPYING file for details.\n"); fflush(stderr); cmsPlugin(&TiffLabPlugin); diff --git a/utils/transicc/transicc.c b/utils/transicc/transicc.c index 5b1304c..debaeb4 100644 --- a/utils/transicc/transicc.c +++ b/utils/transicc/transicc.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2022 Marti Maria Saguer +// Copyright (c) 1998-2023 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -1254,7 +1254,7 @@ int main(int argc, char *argv[]) int nPatch = 0; fprintf(stderr, "LittleCMS ColorSpace conversion calculator - 5.1 [LittleCMS %2.2f]\n", cmsGetEncodedCMMversion() / 1000.0); - fprintf(stderr, "Copyright (c) 1998-2022 Marti Maria Saguer. See COPYING file for details.\n"); + fprintf(stderr, "Copyright (c) 1998-2023 Marti Maria Saguer. See COPYING file for details.\n"); fflush(stderr); InitUtils("transicc"); |