Skip to content

Commit c0445d0

Browse files
mm2mm2
committed
Feedback for 2.18 rc1
-Force C compilation in VS 2026 - Fix compilation as C++ - Add a check for division by zero (per #526)
1 parent 2f1d4a7 commit c0445d0

13 files changed

Lines changed: 26 additions & 8 deletions

File tree

‎Projects/VC2026/lcms2_DLL/lcms2_DLL.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@
198198
<WarningLevel>Level4</WarningLevel>
199199
<MultiProcessorCompilation>true</MultiProcessorCompilation>
200200
<StringPooling>false</StringPooling>
201+
<CompileAs>CompileAsC</CompileAs>
201202
</ClCompile>
202203
<Link>
203204
<ModuleDefinitionFile>
@@ -286,6 +287,7 @@
286287
<StringPooling>true</StringPooling>
287288
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
288289
<MultiProcessorCompilation>true</MultiProcessorCompilation>
290+
<CompileAs>CompileAsC</CompileAs>
289291
</ClCompile>
290292
<Link>
291293
<ModuleDefinitionFile>

‎Projects/VC2026/lcms2_static/lcms2_static.vcxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<FunctionLevelLinking>
170170
</FunctionLevelLinking>
171171
<MultiProcessorCompilation>true</MultiProcessorCompilation>
172-
<CompileAs>Default</CompileAs>
172+
<CompileAs>CompileAsC</CompileAs>
173173
</ClCompile>
174174
</ItemDefinitionGroup>
175175
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -246,6 +246,7 @@
246246
<MultiProcessorCompilation>true</MultiProcessorCompilation>
247247
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
248248
<StringPooling>true</StringPooling>
249+
<CompileAs>CompileAsC</CompileAs>
249250
</ClCompile>
250251
</ItemDefinitionGroup>
251252
<ItemGroup>

‎Projects/VC2026/linkicc/linkicc.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
<WarningLevel>Level4</WarningLevel>
179179
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
180180
<MultiProcessorCompilation>true</MultiProcessorCompilation>
181+
<CompileAs>CompileAsC</CompileAs>
181182
</ClCompile>
182183
<Link>
183184
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -248,6 +249,7 @@
248249
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
249250
<MultiProcessorCompilation>true</MultiProcessorCompilation>
250251
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
252+
<CompileAs>CompileAsC</CompileAs>
251253
</ClCompile>
252254
<Link>
253255
<GenerateDebugInformation>true</GenerateDebugInformation>

‎Projects/VC2026/psicc/psicc.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
<WarningLevel>Level4</WarningLevel>
179179
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
180180
<MultiProcessorCompilation>true</MultiProcessorCompilation>
181+
<CompileAs>CompileAsC</CompileAs>
181182
</ClCompile>
182183
<Link>
183184
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -248,6 +249,7 @@
248249
<WarningLevel>Level4</WarningLevel>
249250
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
250251
<MultiProcessorCompilation>true</MultiProcessorCompilation>
252+
<CompileAs>CompileAsC</CompileAs>
251253
</ClCompile>
252254
<Link>
253255
<GenerateDebugInformation>true</GenerateDebugInformation>

‎Projects/VC2026/testbed/testbed.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@
182182
<WarningLevel>Level3</WarningLevel>
183183
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
184184
<MultiProcessorCompilation>true</MultiProcessorCompilation>
185+
<CompileAs>CompileAsC</CompileAs>
185186
</ClCompile>
186187
<Link>
187188
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -273,6 +274,7 @@
273274
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
274275
<CallingConvention>Cdecl</CallingConvention>
275276
<MultiProcessorCompilation>true</MultiProcessorCompilation>
277+
<CompileAs>CompileAsC</CompileAs>
276278
</ClCompile>
277279
<Link>
278280
<GenerateDebugInformation>true</GenerateDebugInformation>

‎Projects/VC2026/tiffdiff/tiffdiff.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@
194194
<WarningLevel>Level4</WarningLevel>
195195
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
196196
<MultiProcessorCompilation>true</MultiProcessorCompilation>
197+
<CompileAs>CompileAsC</CompileAs>
197198
</ClCompile>
198199
<Link>
199200
<AdditionalDependencies>libtiff.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -272,6 +273,7 @@
272273
<WarningLevel>Level4</WarningLevel>
273274
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
274275
<MultiProcessorCompilation>true</MultiProcessorCompilation>
276+
<CompileAs>CompileAsC</CompileAs>
275277
</ClCompile>
276278
<Link>
277279
<AdditionalDependencies>libtiff.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎Projects/VC2026/tifficc/tifficc.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@
194194
<WarningLevel>Level3</WarningLevel>
195195
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
196196
<MultiProcessorCompilation>true</MultiProcessorCompilation>
197+
<CompileAs>CompileAsC</CompileAs>
197198
</ClCompile>
198199
<Link>
199200
<AdditionalDependencies>tiff.lib;jpeg-static.lib;zlibstatic.lib;webp.lib;webpdecoder.lib;webpdemux.lib;webpmux.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -270,6 +271,7 @@
270271
<WarningLevel>Level4</WarningLevel>
271272
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
272273
<MultiProcessorCompilation>true</MultiProcessorCompilation>
274+
<CompileAs>CompileAsC</CompileAs>
273275
</ClCompile>
274276
<Link>
275277
<AdditionalDependencies>tiff.lib;jpeg-static.lib;zlibstatic.lib;webp.lib;webpdecoder.lib;webpdemux.lib;webpmux.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎Projects/VC2026/transicc/transicc.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
<WarningLevel>Level4</WarningLevel>
179179
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
180180
<MultiProcessorCompilation>true</MultiProcessorCompilation>
181+
<CompileAs>CompileAsC</CompileAs>
181182
</ClCompile>
182183
<Link>
183184
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -248,6 +249,7 @@
248249
<WarningLevel>Level4</WarningLevel>
249250
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
250251
<MultiProcessorCompilation>true</MultiProcessorCompilation>
252+
<CompileAs>CompileAsC</CompileAs>
251253
</ClCompile>
252254
<Link>
253255
<GenerateDebugInformation>true</GenerateDebugInformation>

‎plugins/fast_float/Projects/VC2022/lcms2_fast_float_plugin.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@
186186
<PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
187187
<AdditionalIncludeDirectories>..\..\include;..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
188188
<FloatingPointModel>Fast</FloatingPointModel>
189+
<CompileAs>CompileAsC</CompileAs>
189190
</ClCompile>
190191
<Link>
191192
<SubSystem>Windows</SubSystem>
@@ -270,6 +271,7 @@
270271
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
271272
<FloatingPointModel>Fast</FloatingPointModel>
272273
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
274+
<CompileAs>CompileAsC</CompileAs>
273275
</ClCompile>
274276
<Link>
275277
<SubSystem>Windows</SubSystem>

‎plugins/fast_float/Projects/VC2022/lcms2_fast_float_plugin_testbed.vcxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<Optimization>Disabled</Optimization>
159159
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160160
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\include;..\..\src</AdditionalIncludeDirectories>
161-
<CompileAs>Default</CompileAs>
161+
<CompileAs>CompileAsC</CompileAs>
162162
</ClCompile>
163163
<Link>
164164
<SubSystem>Console</SubSystem>
@@ -214,6 +214,7 @@
214214
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
215215
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\include;..\..\src</AdditionalIncludeDirectories>
216216
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
217+
<CompileAs>CompileAsC</CompileAs>
217218
</ClCompile>
218219
<Link>
219220
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)