From be0bddc8d498d8c4af18d4916eaa7b43503e81c3 Mon Sep 17 00:00:00 2001 From: Marti Maria Date: Fri, 17 Jan 2025 11:12:23 +0100 Subject: [PATCH] Fix meson version --- fuzzers/fuzzers.c | 6 +++--- meson.build | 7 +++++-- meson_options.txt | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fuzzers/fuzzers.c b/fuzzers/fuzzers.c index 40d6244f..5c6c9527 100644 --- a/fuzzers/fuzzers.c +++ b/fuzzers/fuzzers.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2024 Marti Maria Saguer +// Copyright (c) 1998-2025 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"), @@ -62,7 +62,7 @@ void ReadAllRAWTags(cmsHPROFILE h) } } -// read and decode information +// Read and decode information static void FetchInfo(cmsHPROFILE h, cmsInfoType Info) { @@ -140,12 +140,12 @@ void ReadAllLUTS(cmsHPROFILE h) cmsDetectDestinationBlackPoint(&Black, h, INTENT_RELATIVE_COLORIMETRIC, 0); cmsDetectDestinationBlackPoint(&Black, h, INTENT_SATURATION, 0); cmsDetectDestinationBlackPoint(&Black, h, INTENT_ABSOLUTE_COLORIMETRIC, 0); + cmsDetectTAC(h); } // Create PostScript resources - static void GenerateCSA(cmsHPROFILE hProfile) { diff --git a/meson.build b/meson.build index 298f4a86..ff917151 100644 --- a/meson.build +++ b/meson.build @@ -1,8 +1,8 @@ project( 'Little-CMS', 'c', - version: '2.16', - meson_version: '>=0.63.0', + version: '2.17', + meson_version: '>=0.49.0', # default_options: ['c_std=c99'] ) @@ -108,7 +108,10 @@ win = import('windows') subdir('include') subdir('src') + +if get_option('tests').enabled() subdir('testbed') +endif if get_option('utils') subdir('utils') diff --git a/meson_options.txt b/meson_options.txt index 60b8eb82..e6296740 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ +option('tests', type: 'feature', value: 'enabled', yield: true, description: 'Enable or disable tests') + option('jpeg', type: 'feature', value: 'auto', description: 'Use JPEG') option('tiff', type: 'feature', value: 'auto', description: 'Use LibTiff')