SourceForge: enblend/enblend: changeset 596:f2451287ddf1
Adopt changes of rev ea0c41a98dc for windows. Patch by Thomas Modes.
authorDr. Christoph L. Spiel <cspiel@freenet.de>
Tue Nov 03 13:56:24 2009 +0100 (3 weeks ago)
changeset 596f2451287ddf1
parent 595ea0c41a98dcc
child 597af0a40a346e7
Adopt changes of rev ea0c41a98dc for windows. Patch by Thomas Modes.
VERSION
src/enblend_msvc2008.vcproj
src/enfuse_msvc2008.vcproj
src/tiff_message.cc
src/vigra_impex/vigra_impex_msvc2008.vcproj
     1.1 --- a/VERSION	Sat Oct 31 15:17:48 2009 +0100
     1.2 +++ b/VERSION	Tue Nov 03 13:56:24 2009 +0100
     1.3 @@ -1,1 +1,1 @@
     1.4 -4.0-06c64ccdaae3
     1.5 +4.0-ea0c41a98dcc
     2.1 --- a/src/enblend_msvc2008.vcproj	Sat Oct 31 15:17:48 2009 +0100
     2.2 +++ b/src/enblend_msvc2008.vcproj	Tue Nov 03 13:56:24 2009 +0100
     2.3 @@ -1,496 +1,504 @@
     2.4 -<?xml version="1.0" encoding="Windows-1252"?>
     2.5 -<VisualStudioProject
     2.6 -	ProjectType="Visual C++"
     2.7 -	Version="9,00"
     2.8 -	Name="enblend"
     2.9 -	ProjectGUID="{A1402918-6CCA-4625-A83B-FF965635D7BE}"
    2.10 -	RootNamespace="enblend"
    2.11 -	Keyword="Win32Proj"
    2.12 -	TargetFrameworkVersion="131072"
    2.13 -	>
    2.14 -	<Platforms>
    2.15 -		<Platform
    2.16 -			Name="Win32"
    2.17 -		/>
    2.18 -	</Platforms>
    2.19 -	<ToolFiles>
    2.20 -	</ToolFiles>
    2.21 -	<Configurations>
    2.22 -		<Configuration
    2.23 -			Name="Debug|Win32"
    2.24 -			OutputDirectory="Debug"
    2.25 -			IntermediateDirectory="Debug"
    2.26 -			ConfigurationType="1"
    2.27 -			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
    2.28 -			CharacterSet="2"
    2.29 -			>
    2.30 -			<Tool
    2.31 -				Name="VCPreBuildEventTool"
    2.32 -				CommandLine="perl gen_sig --extra=4.0-mercurial &gt;signature.h"
    2.33 -			/>
    2.34 -			<Tool
    2.35 -				Name="VCCustomBuildTool"
    2.36 -			/>
    2.37 -			<Tool
    2.38 -				Name="VCXMLDataGeneratorTool"
    2.39 -			/>
    2.40 -			<Tool
    2.41 -				Name="VCWebServiceProxyGeneratorTool"
    2.42 -			/>
    2.43 -			<Tool
    2.44 -				Name="VCMIDLTool"
    2.45 -			/>
    2.46 -			<Tool
    2.47 -				Name="VCCLCompilerTool"
    2.48 -				Optimization="0"
    2.49 -				EnableIntrinsicFunctions="true"
    2.50 -				AdditionalIncludeDirectories="&quot;..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxMSW-2.8.10\src\jpeg&quot;;&quot;..\..\wxMSW-2.8.10\src\png&quot;;&quot;..\..\wxMSW-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;win32helpers"
    2.51 -				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;ENBLEND_CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE"
    2.52 -				MinimalRebuild="true"
    2.53 -				BasicRuntimeChecks="3"
    2.54 -				RuntimeLibrary="1"
    2.55 -				RuntimeTypeInfo="true"
    2.56 -				UsePrecompiledHeader="0"
    2.57 -				WarningLevel="3"
    2.58 -				Detect64BitPortabilityProblems="true"
    2.59 -				DebugInformationFormat="4"
    2.60 -			/>
    2.61 -			<Tool
    2.62 -				Name="VCManagedResourceCompilerTool"
    2.63 -			/>
    2.64 -			<Tool
    2.65 -				Name="VCResourceCompilerTool"
    2.66 -			/>
    2.67 -			<Tool
    2.68 -				Name="VCPreLinkEventTool"
    2.69 -			/>
    2.70 -			<Tool
    2.71 -				Name="VCLinkerTool"
    2.72 -				AdditionalDependencies="libtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib"
    2.73 -				OutputFile="$(OutDir)/enblend.exe"
    2.74 -				LinkIncremental="2"
    2.75 -				AdditionalLibraryDirectories="&quot;..\..\wxMSW-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Debug&quot;;&quot;..\..\STLport-trunk\lib&quot;;..\..\Deploy\lib\Debug;&quot;..\..\tiff-3.8.2\libtiff&quot;"
    2.76 -				GenerateDebugInformation="true"
    2.77 -				ProgramDatabaseFile="$(OutDir)/enblend.pdb"
    2.78 -				SubSystem="1"
    2.79 -				RandomizedBaseAddress="1"
    2.80 -				DataExecutionPrevention="0"
    2.81 -				TargetMachine="1"
    2.82 -			/>
    2.83 -			<Tool
    2.84 -				Name="VCALinkTool"
    2.85 -			/>
    2.86 -			<Tool
    2.87 -				Name="VCManifestTool"
    2.88 -			/>
    2.89 -			<Tool
    2.90 -				Name="VCXDCMakeTool"
    2.91 -			/>
    2.92 -			<Tool
    2.93 -				Name="VCBscMakeTool"
    2.94 -			/>
    2.95 -			<Tool
    2.96 -				Name="VCFxCopTool"
    2.97 -			/>
    2.98 -			<Tool
    2.99 -				Name="VCAppVerifierTool"
   2.100 -			/>
   2.101 -			<Tool
   2.102 -				Name="VCPostBuildEventTool"
   2.103 -			/>
   2.104 -		</Configuration>
   2.105 -		<Configuration
   2.106 -			Name="Release_NoSSE|Win32"
   2.107 -			OutputDirectory="$(ConfigurationName)"
   2.108 -			IntermediateDirectory="$(ConfigurationName)"
   2.109 -			ConfigurationType="1"
   2.110 -			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   2.111 -			UseOfMFC="0"
   2.112 -			CharacterSet="2"
   2.113 -			WholeProgramOptimization="1"
   2.114 -			>
   2.115 -			<Tool
   2.116 -				Name="VCPreBuildEventTool"
   2.117 -				CommandLine="perl gen_sig --extra=4.0-mercurial &gt;signature.h"
   2.118 -			/>
   2.119 -			<Tool
   2.120 -				Name="VCCustomBuildTool"
   2.121 -			/>
   2.122 -			<Tool
   2.123 -				Name="VCXMLDataGeneratorTool"
   2.124 -			/>
   2.125 -			<Tool
   2.126 -				Name="VCWebServiceProxyGeneratorTool"
   2.127 -			/>
   2.128 -			<Tool
   2.129 -				Name="VCMIDLTool"
   2.130 -			/>
   2.131 -			<Tool
   2.132 -				Name="VCCLCompilerTool"
   2.133 -				Optimization="3"
   2.134 -				InlineFunctionExpansion="2"
   2.135 -				EnableIntrinsicFunctions="true"
   2.136 -				FavorSizeOrSpeed="1"
   2.137 -				WholeProgramOptimization="true"
   2.138 -				AdditionalIncludeDirectories="&quot;..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   2.139 -				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   2.140 -				RuntimeLibrary="0"
   2.141 -				BufferSecurityCheck="false"
   2.142 -				EnableEnhancedInstructionSet="0"
   2.143 -				RuntimeTypeInfo="true"
   2.144 -				UsePrecompiledHeader="0"
   2.145 -				WarningLevel="3"
   2.146 -				Detect64BitPortabilityProblems="true"
   2.147 -				DebugInformationFormat="3"
   2.148 -				DisableSpecificWarnings="4251"
   2.149 -			/>
   2.150 -			<Tool
   2.151 -				Name="VCManagedResourceCompilerTool"
   2.152 -			/>
   2.153 -			<Tool
   2.154 -				Name="VCResourceCompilerTool"
   2.155 -			/>
   2.156 -			<Tool
   2.157 -				Name="VCPreLinkEventTool"
   2.158 -			/>
   2.159 -			<Tool
   2.160 -				Name="VCLinkerTool"
   2.161 -				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib glut32.lib"
   2.162 -				OutputFile="$(OutDir)/enblend_nosse.exe"
   2.163 -				LinkIncremental="1"
   2.164 -				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-trunk\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glew\lib;..\..\glut\Release"
   2.165 -				GenerateDebugInformation="false"
   2.166 -				SubSystem="1"
   2.167 -				LargeAddressAware="2"
   2.168 -				OptimizeReferences="2"
   2.169 -				EnableCOMDATFolding="2"
   2.170 -				RandomizedBaseAddress="1"
   2.171 -				DataExecutionPrevention="0"
   2.172 -				TargetMachine="1"
   2.173 -			/>
   2.174 -			<Tool
   2.175 -				Name="VCALinkTool"
   2.176 -			/>
   2.177 -			<Tool
   2.178 -				Name="VCManifestTool"
   2.179 -			/>
   2.180 -			<Tool
   2.181 -				Name="VCXDCMakeTool"
   2.182 -			/>
   2.183 -			<Tool
   2.184 -				Name="VCBscMakeTool"
   2.185 -			/>
   2.186 -			<Tool
   2.187 -				Name="VCFxCopTool"
   2.188 -			/>
   2.189 -			<Tool
   2.190 -				Name="VCAppVerifierTool"
   2.191 -			/>
   2.192 -			<Tool
   2.193 -				Name="VCPostBuildEventTool"
   2.194 -				CommandLine=""
   2.195 -			/>
   2.196 -		</Configuration>
   2.197 -		<Configuration
   2.198 -			Name="Release|Win32"
   2.199 -			OutputDirectory="$(ConfigurationName)"
   2.200 -			IntermediateDirectory="$(ConfigurationName)"
   2.201 -			ConfigurationType="1"
   2.202 -			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   2.203 -			UseOfMFC="0"
   2.204 -			CharacterSet="2"
   2.205 -			WholeProgramOptimization="1"
   2.206 -			>
   2.207 -			<Tool
   2.208 -				Name="VCPreBuildEventTool"
   2.209 -				CommandLine="perl gen_sig --extra=4.0-mercurial &gt;signature.h"
   2.210 -			/>
   2.211 -			<Tool
   2.212 -				Name="VCCustomBuildTool"
   2.213 -			/>
   2.214 -			<Tool
   2.215 -				Name="VCXMLDataGeneratorTool"
   2.216 -			/>
   2.217 -			<Tool
   2.218 -				Name="VCWebServiceProxyGeneratorTool"
   2.219 -			/>
   2.220 -			<Tool
   2.221 -				Name="VCMIDLTool"
   2.222 -			/>
   2.223 -			<Tool
   2.224 -				Name="VCCLCompilerTool"
   2.225 -				Optimization="3"
   2.226 -				InlineFunctionExpansion="2"
   2.227 -				EnableIntrinsicFunctions="true"
   2.228 -				FavorSizeOrSpeed="1"
   2.229 -				WholeProgramOptimization="true"
   2.230 -				AdditionalIncludeDirectories="&quot;..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   2.231 -				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   2.232 -				RuntimeLibrary="0"
   2.233 -				BufferSecurityCheck="false"
   2.234 -				EnableEnhancedInstructionSet="2"
   2.235 -				RuntimeTypeInfo="true"
   2.236 -				UsePrecompiledHeader="0"
   2.237 -				WarningLevel="3"
   2.238 -				Detect64BitPortabilityProblems="true"
   2.239 -				DebugInformationFormat="3"
   2.240 -				DisableSpecificWarnings="4251"
   2.241 -			/>
   2.242 -			<Tool
   2.243 -				Name="VCManagedResourceCompilerTool"
   2.244 -			/>
   2.245 -			<Tool
   2.246 -				Name="VCResourceCompilerTool"
   2.247 -			/>
   2.248 -			<Tool
   2.249 -				Name="VCPreLinkEventTool"
   2.250 -			/>
   2.251 -			<Tool
   2.252 -				Name="VCLinkerTool"
   2.253 -				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib glut32.lib"
   2.254 -				OutputFile="$(OutDir)/enblend.exe"
   2.255 -				LinkIncremental="1"
   2.256 -				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-trunk\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glew\lib;..\..\glut\Release"
   2.257 -				GenerateDebugInformation="false"
   2.258 -				SubSystem="1"
   2.259 -				LargeAddressAware="2"
   2.260 -				OptimizeReferences="2"
   2.261 -				EnableCOMDATFolding="2"
   2.262 -				RandomizedBaseAddress="1"
   2.263 -				DataExecutionPrevention="0"
   2.264 -				TargetMachine="1"
   2.265 -			/>
   2.266 -			<Tool
   2.267 -				Name="VCALinkTool"
   2.268 -			/>
   2.269 -			<Tool
   2.270 -				Name="VCManifestTool"
   2.271 -			/>
   2.272 -			<Tool
   2.273 -				Name="VCXDCMakeTool"
   2.274 -			/>
   2.275 -			<Tool
   2.276 -				Name="VCBscMakeTool"
   2.277 -			/>
   2.278 -			<Tool
   2.279 -				Name="VCFxCopTool"
   2.280 -			/>
   2.281 -			<Tool
   2.282 -				Name="VCAppVerifierTool"
   2.283 -			/>
   2.284 -			<Tool
   2.285 -				Name="VCPostBuildEventTool"
   2.286 -				CommandLine=""
   2.287 -			/>
   2.288 -		</Configuration>
   2.289 -		<Configuration
   2.290 -			Name="Release_OpenMP|Win32"
   2.291 -			OutputDirectory="$(ConfigurationName)"
   2.292 -			IntermediateDirectory="$(ConfigurationName)"
   2.293 -			ConfigurationType="1"
   2.294 -			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   2.295 -			UseOfMFC="0"
   2.296 -			CharacterSet="2"
   2.297 -			WholeProgramOptimization="1"
   2.298 -			>
   2.299 -			<Tool
   2.300 -				Name="VCPreBuildEventTool"
   2.301 -				CommandLine="perl gen_sig --extra=4.0-mercurial &gt;signature.h"
   2.302 -			/>
   2.303 -			<Tool
   2.304 -				Name="VCCustomBuildTool"
   2.305 -			/>
   2.306 -			<Tool
   2.307 -				Name="VCXMLDataGeneratorTool"
   2.308 -			/>
   2.309 -			<Tool
   2.310 -				Name="VCWebServiceProxyGeneratorTool"
   2.311 -			/>
   2.312 -			<Tool
   2.313 -				Name="VCMIDLTool"
   2.314 -			/>
   2.315 -			<Tool
   2.316 -				Name="VCCLCompilerTool"
   2.317 -				Optimization="3"
   2.318 -				InlineFunctionExpansion="2"
   2.319 -				EnableIntrinsicFunctions="true"
   2.320 -				FavorSizeOrSpeed="1"
   2.321 -				WholeProgramOptimization="true"
   2.322 -				AdditionalIncludeDirectories="&quot;..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   2.323 -				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   2.324 -				RuntimeLibrary="0"
   2.325 -				BufferSecurityCheck="false"
   2.326 -				EnableEnhancedInstructionSet="2"
   2.327 -				RuntimeTypeInfo="true"
   2.328 -				OpenMP="true"
   2.329 -				UsePrecompiledHeader="0"
   2.330 -				WarningLevel="3"
   2.331 -				Detect64BitPortabilityProblems="true"
   2.332 -				DebugInformationFormat="3"
   2.333 -				DisableSpecificWarnings="4251"
   2.334 -			/>
   2.335 -			<Tool
   2.336 -				Name="VCManagedResourceCompilerTool"
   2.337 -			/>
   2.338 -			<Tool
   2.339 -				Name="VCResourceCompilerTool"
   2.340 -			/>
   2.341 -			<Tool
   2.342 -				Name="VCPreLinkEventTool"
   2.343 -			/>
   2.344 -			<Tool
   2.345 -				Name="VCLinkerTool"
   2.346 -				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib glut32.lib"
   2.347 -				OutputFile="$(OutDir)/enblend_openmp.exe"
   2.348 -				LinkIncremental="1"
   2.349 -				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-trunk\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glew\lib;..\..\glut\Release"
   2.350 -				GenerateDebugInformation="false"
   2.351 -				SubSystem="1"
   2.352 -				LargeAddressAware="2"
   2.353 -				OptimizeReferences="2"
   2.354 -				EnableCOMDATFolding="2"
   2.355 -				RandomizedBaseAddress="1"
   2.356 -				DataExecutionPrevention="0"
   2.357 -				TargetMachine="1"
   2.358 -			/>
   2.359 -			<Tool
   2.360 -				Name="VCALinkTool"
   2.361 -			/>
   2.362 -			<Tool
   2.363 -				Name="VCManifestTool"
   2.364 -			/>
   2.365 -			<Tool
   2.366 -				Name="VCXDCMakeTool"
   2.367 -			/>
   2.368 -			<Tool
   2.369 -				Name="VCBscMakeTool"
   2.370 -			/>
   2.371 -			<Tool
   2.372 -				Name="VCFxCopTool"
   2.373 -			/>
   2.374 -			<Tool
   2.375 -				Name="VCAppVerifierTool"
   2.376 -			/>
   2.377 -			<Tool
   2.378 -				Name="VCPostBuildEventTool"
   2.379 -				CommandLine=""
   2.380 -			/>
   2.381 -		</Configuration>
   2.382 -	</Configurations>
   2.383 -	<References>
   2.384 -	</References>
   2.385 -	<Files>
   2.386 -		<Filter
   2.387 -			Name="Source Files"
   2.388 -			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
   2.389 -			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
   2.390 -			>
   2.391 -			<File
   2.392 -				RelativePath=".\enblend.cc"
   2.393 -				>
   2.394 -			</File>
   2.395 -			<File
   2.396 -				RelativePath=".\filenameparse.cc"
   2.397 -				>
   2.398 -			</File>
   2.399 -			<File
   2.400 -				RelativePath=".\win32helpers\getopt.c"
   2.401 -				>
   2.402 -			</File>
   2.403 -			<File
   2.404 -				RelativePath=".\gpu.cc"
   2.405 -				>
   2.406 -			</File>
   2.407 -			<File
   2.408 -				RelativePath=".\self_test.cc"
   2.409 -				>
   2.410 -			</File>
   2.411 -		</Filter>
   2.412 -		<Filter
   2.413 -			Name="Header Files"
   2.414 -			Filter="h;hpp;hxx;hm;inl;inc;xsd"
   2.415 -			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
   2.416 -			>
   2.417 -			<File
   2.418 -				RelativePath=".\anneal.h"
   2.419 -				>
   2.420 -			</File>
   2.421 -			<File
   2.422 -				RelativePath=".\assemble.h"
   2.423 -				>
   2.424 -			</File>
   2.425 -			<File
   2.426 -				RelativePath=".\blend.h"
   2.427 -				>
   2.428 -			</File>
   2.429 -			<File
   2.430 -				RelativePath=".\bounds.h"
   2.431 -				>
   2.432 -			</File>
   2.433 -			<File
   2.434 -				RelativePath=".\common.h"
   2.435 -				>
   2.436 -			</File>
   2.437 -			<File
   2.438 -				RelativePath=".\enblend.h"
   2.439 -				>
   2.440 -			</File>
   2.441 -			<File
   2.442 -				RelativePath=".\filenameparse.h"
   2.443 -				>
   2.444 -			</File>
   2.445 -			<File
   2.446 -				RelativePath=".\fixmath.h"
   2.447 -				>
   2.448 -			</File>
   2.449 -			<File
   2.450 -				RelativePath=".\float_cast.h"
   2.451 -				>
   2.452 -			</File>
   2.453 -			<File
   2.454 -				RelativePath=".\win32helpers\getopt.h"
   2.455 -				>
   2.456 -			</File>
   2.457 -			<File
   2.458 -				RelativePath=".\gpu.h"
   2.459 -				>
   2.460 -			</File>
   2.461 -			<File
   2.462 -				RelativePath=".\mask.h"
   2.463 -				>
   2.464 -			</File>
   2.465 -			<File
   2.466 -				RelativePath=".\nearest.h"
   2.467 -				>
   2.468 -			</File>
   2.469 -			<File
   2.470 -				RelativePath=".\numerictraits.h"
   2.471 -				>
   2.472 -			</File>
   2.473 -			<File
   2.474 -				RelativePath=".\path.h"
   2.475 -				>
   2.476 -			</File>
   2.477 -			<File
   2.478 -				RelativePath=".\pyramid.h"
   2.479 -				>
   2.480 -			</File>
   2.481 -			<File
   2.482 -				RelativePath=".\self_test.h"
   2.483 -				>
   2.484 -			</File>
   2.485 -			<File
   2.486 -				RelativePath=".\win32helpers\win32config.h"
   2.487 -				>
   2.488 -			</File>
   2.489 -		</Filter>
   2.490 -		<Filter
   2.491 -			Name="Resource Files"
   2.492 -			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
   2.493 -			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
   2.494 -			>
   2.495 -		</Filter>
   2.496 -	</Files>
   2.497 -	<Globals>
   2.498 -	</Globals>
   2.499 -</VisualStudioProject>
   2.500 +<?xml version="1.0" encoding="Windows-1252"?>
   2.501 +<VisualStudioProject
   2.502 +	ProjectType="Visual C++"
   2.503 +	Version="9,00"
   2.504 +	Name="enblend"
   2.505 +	ProjectGUID="{A1402918-6CCA-4625-A83B-FF965635D7BE}"
   2.506 +	RootNamespace="enblend"
   2.507 +	Keyword="Win32Proj"
   2.508 +	TargetFrameworkVersion="131072"
   2.509 +	>
   2.510 +	<Platforms>
   2.511 +		<Platform
   2.512 +			Name="Win32"
   2.513 +		/>
   2.514 +	</Platforms>
   2.515 +	<ToolFiles>
   2.516 +	</ToolFiles>
   2.517 +	<Configurations>
   2.518 +		<Configuration
   2.519 +			Name="Debug|Win32"
   2.520 +			OutputDirectory="Debug"
   2.521 +			IntermediateDirectory="Debug"
   2.522 +			ConfigurationType="1"
   2.523 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   2.524 +			CharacterSet="2"
   2.525 +			>
   2.526 +			<Tool
   2.527 +				Name="VCPreBuildEventTool"
   2.528 +				CommandLine="perl gen_sig --extra=4.0-mercurial &gt;signature.h"
   2.529 +			/>
   2.530 +			<Tool
   2.531 +				Name="VCCustomBuildTool"
   2.532 +			/>
   2.533 +			<Tool
   2.534 +				Name="VCXMLDataGeneratorTool"
   2.535 +			/>
   2.536 +			<Tool
   2.537 +				Name="VCWebServiceProxyGeneratorTool"
   2.538 +			/>
   2.539 +			<Tool
   2.540 +				Name="VCMIDLTool"
   2.541 +			/>
   2.542 +			<Tool
   2.543 +				Name="VCCLCompilerTool"
   2.544 +				Optimization="0"
   2.545 +				EnableIntrinsicFunctions="true"
   2.546 +				AdditionalIncludeDirectories="&quot;..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;win32helpers"
   2.547 +				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;ENBLEND_CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE"
   2.548 +				MinimalRebuild="true"
   2.549 +				BasicRuntimeChecks="3"
   2.550 +				RuntimeLibrary="1"
   2.551 +				RuntimeTypeInfo="true"
   2.552 +				UsePrecompiledHeader="0"
   2.553 +				WarningLevel="3"
   2.554 +				Detect64BitPortabilityProblems="true"
   2.555 +				DebugInformationFormat="4"
   2.556 +			/>
   2.557 +			<Tool
   2.558 +				Name="VCManagedResourceCompilerTool"
   2.559 +			/>
   2.560 +			<Tool
   2.561 +				Name="VCResourceCompilerTool"
   2.562 +			/>
   2.563 +			<Tool
   2.564 +				Name="VCPreLinkEventTool"
   2.565 +			/>
   2.566 +			<Tool
   2.567 +				Name="VCLinkerTool"
   2.568 +				AdditionalDependencies="libtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib"
   2.569 +				OutputFile="$(OutDir)/enblend.exe"
   2.570 +				LinkIncremental="2"
   2.571 +				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Debug&quot;;&quot;..\..\STLport-5.2.1\lib&quot;;..\..\Deploy\lib\Debug;&quot;..\..\tiff-3.8.2\libtiff&quot;"
   2.572 +				GenerateDebugInformation="true"
   2.573 +				ProgramDatabaseFile="$(OutDir)/enblend.pdb"
   2.574 +				SubSystem="1"
   2.575 +				RandomizedBaseAddress="1"
   2.576 +				DataExecutionPrevention="0"
   2.577 +				TargetMachine="1"
   2.578 +			/>
   2.579 +			<Tool
   2.580 +				Name="VCALinkTool"
   2.581 +			/>
   2.582 +			<Tool
   2.583 +				Name="VCManifestTool"
   2.584 +			/>
   2.585 +			<Tool
   2.586 +				Name="VCXDCMakeTool"
   2.587 +			/>
   2.588 +			<Tool
   2.589 +				Name="VCBscMakeTool"
   2.590 +			/>
   2.591 +			<Tool
   2.592 +				Name="VCFxCopTool"
   2.593 +			/>
   2.594 +			<Tool
   2.595 +				Name="VCAppVerifierTool"
   2.596 +			/>
   2.597 +			<Tool
   2.598 +				Name="VCPostBuildEventTool"
   2.599 +			/>
   2.600 +		</Configuration>
   2.601 +		<Configuration
   2.602 +			Name="Release_NoSSE|Win32"
   2.603 +			OutputDirectory="$(ConfigurationName)"
   2.604 +			IntermediateDirectory="$(ConfigurationName)"
   2.605 +			ConfigurationType="1"
   2.606 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   2.607 +			UseOfMFC="0"
   2.608 +			CharacterSet="2"
   2.609 +			WholeProgramOptimization="1"
   2.610 +			>
   2.611 +			<Tool
   2.612 +				Name="VCPreBuildEventTool"
   2.613 +				CommandLine="perl gen_sig --extra=4.0-mercurial &gt;signature.h"
   2.614 +			/>
   2.615 +			<Tool
   2.616 +				Name="VCCustomBuildTool"
   2.617 +			/>
   2.618 +			<Tool
   2.619 +				Name="VCXMLDataGeneratorTool"
   2.620 +			/>
   2.621 +			<Tool
   2.622 +				Name="VCWebServiceProxyGeneratorTool"
   2.623 +			/>
   2.624 +			<Tool
   2.625 +				Name="VCMIDLTool"
   2.626 +			/>
   2.627 +			<Tool
   2.628 +				Name="VCCLCompilerTool"
   2.629 +				Optimization="3"
   2.630 +				InlineFunctionExpansion="2"
   2.631 +				EnableIntrinsicFunctions="true"
   2.632 +				FavorSizeOrSpeed="1"
   2.633 +				WholeProgramOptimization="true"
   2.634 +				AdditionalIncludeDirectories="&quot;..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   2.635 +				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   2.636 +				RuntimeLibrary="0"
   2.637 +				BufferSecurityCheck="false"
   2.638 +				EnableEnhancedInstructionSet="0"
   2.639 +				RuntimeTypeInfo="true"
   2.640 +				UsePrecompiledHeader="0"
   2.641 +				WarningLevel="3"
   2.642 +				Detect64BitPortabilityProblems="true"
   2.643 +				DebugInformationFormat="3"
   2.644 +				DisableSpecificWarnings="4251"
   2.645 +			/>
   2.646 +			<Tool
   2.647 +				Name="VCManagedResourceCompilerTool"
   2.648 +			/>
   2.649 +			<Tool
   2.650 +				Name="VCResourceCompilerTool"
   2.651 +			/>
   2.652 +			<Tool
   2.653 +				Name="VCPreLinkEventTool"
   2.654 +			/>
   2.655 +			<Tool
   2.656 +				Name="VCLinkerTool"
   2.657 +				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib glut32.lib"
   2.658 +				OutputFile="$(OutDir)/enblend_nosse.exe"
   2.659 +				LinkIncremental="1"
   2.660 +				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-5.2.1\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glew\lib;..\..\glut\Release"
   2.661 +				GenerateDebugInformation="false"
   2.662 +				SubSystem="1"
   2.663 +				LargeAddressAware="2"
   2.664 +				OptimizeReferences="2"
   2.665 +				EnableCOMDATFolding="2"
   2.666 +				RandomizedBaseAddress="1"
   2.667 +				DataExecutionPrevention="0"
   2.668 +				TargetMachine="1"
   2.669 +			/>
   2.670 +			<Tool
   2.671 +				Name="VCALinkTool"
   2.672 +			/>
   2.673 +			<Tool
   2.674 +				Name="VCManifestTool"
   2.675 +			/>
   2.676 +			<Tool
   2.677 +				Name="VCXDCMakeTool"
   2.678 +			/>
   2.679 +			<Tool
   2.680 +				Name="VCBscMakeTool"
   2.681 +			/>
   2.682 +			<Tool
   2.683 +				Name="VCFxCopTool"
   2.684 +			/>
   2.685 +			<Tool
   2.686 +				Name="VCAppVerifierTool"
   2.687 +			/>
   2.688 +			<Tool
   2.689 +				Name="VCPostBuildEventTool"
   2.690 +				CommandLine=""
   2.691 +			/>
   2.692 +		</Configuration>
   2.693 +		<Configuration
   2.694 +			Name="Release|Win32"
   2.695 +			OutputDirectory="$(ConfigurationName)"
   2.696 +			IntermediateDirectory="$(ConfigurationName)"
   2.697 +			ConfigurationType="1"
   2.698 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   2.699 +			UseOfMFC="0"
   2.700 +			CharacterSet="2"
   2.701 +			WholeProgramOptimization="1"
   2.702 +			>
   2.703 +			<Tool
   2.704 +				Name="VCPreBuildEventTool"
   2.705 +				CommandLine="perl gen_sig --extra=4.0-mercurial &gt;signature.h"
   2.706 +			/>
   2.707 +			<Tool
   2.708 +				Name="VCCustomBuildTool"
   2.709 +			/>
   2.710 +			<Tool
   2.711 +				Name="VCXMLDataGeneratorTool"
   2.712 +			/>
   2.713 +			<Tool
   2.714 +				Name="VCWebServiceProxyGeneratorTool"
   2.715 +			/>
   2.716 +			<Tool
   2.717 +				Name="VCMIDLTool"
   2.718 +			/>
   2.719 +			<Tool
   2.720 +				Name="VCCLCompilerTool"
   2.721 +				Optimization="3"
   2.722 +				InlineFunctionExpansion="2"
   2.723 +				EnableIntrinsicFunctions="true"
   2.724 +				FavorSizeOrSpeed="1"
   2.725 +				WholeProgramOptimization="true"
   2.726 +				AdditionalIncludeDirectories="&quot;..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   2.727 +				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   2.728 +				RuntimeLibrary="0"
   2.729 +				BufferSecurityCheck="false"
   2.730 +				EnableEnhancedInstructionSet="2"
   2.731 +				RuntimeTypeInfo="true"
   2.732 +				UsePrecompiledHeader="0"
   2.733 +				WarningLevel="3"
   2.734 +				Detect64BitPortabilityProblems="true"
   2.735 +				DebugInformationFormat="3"
   2.736 +				DisableSpecificWarnings="4251"
   2.737 +			/>
   2.738 +			<Tool
   2.739 +				Name="VCManagedResourceCompilerTool"
   2.740 +			/>
   2.741 +			<Tool
   2.742 +				Name="VCResourceCompilerTool"
   2.743 +			/>
   2.744 +			<Tool
   2.745 +				Name="VCPreLinkEventTool"
   2.746 +			/>
   2.747 +			<Tool
   2.748 +				Name="VCLinkerTool"
   2.749 +				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib glut32.lib"
   2.750 +				OutputFile="$(OutDir)/enblend.exe"
   2.751 +				LinkIncremental="1"
   2.752 +				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-5.2.1\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glew\lib;..\..\glut\Release"
   2.753 +				GenerateDebugInformation="false"
   2.754 +				SubSystem="1"
   2.755 +				LargeAddressAware="2"
   2.756 +				OptimizeReferences="2"
   2.757 +				EnableCOMDATFolding="2"
   2.758 +				RandomizedBaseAddress="1"
   2.759 +				DataExecutionPrevention="0"
   2.760 +				TargetMachine="1"
   2.761 +			/>
   2.762 +			<Tool
   2.763 +				Name="VCALinkTool"
   2.764 +			/>
   2.765 +			<Tool
   2.766 +				Name="VCManifestTool"
   2.767 +			/>
   2.768 +			<Tool
   2.769 +				Name="VCXDCMakeTool"
   2.770 +			/>
   2.771 +			<Tool
   2.772 +				Name="VCBscMakeTool"
   2.773 +			/>
   2.774 +			<Tool
   2.775 +				Name="VCFxCopTool"
   2.776 +			/>
   2.777 +			<Tool
   2.778 +				Name="VCAppVerifierTool"
   2.779 +			/>
   2.780 +			<Tool
   2.781 +				Name="VCPostBuildEventTool"
   2.782 +				CommandLine=""
   2.783 +			/>
   2.784 +		</Configuration>
   2.785 +		<Configuration
   2.786 +			Name="Release_OpenMP|Win32"
   2.787 +			OutputDirectory="$(ConfigurationName)"
   2.788 +			IntermediateDirectory="$(ConfigurationName)"
   2.789 +			ConfigurationType="1"
   2.790 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   2.791 +			UseOfMFC="0"
   2.792 +			CharacterSet="2"
   2.793 +			WholeProgramOptimization="1"
   2.794 +			>
   2.795 +			<Tool
   2.796 +				Name="VCPreBuildEventTool"
   2.797 +				CommandLine="perl gen_sig --extra=4.0-mercurial &gt;signature.h"
   2.798 +			/>
   2.799 +			<Tool
   2.800 +				Name="VCCustomBuildTool"
   2.801 +			/>
   2.802 +			<Tool
   2.803 +				Name="VCXMLDataGeneratorTool"
   2.804 +			/>
   2.805 +			<Tool
   2.806 +				Name="VCWebServiceProxyGeneratorTool"
   2.807 +			/>
   2.808 +			<Tool
   2.809 +				Name="VCMIDLTool"
   2.810 +			/>
   2.811 +			<Tool
   2.812 +				Name="VCCLCompilerTool"
   2.813 +				Optimization="3"
   2.814 +				InlineFunctionExpansion="2"
   2.815 +				EnableIntrinsicFunctions="true"
   2.816 +				FavorSizeOrSpeed="1"
   2.817 +				WholeProgramOptimization="true"
   2.818 +				AdditionalIncludeDirectories="&quot;..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   2.819 +				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   2.820 +				RuntimeLibrary="0"
   2.821 +				BufferSecurityCheck="false"
   2.822 +				EnableEnhancedInstructionSet="2"
   2.823 +				RuntimeTypeInfo="true"
   2.824 +				OpenMP="true"
   2.825 +				UsePrecompiledHeader="0"
   2.826 +				WarningLevel="3"
   2.827 +				Detect64BitPortabilityProblems="true"
   2.828 +				DebugInformationFormat="3"
   2.829 +				DisableSpecificWarnings="4251"
   2.830 +			/>
   2.831 +			<Tool
   2.832 +				Name="VCManagedResourceCompilerTool"
   2.833 +			/>
   2.834 +			<Tool
   2.835 +				Name="VCResourceCompilerTool"
   2.836 +			/>
   2.837 +			<Tool
   2.838 +				Name="VCPreLinkEventTool"
   2.839 +			/>
   2.840 +			<Tool
   2.841 +				Name="VCLinkerTool"
   2.842 +				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib glut32.lib"
   2.843 +				OutputFile="$(OutDir)/enblend_openmp.exe"
   2.844 +				LinkIncremental="1"
   2.845 +				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-5.2.1\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glew\lib;..\..\glut\Release"
   2.846 +				GenerateDebugInformation="false"
   2.847 +				SubSystem="1"
   2.848 +				LargeAddressAware="2"
   2.849 +				OptimizeReferences="2"
   2.850 +				EnableCOMDATFolding="2"
   2.851 +				RandomizedBaseAddress="1"
   2.852 +				DataExecutionPrevention="0"
   2.853 +				TargetMachine="1"
   2.854 +			/>
   2.855 +			<Tool
   2.856 +				Name="VCALinkTool"
   2.857 +			/>
   2.858 +			<Tool
   2.859 +				Name="VCManifestTool"
   2.860 +			/>
   2.861 +			<Tool
   2.862 +				Name="VCXDCMakeTool"
   2.863 +			/>
   2.864 +			<Tool
   2.865 +				Name="VCBscMakeTool"
   2.866 +			/>
   2.867 +			<Tool
   2.868 +				Name="VCFxCopTool"
   2.869 +			/>
   2.870 +			<Tool
   2.871 +				Name="VCAppVerifierTool"
   2.872 +			/>
   2.873 +			<Tool
   2.874 +				Name="VCPostBuildEventTool"
   2.875 +				CommandLine=""
   2.876 +			/>
   2.877 +		</Configuration>
   2.878 +	</Configurations>
   2.879 +	<References>
   2.880 +	</References>
   2.881 +	<Files>
   2.882 +		<Filter
   2.883 +			Name="Source Files"
   2.884 +			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
   2.885 +			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
   2.886 +			>
   2.887 +			<File
   2.888 +				RelativePath=".\enblend.cc"
   2.889 +				>
   2.890 +			</File>
   2.891 +			<File
   2.892 +				RelativePath=".\filenameparse.cc"
   2.893 +				>
   2.894 +			</File>
   2.895 +			<File
   2.896 +				RelativePath=".\win32helpers\getopt.c"
   2.897 +				>
   2.898 +			</File>
   2.899 +			<File
   2.900 +				RelativePath=".\gpu.cc"
   2.901 +				>
   2.902 +			</File>
   2.903 +			<File
   2.904 +				RelativePath=".\self_test.cc"
   2.905 +				>
   2.906 +			</File>
   2.907 +			<File
   2.908 +				RelativePath=".\tiff_message.cc"
   2.909 +				>
   2.910 +			</File>
   2.911 +		</Filter>
   2.912 +		<Filter
   2.913 +			Name="Header Files"
   2.914 +			Filter="h;hpp;hxx;hm;inl;inc;xsd"
   2.915 +			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
   2.916 +			>
   2.917 +			<File
   2.918 +				RelativePath=".\anneal.h"
   2.919 +				>
   2.920 +			</File>
   2.921 +			<File
   2.922 +				RelativePath=".\assemble.h"
   2.923 +				>
   2.924 +			</File>
   2.925 +			<File
   2.926 +				RelativePath=".\blend.h"
   2.927 +				>
   2.928 +			</File>
   2.929 +			<File
   2.930 +				RelativePath=".\bounds.h"
   2.931 +				>
   2.932 +			</File>
   2.933 +			<File
   2.934 +				RelativePath=".\common.h"
   2.935 +				>
   2.936 +			</File>
   2.937 +			<File
   2.938 +				RelativePath=".\enblend.h"
   2.939 +				>
   2.940 +			</File>
   2.941 +			<File
   2.942 +				RelativePath=".\filenameparse.h"
   2.943 +				>
   2.944 +			</File>
   2.945 +			<File
   2.946 +				RelativePath=".\fixmath.h"
   2.947 +				>
   2.948 +			</File>
   2.949 +			<File
   2.950 +				RelativePath=".\float_cast.h"
   2.951 +				>
   2.952 +			</File>
   2.953 +			<File
   2.954 +				RelativePath=".\win32helpers\getopt.h"
   2.955 +				>
   2.956 +			</File>
   2.957 +			<File
   2.958 +				RelativePath=".\gpu.h"
   2.959 +				>
   2.960 +			</File>
   2.961 +			<File
   2.962 +				RelativePath=".\mask.h"
   2.963 +				>
   2.964 +			</File>
   2.965 +			<File
   2.966 +				RelativePath=".\nearest.h"
   2.967 +				>
   2.968 +			</File>
   2.969 +			<File
   2.970 +				RelativePath=".\numerictraits.h"
   2.971 +				>
   2.972 +			</File>
   2.973 +			<File
   2.974 +				RelativePath=".\path.h"
   2.975 +				>
   2.976 +			</File>
   2.977 +			<File
   2.978 +				RelativePath=".\pyramid.h"
   2.979 +				>
   2.980 +			</File>
   2.981 +			<File
   2.982 +				RelativePath=".\self_test.h"
   2.983 +				>
   2.984 +			</File>
   2.985 +			<File
   2.986 +				RelativePath=".\tiff_message.h"
   2.987 +				>
   2.988 +			</File>
   2.989 +			<File
   2.990 +				RelativePath=".\win32helpers\win32config.h"
   2.991 +				>
   2.992 +			</File>
   2.993 +		</Filter>
   2.994 +		<Filter
   2.995 +			Name="Resource Files"
   2.996 +			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
   2.997 +			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
   2.998 +			>
   2.999 +		</Filter>
  2.1000 +	</Files>
  2.1001 +	<Globals>
  2.1002 +	</Globals>
  2.1003 +</VisualStudioProject>
     3.1 --- a/src/enfuse_msvc2008.vcproj	Sat Oct 31 15:17:48 2009 +0100
     3.2 +++ b/src/enfuse_msvc2008.vcproj	Tue Nov 03 13:56:24 2009 +0100
     3.3 @@ -1,492 +1,500 @@
     3.4 -<?xml version="1.0" encoding="Windows-1252"?>
     3.5 -<VisualStudioProject
     3.6 -	ProjectType="Visual C++"
     3.7 -	Version="9,00"
     3.8 -	Name="enfuse"
     3.9 -	ProjectGUID="{11402918-6CCA-4625-A83B-FF965635D7BE}"
    3.10 -	RootNamespace="enfuse"
    3.11 -	Keyword="Win32Proj"
    3.12 -	TargetFrameworkVersion="131072"
    3.13 -	>
    3.14 -	<Platforms>
    3.15 -		<Platform
    3.16 -			Name="Win32"
    3.17 -		/>
    3.18 -	</Platforms>
    3.19 -	<ToolFiles>
    3.20 -	</ToolFiles>
    3.21 -	<Configurations>
    3.22 -		<Configuration
    3.23 -			Name="Debug|Win32"
    3.24 -			OutputDirectory="Debug"
    3.25 -			IntermediateDirectory="Debug"
    3.26 -			ConfigurationType="1"
    3.27 -			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
    3.28 -			CharacterSet="2"
    3.29 -			>
    3.30 -			<Tool
    3.31 -				Name="VCPreBuildEventTool"
    3.32 -			/>
    3.33 -			<Tool
    3.34 -				Name="VCCustomBuildTool"
    3.35 -			/>
    3.36 -			<Tool
    3.37 -				Name="VCXMLDataGeneratorTool"
    3.38 -			/>
    3.39 -			<Tool
    3.40 -				Name="VCWebServiceProxyGeneratorTool"
    3.41 -			/>
    3.42 -			<Tool
    3.43 -				Name="VCMIDLTool"
    3.44 -			/>
    3.45 -			<Tool
    3.46 -				Name="VCCLCompilerTool"
    3.47 -				Optimization="0"
    3.48 -				EnableIntrinsicFunctions="true"
    3.49 -				AdditionalIncludeDirectories="&quot;..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxMSW-2.8.10\src\jpeg&quot;;&quot;..\..\wxMSW-2.8.10\src\png&quot;;&quot;..\..\wxMSW-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;win32helpers"
    3.50 -				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;ENBLEND_CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE"
    3.51 -				MinimalRebuild="true"
    3.52 -				BasicRuntimeChecks="3"
    3.53 -				RuntimeLibrary="1"
    3.54 -				RuntimeTypeInfo="true"
    3.55 -				UsePrecompiledHeader="0"
    3.56 -				WarningLevel="3"
    3.57 -				Detect64BitPortabilityProblems="true"
    3.58 -				DebugInformationFormat="4"
    3.59 -			/>
    3.60 -			<Tool
    3.61 -				Name="VCManagedResourceCompilerTool"
    3.62 -			/>
    3.63 -			<Tool
    3.64 -				Name="VCResourceCompilerTool"
    3.65 -			/>
    3.66 -			<Tool
    3.67 -				Name="VCPreLinkEventTool"
    3.68 -			/>
    3.69 -			<Tool
    3.70 -				Name="VCLinkerTool"
    3.71 -				AdditionalDependencies="libtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib"
    3.72 -				OutputFile="$(OutDir)/enfuse.exe"
    3.73 -				LinkIncremental="2"
    3.74 -				AdditionalLibraryDirectories="&quot;..\..\wxMSW-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Debug&quot;;&quot;..\..\STLport-trunk\lib&quot;;..\..\Deploy\lib\Debug;&quot;..\..\tiff-3.8.2\libtiff&quot;"
    3.75 -				GenerateDebugInformation="true"
    3.76 -				ProgramDatabaseFile="$(OutDir)/enfuse.pdb"
    3.77 -				SubSystem="1"
    3.78 -				RandomizedBaseAddress="1"
    3.79 -				DataExecutionPrevention="0"
    3.80 -				TargetMachine="1"
    3.81 -			/>
    3.82 -			<Tool
    3.83 -				Name="VCALinkTool"
    3.84 -			/>
    3.85 -			<Tool
    3.86 -				Name="VCManifestTool"
    3.87 -			/>
    3.88 -			<Tool
    3.89 -				Name="VCXDCMakeTool"
    3.90 -			/>
    3.91 -			<Tool
    3.92 -				Name="VCBscMakeTool"
    3.93 -			/>
    3.94 -			<Tool
    3.95 -				Name="VCFxCopTool"
    3.96 -			/>
    3.97 -			<Tool
    3.98 -				Name="VCAppVerifierTool"
    3.99 -			/>
   3.100 -			<Tool
   3.101 -				Name="VCPostBuildEventTool"
   3.102 -			/>
   3.103 -		</Configuration>
   3.104 -		<Configuration
   3.105 -			Name="Release_NoSSE|Win32"
   3.106 -			OutputDirectory="$(ConfigurationName)"
   3.107 -			IntermediateDirectory="$(ConfigurationName)"
   3.108 -			ConfigurationType="1"
   3.109 -			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   3.110 -			UseOfMFC="0"
   3.111 -			CharacterSet="2"
   3.112 -			WholeProgramOptimization="1"
   3.113 -			>
   3.114 -			<Tool
   3.115 -				Name="VCPreBuildEventTool"
   3.116 -			/>
   3.117 -			<Tool
   3.118 -				Name="VCCustomBuildTool"
   3.119 -			/>
   3.120 -			<Tool
   3.121 -				Name="VCXMLDataGeneratorTool"
   3.122 -			/>
   3.123 -			<Tool
   3.124 -				Name="VCWebServiceProxyGeneratorTool"
   3.125 -			/>
   3.126 -			<Tool
   3.127 -				Name="VCMIDLTool"
   3.128 -			/>
   3.129 -			<Tool
   3.130 -				Name="VCCLCompilerTool"
   3.131 -				Optimization="3"
   3.132 -				InlineFunctionExpansion="2"
   3.133 -				EnableIntrinsicFunctions="true"
   3.134 -				FavorSizeOrSpeed="1"
   3.135 -				WholeProgramOptimization="true"
   3.136 -				AdditionalIncludeDirectories="&quot;..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   3.137 -				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   3.138 -				RuntimeLibrary="0"
   3.139 -				BufferSecurityCheck="false"
   3.140 -				EnableEnhancedInstructionSet="0"
   3.141 -				RuntimeTypeInfo="true"
   3.142 -				UsePrecompiledHeader="0"
   3.143 -				WarningLevel="3"
   3.144 -				Detect64BitPortabilityProblems="true"
   3.145 -				DebugInformationFormat="3"
   3.146 -				DisableSpecificWarnings="4251"
   3.147 -			/>
   3.148 -			<Tool
   3.149 -				Name="VCManagedResourceCompilerTool"
   3.150 -			/>
   3.151 -			<Tool
   3.152 -				Name="VCResourceCompilerTool"
   3.153 -			/>
   3.154 -			<Tool
   3.155 -				Name="VCPreLinkEventTool"
   3.156 -			/>
   3.157 -			<Tool
   3.158 -				Name="VCLinkerTool"
   3.159 -				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib"
   3.160 -				OutputFile="$(OutDir)/enfuse_nosse.exe"
   3.161 -				LinkIncremental="1"
   3.162 -				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-trunk\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glew\lib;..\..\glut\Release"
   3.163 -				GenerateDebugInformation="false"
   3.164 -				SubSystem="1"
   3.165 -				LargeAddressAware="2"
   3.166 -				OptimizeReferences="2"
   3.167 -				EnableCOMDATFolding="2"
   3.168 -				RandomizedBaseAddress="1"
   3.169 -				DataExecutionPrevention="0"
   3.170 -				TargetMachine="1"
   3.171 -			/>
   3.172 -			<Tool
   3.173 -				Name="VCALinkTool"
   3.174 -			/>
   3.175 -			<Tool
   3.176 -				Name="VCManifestTool"
   3.177 -			/>
   3.178 -			<Tool
   3.179 -				Name="VCXDCMakeTool"
   3.180 -			/>
   3.181 -			<Tool
   3.182 -				Name="VCBscMakeTool"
   3.183 -			/>
   3.184 -			<Tool
   3.185 -				Name="VCFxCopTool"
   3.186 -			/>
   3.187 -			<Tool
   3.188 -				Name="VCAppVerifierTool"
   3.189 -			/>
   3.190 -			<Tool
   3.191 -				Name="VCPostBuildEventTool"
   3.192 -				CommandLine="..\win32\install.cmd $(ConfigurationName)"
   3.193 -			/>
   3.194 -		</Configuration>
   3.195 -		<Configuration
   3.196 -			Name="Release|Win32"
   3.197 -			OutputDirectory="$(ConfigurationName)"
   3.198 -			IntermediateDirectory="$(ConfigurationName)"
   3.199 -			ConfigurationType="1"
   3.200 -			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   3.201 -			UseOfMFC="0"
   3.202 -			CharacterSet="2"
   3.203 -			WholeProgramOptimization="1"
   3.204 -			>
   3.205 -			<Tool
   3.206 -				Name="VCPreBuildEventTool"
   3.207 -			/>
   3.208 -			<Tool
   3.209 -				Name="VCCustomBuildTool"
   3.210 -			/>
   3.211 -			<Tool
   3.212 -				Name="VCXMLDataGeneratorTool"
   3.213 -			/>
   3.214 -			<Tool
   3.215 -				Name="VCWebServiceProxyGeneratorTool"
   3.216 -			/>
   3.217 -			<Tool
   3.218 -				Name="VCMIDLTool"
   3.219 -			/>
   3.220 -			<Tool
   3.221 -				Name="VCCLCompilerTool"
   3.222 -				Optimization="3"
   3.223 -				InlineFunctionExpansion="2"
   3.224 -				EnableIntrinsicFunctions="true"
   3.225 -				FavorSizeOrSpeed="1"
   3.226 -				WholeProgramOptimization="true"
   3.227 -				AdditionalIncludeDirectories="&quot;..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   3.228 -				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   3.229 -				RuntimeLibrary="0"
   3.230 -				BufferSecurityCheck="false"
   3.231 -				EnableEnhancedInstructionSet="2"
   3.232 -				RuntimeTypeInfo="true"
   3.233 -				UsePrecompiledHeader="0"
   3.234 -				WarningLevel="3"
   3.235 -				Detect64BitPortabilityProblems="true"
   3.236 -				DebugInformationFormat="3"
   3.237 -				DisableSpecificWarnings="4251"
   3.238 -			/>
   3.239 -			<Tool
   3.240 -				Name="VCManagedResourceCompilerTool"
   3.241 -			/>
   3.242 -			<Tool
   3.243 -				Name="VCResourceCompilerTool"
   3.244 -			/>
   3.245 -			<Tool
   3.246 -				Name="VCPreLinkEventTool"
   3.247 -			/>
   3.248 -			<Tool
   3.249 -				Name="VCLinkerTool"
   3.250 -				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib"
   3.251 -				OutputFile="$(OutDir)/enfuse.exe"
   3.252 -				LinkIncremental="1"
   3.253 -				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-trunk\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glew\lib;..\..\glut\Release"
   3.254 -				GenerateDebugInformation="false"
   3.255 -				SubSystem="1"
   3.256 -				LargeAddressAware="2"
   3.257 -				OptimizeReferences="2"
   3.258 -				EnableCOMDATFolding="2"
   3.259 -				RandomizedBaseAddress="1"
   3.260 -				DataExecutionPrevention="0"
   3.261 -				TargetMachine="1"
   3.262 -			/>
   3.263 -			<Tool
   3.264 -				Name="VCALinkTool"
   3.265 -			/>
   3.266 -			<Tool
   3.267 -				Name="VCManifestTool"
   3.268 -			/>
   3.269 -			<Tool
   3.270 -				Name="VCXDCMakeTool"
   3.271 -			/>
   3.272 -			<Tool
   3.273 -				Name="VCBscMakeTool"
   3.274 -			/>
   3.275 -			<Tool
   3.276 -				Name="VCFxCopTool"
   3.277 -			/>
   3.278 -			<Tool
   3.279 -				Name="VCAppVerifierTool"
   3.280 -			/>
   3.281 -			<Tool
   3.282 -				Name="VCPostBuildEventTool"
   3.283 -				CommandLine="..\win32\install.cmd $(ConfigurationName)"
   3.284 -			/>
   3.285 -		</Configuration>
   3.286 -		<Configuration
   3.287 -			Name="Release_OpenMP|Win32"
   3.288 -			OutputDirectory="$(ConfigurationName)"
   3.289 -			IntermediateDirectory="$(ConfigurationName)"
   3.290 -			ConfigurationType="1"
   3.291 -			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   3.292 -			UseOfMFC="0"
   3.293 -			CharacterSet="2"
   3.294 -			WholeProgramOptimization="1"
   3.295 -			>
   3.296 -			<Tool
   3.297 -				Name="VCPreBuildEventTool"
   3.298 -			/>
   3.299 -			<Tool
   3.300 -				Name="VCCustomBuildTool"
   3.301 -			/>
   3.302 -			<Tool
   3.303 -				Name="VCXMLDataGeneratorTool"
   3.304 -			/>
   3.305 -			<Tool
   3.306 -				Name="VCWebServiceProxyGeneratorTool"
   3.307 -			/>
   3.308 -			<Tool
   3.309 -				Name="VCMIDLTool"
   3.310 -			/>
   3.311 -			<Tool
   3.312 -				Name="VCCLCompilerTool"
   3.313 -				Optimization="3"
   3.314 -				InlineFunctionExpansion="2"
   3.315 -				EnableIntrinsicFunctions="true"
   3.316 -				FavorSizeOrSpeed="1"
   3.317 -				WholeProgramOptimization="true"
   3.318 -				AdditionalIncludeDirectories="&quot;..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   3.319 -				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   3.320 -				RuntimeLibrary="0"
   3.321 -				BufferSecurityCheck="false"
   3.322 -				EnableEnhancedInstructionSet="2"
   3.323 -				RuntimeTypeInfo="true"
   3.324 -				OpenMP="true"
   3.325 -				UsePrecompiledHeader="0"
   3.326 -				WarningLevel="3"
   3.327 -				Detect64BitPortabilityProblems="true"
   3.328 -				DebugInformationFormat="3"
   3.329 -				DisableSpecificWarnings="4251"
   3.330 -			/>
   3.331 -			<Tool
   3.332 -				Name="VCManagedResourceCompilerTool"
   3.333 -			/>
   3.334 -			<Tool
   3.335 -				Name="VCResourceCompilerTool"
   3.336 -			/>
   3.337 -			<Tool
   3.338 -				Name="VCPreLinkEventTool"
   3.339 -			/>
   3.340 -			<Tool
   3.341 -				Name="VCLinkerTool"
   3.342 -				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib glut32.lib"
   3.343 -				OutputFile="$(OutDir)/enfuse_openmp.exe"
   3.344 -				LinkIncremental="1"
   3.345 -				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-trunk\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glut\Release;..\..\glew\lib"
   3.346 -				GenerateDebugInformation="false"
   3.347 -				SubSystem="1"
   3.348 -				LargeAddressAware="2"
   3.349 -				OptimizeReferences="2"
   3.350 -				EnableCOMDATFolding="2"
   3.351 -				RandomizedBaseAddress="1"
   3.352 -				DataExecutionPrevention="0"
   3.353 -				TargetMachine="1"
   3.354 -			/>
   3.355 -			<Tool
   3.356 -				Name="VCALinkTool"
   3.357 -			/>
   3.358 -			<Tool
   3.359 -				Name="VCManifestTool"
   3.360 -			/>
   3.361 -			<Tool
   3.362 -				Name="VCXDCMakeTool"
   3.363 -			/>
   3.364 -			<Tool
   3.365 -				Name="VCBscMakeTool"
   3.366 -			/>
   3.367 -			<Tool
   3.368 -				Name="VCFxCopTool"
   3.369 -			/>
   3.370 -			<Tool
   3.371 -				Name="VCAppVerifierTool"
   3.372 -			/>
   3.373 -			<Tool
   3.374 -				Name="VCPostBuildEventTool"
   3.375 -				CommandLine="..\win32\install.cmd $(ConfigurationName)"
   3.376 -			/>
   3.377 -		</Configuration>
   3.378 -	</Configurations>
   3.379 -	<References>
   3.380 -	</References>
   3.381 -	<Files>
   3.382 -		<Filter
   3.383 -			Name="Source Files"
   3.384 -			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
   3.385 -			UniqueIdentifier="{1FC737F1-C7A5-4376-A066-2A32D752A2FF}"
   3.386 -			>
   3.387 -			<File
   3.388 -				RelativePath=".\enfuse.cc"
   3.389 -				>
   3.390 -			</File>
   3.391 -			<File
   3.392 -				RelativePath=".\filenameparse.cc"
   3.393 -				>
   3.394 -			</File>
   3.395 -			<File
   3.396 -				RelativePath=".\win32helpers\getopt.c"
   3.397 -				>
   3.398 -			</File>
   3.399 -			<File
   3.400 -				RelativePath=".\gpu.cc"
   3.401 -				>
   3.402 -			</File>
   3.403 -			<File
   3.404 -				RelativePath=".\self_test.cc"
   3.405 -				>
   3.406 -			</File>
   3.407 -		</Filter>
   3.408 -		<Filter
   3.409 -			Name="Header Files"
   3.410 -			Filter="h;hpp;hxx;hm;inl;inc;xsd"
   3.411 -			UniqueIdentifier="{13995380-89BD-4b04-88EB-625FBE52EBFB}"
   3.412 -			>
   3.413 -			<File
   3.414 -				RelativePath=".\anneal.h"
   3.415 -				>
   3.416 -			</File>
   3.417 -			<File
   3.418 -				RelativePath=".\assemble.h"
   3.419 -				>
   3.420 -			</File>
   3.421 -			<File
   3.422 -				RelativePath=".\blend.h"
   3.423 -				>
   3.424 -			</File>
   3.425 -			<File
   3.426 -				RelativePath=".\bounds.h"
   3.427 -				>
   3.428 -			</File>
   3.429 -			<File
   3.430 -				RelativePath=".\common.h"
   3.431 -				>
   3.432 -			</File>
   3.433 -			<File
   3.434 -				RelativePath=".\enfuse.h"
   3.435 -				>
   3.436 -			</File>
   3.437 -			<File
   3.438 -				RelativePath=".\filenameparse.h"
   3.439 -				>
   3.440 -			</File>
   3.441 -			<File
   3.442 -				RelativePath=".\fixmath.h"
   3.443 -				>
   3.444 -			</File>
   3.445 -			<File
   3.446 -				RelativePath=".\float_cast.h"
   3.447 -				>
   3.448 -			</File>
   3.449 -			<File
   3.450 -				RelativePath=".\win32helpers\getopt.h"
   3.451 -				>
   3.452 -			</File>
   3.453 -			<File
   3.454 -				RelativePath=".\gpu.h"
   3.455 -				>
   3.456 -			</File>
   3.457 -			<File
   3.458 -				RelativePath=".\mask.h"
   3.459 -				>
   3.460 -			</File>
   3.461 -			<File
   3.462 -				RelativePath=".\nearest.h"
   3.463 -				>
   3.464 -			</File>
   3.465 -			<File
   3.466 -				RelativePath=".\numerictraits.h"
   3.467 -				>
   3.468 -			</File>
   3.469 -			<File
   3.470 -				RelativePath=".\path.h"
   3.471 -				>
   3.472 -			</File>
   3.473 -			<File
   3.474 -				RelativePath=".\pyramid.h"
   3.475 -				>
   3.476 -			</File>
   3.477 -			<File
   3.478 -				RelativePath=".\self_test.h"
   3.479 -				>
   3.480 -			</File>
   3.481 -			<File
   3.482 -				RelativePath=".\win32helpers\win32config.h"
   3.483 -				>
   3.484 -			</File>
   3.485 -		</Filter>
   3.486 -		<Filter
   3.487 -			Name="Resource Files"
   3.488 -			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
   3.489 -			UniqueIdentifier="{17DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
   3.490 -			>
   3.491 -		</Filter>
   3.492 -	</Files>
   3.493 -	<Globals>
   3.494 -	</Globals>
   3.495 -</VisualStudioProject>
   3.496 +<?xml version="1.0" encoding="Windows-1252"?>
   3.497 +<VisualStudioProject
   3.498 +	ProjectType="Visual C++"
   3.499 +	Version="9,00"
   3.500 +	Name="enfuse"
   3.501 +	ProjectGUID="{11402918-6CCA-4625-A83B-FF965635D7BE}"
   3.502 +	RootNamespace="enfuse"
   3.503 +	Keyword="Win32Proj"
   3.504 +	TargetFrameworkVersion="131072"
   3.505 +	>
   3.506 +	<Platforms>
   3.507 +		<Platform
   3.508 +			Name="Win32"
   3.509 +		/>
   3.510 +	</Platforms>
   3.511 +	<ToolFiles>
   3.512 +	</ToolFiles>
   3.513 +	<Configurations>
   3.514 +		<Configuration
   3.515 +			Name="Debug|Win32"
   3.516 +			OutputDirectory="Debug"
   3.517 +			IntermediateDirectory="Debug"
   3.518 +			ConfigurationType="1"
   3.519 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   3.520 +			CharacterSet="2"
   3.521 +			>
   3.522 +			<Tool
   3.523 +				Name="VCPreBuildEventTool"
   3.524 +			/>
   3.525 +			<Tool
   3.526 +				Name="VCCustomBuildTool"
   3.527 +			/>
   3.528 +			<Tool
   3.529 +				Name="VCXMLDataGeneratorTool"
   3.530 +			/>
   3.531 +			<Tool
   3.532 +				Name="VCWebServiceProxyGeneratorTool"
   3.533 +			/>
   3.534 +			<Tool
   3.535 +				Name="VCMIDLTool"
   3.536 +			/>
   3.537 +			<Tool
   3.538 +				Name="VCCLCompilerTool"
   3.539 +				Optimization="0"
   3.540 +				EnableIntrinsicFunctions="true"
   3.541 +				AdditionalIncludeDirectories="&quot;..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;win32helpers"
   3.542 +				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;ENBLEND_CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE"
   3.543 +				MinimalRebuild="true"
   3.544 +				BasicRuntimeChecks="3"
   3.545 +				RuntimeLibrary="1"
   3.546 +				RuntimeTypeInfo="true"
   3.547 +				UsePrecompiledHeader="0"
   3.548 +				WarningLevel="3"
   3.549 +				Detect64BitPortabilityProblems="true"
   3.550 +				DebugInformationFormat="4"
   3.551 +			/>
   3.552 +			<Tool
   3.553 +				Name="VCManagedResourceCompilerTool"
   3.554 +			/>
   3.555 +			<Tool
   3.556 +				Name="VCResourceCompilerTool"
   3.557 +			/>
   3.558 +			<Tool
   3.559 +				Name="VCPreLinkEventTool"
   3.560 +			/>
   3.561 +			<Tool
   3.562 +				Name="VCLinkerTool"
   3.563 +				AdditionalDependencies="libtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib"
   3.564 +				OutputFile="$(OutDir)/enfuse.exe"
   3.565 +				LinkIncremental="2"
   3.566 +				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Debug&quot;;&quot;..\..\STLport-5.2.1\lib&quot;;..\..\Deploy\lib\Debug;&quot;..\..\tiff-3.8.2\libtiff&quot;"
   3.567 +				GenerateDebugInformation="true"
   3.568 +				ProgramDatabaseFile="$(OutDir)/enfuse.pdb"
   3.569 +				SubSystem="1"
   3.570 +				RandomizedBaseAddress="1"
   3.571 +				DataExecutionPrevention="0"
   3.572 +				TargetMachine="1"
   3.573 +			/>
   3.574 +			<Tool
   3.575 +				Name="VCALinkTool"
   3.576 +			/>
   3.577 +			<Tool
   3.578 +				Name="VCManifestTool"
   3.579 +			/>
   3.580 +			<Tool
   3.581 +				Name="VCXDCMakeTool"
   3.582 +			/>
   3.583 +			<Tool
   3.584 +				Name="VCBscMakeTool"
   3.585 +			/>
   3.586 +			<Tool
   3.587 +				Name="VCFxCopTool"
   3.588 +			/>
   3.589 +			<Tool
   3.590 +				Name="VCAppVerifierTool"
   3.591 +			/>
   3.592 +			<Tool
   3.593 +				Name="VCPostBuildEventTool"
   3.594 +			/>
   3.595 +		</Configuration>
   3.596 +		<Configuration
   3.597 +			Name="Release_NoSSE|Win32"
   3.598 +			OutputDirectory="$(ConfigurationName)"
   3.599 +			IntermediateDirectory="$(ConfigurationName)"
   3.600 +			ConfigurationType="1"
   3.601 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   3.602 +			UseOfMFC="0"
   3.603 +			CharacterSet="2"
   3.604 +			WholeProgramOptimization="1"
   3.605 +			>
   3.606 +			<Tool
   3.607 +				Name="VCPreBuildEventTool"
   3.608 +			/>
   3.609 +			<Tool
   3.610 +				Name="VCCustomBuildTool"
   3.611 +			/>
   3.612 +			<Tool
   3.613 +				Name="VCXMLDataGeneratorTool"
   3.614 +			/>
   3.615 +			<Tool
   3.616 +				Name="VCWebServiceProxyGeneratorTool"
   3.617 +			/>
   3.618 +			<Tool
   3.619 +				Name="VCMIDLTool"
   3.620 +			/>
   3.621 +			<Tool
   3.622 +				Name="VCCLCompilerTool"
   3.623 +				Optimization="3"
   3.624 +				InlineFunctionExpansion="2"
   3.625 +				EnableIntrinsicFunctions="true"
   3.626 +				FavorSizeOrSpeed="1"
   3.627 +				WholeProgramOptimization="true"
   3.628 +				AdditionalIncludeDirectories="&quot;..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   3.629 +				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   3.630 +				RuntimeLibrary="0"
   3.631 +				BufferSecurityCheck="false"
   3.632 +				EnableEnhancedInstructionSet="0"
   3.633 +				RuntimeTypeInfo="true"
   3.634 +				UsePrecompiledHeader="0"
   3.635 +				WarningLevel="3"
   3.636 +				Detect64BitPortabilityProblems="true"
   3.637 +				DebugInformationFormat="3"
   3.638 +				DisableSpecificWarnings="4251"
   3.639 +			/>
   3.640 +			<Tool
   3.641 +				Name="VCManagedResourceCompilerTool"
   3.642 +			/>
   3.643 +			<Tool
   3.644 +				Name="VCResourceCompilerTool"
   3.645 +			/>
   3.646 +			<Tool
   3.647 +				Name="VCPreLinkEventTool"
   3.648 +			/>
   3.649 +			<Tool
   3.650 +				Name="VCLinkerTool"
   3.651 +				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib"
   3.652 +				OutputFile="$(OutDir)/enfuse_nosse.exe"
   3.653 +				LinkIncremental="1"
   3.654 +				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-5.2.1\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glew\lib;..\..\glut\Release"
   3.655 +				GenerateDebugInformation="false"
   3.656 +				SubSystem="1"
   3.657 +				LargeAddressAware="2"
   3.658 +				OptimizeReferences="2"
   3.659 +				EnableCOMDATFolding="2"
   3.660 +				RandomizedBaseAddress="1"
   3.661 +				DataExecutionPrevention="0"
   3.662 +				TargetMachine="1"
   3.663 +			/>
   3.664 +			<Tool
   3.665 +				Name="VCALinkTool"
   3.666 +			/>
   3.667 +			<Tool
   3.668 +				Name="VCManifestTool"
   3.669 +			/>
   3.670 +			<Tool
   3.671 +				Name="VCXDCMakeTool"
   3.672 +			/>
   3.673 +			<Tool
   3.674 +				Name="VCBscMakeTool"
   3.675 +			/>
   3.676 +			<Tool
   3.677 +				Name="VCFxCopTool"
   3.678 +			/>
   3.679 +			<Tool
   3.680 +				Name="VCAppVerifierTool"
   3.681 +			/>
   3.682 +			<Tool
   3.683 +				Name="VCPostBuildEventTool"
   3.684 +				CommandLine="..\win32\install.cmd $(ConfigurationName)"
   3.685 +			/>
   3.686 +		</Configuration>
   3.687 +		<Configuration
   3.688 +			Name="Release|Win32"
   3.689 +			OutputDirectory="$(ConfigurationName)"
   3.690 +			IntermediateDirectory="$(ConfigurationName)"
   3.691 +			ConfigurationType="1"
   3.692 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   3.693 +			UseOfMFC="0"
   3.694 +			CharacterSet="2"
   3.695 +			WholeProgramOptimization="1"
   3.696 +			>
   3.697 +			<Tool
   3.698 +				Name="VCPreBuildEventTool"
   3.699 +			/>
   3.700 +			<Tool
   3.701 +				Name="VCCustomBuildTool"
   3.702 +			/>
   3.703 +			<Tool
   3.704 +				Name="VCXMLDataGeneratorTool"
   3.705 +			/>
   3.706 +			<Tool
   3.707 +				Name="VCWebServiceProxyGeneratorTool"
   3.708 +			/>
   3.709 +			<Tool
   3.710 +				Name="VCMIDLTool"
   3.711 +			/>
   3.712 +			<Tool
   3.713 +				Name="VCCLCompilerTool"
   3.714 +				Optimization="3"
   3.715 +				InlineFunctionExpansion="2"
   3.716 +				EnableIntrinsicFunctions="true"
   3.717 +				FavorSizeOrSpeed="1"
   3.718 +				WholeProgramOptimization="true"
   3.719 +				AdditionalIncludeDirectories="&quot;..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   3.720 +				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;CACHE_IMAGES;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   3.721 +				RuntimeLibrary="0"
   3.722 +				BufferSecurityCheck="false"
   3.723 +				EnableEnhancedInstructionSet="2"
   3.724 +				RuntimeTypeInfo="true"
   3.725 +				UsePrecompiledHeader="0"
   3.726 +				WarningLevel="3"
   3.727 +				Detect64BitPortabilityProblems="true"
   3.728 +				DebugInformationFormat="3"
   3.729 +				DisableSpecificWarnings="4251"
   3.730 +			/>
   3.731 +			<Tool
   3.732 +				Name="VCManagedResourceCompilerTool"
   3.733 +			/>
   3.734 +			<Tool
   3.735 +				Name="VCResourceCompilerTool"
   3.736 +			/>
   3.737 +			<Tool
   3.738 +				Name="VCPreLinkEventTool"
   3.739 +			/>
   3.740 +			<Tool
   3.741 +				Name="VCLinkerTool"
   3.742 +				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib"
   3.743 +				OutputFile="$(OutDir)/enfuse.exe"
   3.744 +				LinkIncremental="1"
   3.745 +				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-5.2.1\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glew\lib;..\..\glut\Release"
   3.746 +				GenerateDebugInformation="false"
   3.747 +				SubSystem="1"
   3.748 +				LargeAddressAware="2"
   3.749 +				OptimizeReferences="2"
   3.750 +				EnableCOMDATFolding="2"
   3.751 +				RandomizedBaseAddress="1"
   3.752 +				DataExecutionPrevention="0"
   3.753 +				TargetMachine="1"
   3.754 +			/>
   3.755 +			<Tool
   3.756 +				Name="VCALinkTool"
   3.757 +			/>
   3.758 +			<Tool
   3.759 +				Name="VCManifestTool"
   3.760 +			/>
   3.761 +			<Tool
   3.762 +				Name="VCXDCMakeTool"
   3.763 +			/>
   3.764 +			<Tool
   3.765 +				Name="VCBscMakeTool"
   3.766 +			/>
   3.767 +			<Tool
   3.768 +				Name="VCFxCopTool"
   3.769 +			/>
   3.770 +			<Tool
   3.771 +				Name="VCAppVerifierTool"
   3.772 +			/>
   3.773 +			<Tool
   3.774 +				Name="VCPostBuildEventTool"
   3.775 +				CommandLine="..\win32\install.cmd $(ConfigurationName)"
   3.776 +			/>
   3.777 +		</Configuration>
   3.778 +		<Configuration
   3.779 +			Name="Release_OpenMP|Win32"
   3.780 +			OutputDirectory="$(ConfigurationName)"
   3.781 +			IntermediateDirectory="$(ConfigurationName)"
   3.782 +			ConfigurationType="1"
   3.783 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
   3.784 +			UseOfMFC="0"
   3.785 +			CharacterSet="2"
   3.786 +			WholeProgramOptimization="1"
   3.787 +			>
   3.788 +			<Tool
   3.789 +				Name="VCPreBuildEventTool"
   3.790 +			/>
   3.791 +			<Tool
   3.792 +				Name="VCCustomBuildTool"
   3.793 +			/>
   3.794 +			<Tool
   3.795 +				Name="VCXMLDataGeneratorTool"
   3.796 +			/>
   3.797 +			<Tool
   3.798 +				Name="VCWebServiceProxyGeneratorTool"
   3.799 +			/>
   3.800 +			<Tool
   3.801 +				Name="VCMIDLTool"
   3.802 +			/>
   3.803 +			<Tool
   3.804 +				Name="VCCLCompilerTool"
   3.805 +				Optimization="3"
   3.806 +				InlineFunctionExpansion="2"
   3.807 +				EnableIntrinsicFunctions="true"
   3.808 +				FavorSizeOrSpeed="1"
   3.809 +				WholeProgramOptimization="true"
   3.810 +				AdditionalIncludeDirectories="&quot;..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\boost_1_39_0;&quot;..\..\lcms-1.18\include&quot;;&quot;..\..\libxmi-1.2&quot;;.;..\..\glew\include;..\..\glut\include;win32helpers"
   3.811 +				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;__WIN32__;NDEBUG;_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_LIBGLEW"
   3.812 +				RuntimeLibrary="0"
   3.813 +				BufferSecurityCheck="false"
   3.814 +				EnableEnhancedInstructionSet="2"
   3.815 +				RuntimeTypeInfo="true"
   3.816 +				OpenMP="true"
   3.817 +				UsePrecompiledHeader="0"
   3.818 +				WarningLevel="3"
   3.819 +				Detect64BitPortabilityProblems="true"
   3.820 +				DebugInformationFormat="3"
   3.821 +				DisableSpecificWarnings="4251"
   3.822 +			/>
   3.823 +			<Tool
   3.824 +				Name="VCManagedResourceCompilerTool"
   3.825 +			/>
   3.826 +			<Tool
   3.827 +				Name="VCResourceCompilerTool"
   3.828 +			/>
   3.829 +			<Tool
   3.830 +				Name="VCPreLinkEventTool"
   3.831 +			/>
   3.832 +			<Tool
   3.833 +				Name="VCLinkerTool"
   3.834 +				AdditionalDependencies="libtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib libxmi.lib lcms.lib IlmImf.lib Imath.lib IlmThread.lib Half.lib Iex.lib glew32s.lib glut32.lib"
   3.835 +				OutputFile="$(OutDir)/enfuse_openmp.exe"
   3.836 +				LinkIncremental="1"
   3.837 +				AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.8.10\lib\vc_lib&quot;;&quot;..\..\lcms-1.18\Lib\MS&quot;;&quot;..\..\libxmi-1.2\Release&quot;;&quot;..\..\STLport-5.2.1\lib&quot;;..\..\Deploy\lib\Release;&quot;..\..\tiff-3.8.2\libtiff&quot;;..\..\glut\Release;..\..\glew\lib"
   3.838 +				GenerateDebugInformation="false"
   3.839 +				SubSystem="1"
   3.840 +				LargeAddressAware="2"
   3.841 +				OptimizeReferences="2"
   3.842 +				EnableCOMDATFolding="2"
   3.843 +				RandomizedBaseAddress="1"
   3.844 +				DataExecutionPrevention="0"
   3.845 +				TargetMachine="1"
   3.846 +			/>
   3.847 +			<Tool
   3.848 +				Name="VCALinkTool"
   3.849 +			/>
   3.850 +			<Tool
   3.851 +				Name="VCManifestTool"
   3.852 +			/>
   3.853 +			<Tool
   3.854 +				Name="VCXDCMakeTool"
   3.855 +			/>
   3.856 +			<Tool
   3.857 +				Name="VCBscMakeTool"
   3.858 +			/>
   3.859 +			<Tool
   3.860 +				Name="VCFxCopTool"
   3.861 +			/>
   3.862 +			<Tool
   3.863 +				Name="VCAppVerifierTool"
   3.864 +			/>
   3.865 +			<Tool
   3.866 +				Name="VCPostBuildEventTool"
   3.867 +				CommandLine="..\win32\install.cmd $(ConfigurationName)"
   3.868 +			/>
   3.869 +		</Configuration>
   3.870 +	</Configurations>
   3.871 +	<References>
   3.872 +	</References>
   3.873 +	<Files>
   3.874 +		<Filter
   3.875 +			Name="Source Files"
   3.876 +			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
   3.877 +			UniqueIdentifier="{1FC737F1-C7A5-4376-A066-2A32D752A2FF}"
   3.878 +			>
   3.879 +			<File
   3.880 +				RelativePath=".\enfuse.cc"
   3.881 +				>
   3.882 +			</File>
   3.883 +			<File
   3.884 +				RelativePath=".\filenameparse.cc"
   3.885 +				>
   3.886 +			</File>
   3.887 +			<File
   3.888 +				RelativePath=".\win32helpers\getopt.c"
   3.889 +				>
   3.890 +			</File>
   3.891 +			<File
   3.892 +				RelativePath=".\gpu.cc"
   3.893 +				>
   3.894 +			</File>
   3.895 +			<File
   3.896 +				RelativePath=".\self_test.cc"
   3.897 +				>
   3.898 +			</File>
   3.899 +			<File
   3.900 +				RelativePath=".\tiff_message.cc"
   3.901 +				>
   3.902 +			</File>
   3.903 +		</Filter>
   3.904 +		<Filter
   3.905 +			Name="Header Files"
   3.906 +			Filter="h;hpp;hxx;hm;inl;inc;xsd"
   3.907 +			UniqueIdentifier="{13995380-89BD-4b04-88EB-625FBE52EBFB}"
   3.908 +			>
   3.909 +			<File
   3.910 +				RelativePath=".\anneal.h"
   3.911 +				>
   3.912 +			</File>
   3.913 +			<File
   3.914 +				RelativePath=".\assemble.h"
   3.915 +				>
   3.916 +			</File>
   3.917 +			<File
   3.918 +				RelativePath=".\blend.h"
   3.919 +				>
   3.920 +			</File>
   3.921 +			<File
   3.922 +				RelativePath=".\bounds.h"
   3.923 +				>
   3.924 +			</File>
   3.925 +			<File
   3.926 +				RelativePath=".\common.h"
   3.927 +				>
   3.928 +			</File>
   3.929 +			<File
   3.930 +				RelativePath=".\enfuse.h"
   3.931 +				>
   3.932 +			</File>
   3.933 +			<File
   3.934 +				RelativePath=".\filenameparse.h"
   3.935 +				>
   3.936 +			</File>
   3.937 +			<File
   3.938 +				RelativePath=".\fixmath.h"
   3.939 +				>
   3.940 +			</File>
   3.941 +			<File
   3.942 +				RelativePath=".\float_cast.h"
   3.943 +				>
   3.944 +			</File>
   3.945 +			<File
   3.946 +				RelativePath=".\win32helpers\getopt.h"
   3.947 +				>
   3.948 +			</File>
   3.949 +			<File
   3.950 +				RelativePath=".\gpu.h"
   3.951 +				>
   3.952 +			</File>
   3.953 +			<File
   3.954 +				RelativePath=".\mask.h"
   3.955 +				>
   3.956 +			</File>
   3.957 +			<File
   3.958 +				RelativePath=".\nearest.h"
   3.959 +				>
   3.960 +			</File>
   3.961 +			<File
   3.962 +				RelativePath=".\numerictraits.h"
   3.963 +				>
   3.964 +			</File>
   3.965 +			<File
   3.966 +				RelativePath=".\path.h"
   3.967 +				>
   3.968 +			</File>
   3.969 +			<File
   3.970 +				RelativePath=".\pyramid.h"
   3.971 +				>
   3.972 +			</File>
   3.973 +			<File
   3.974 +				RelativePath=".\self_test.h"
   3.975 +				>
   3.976 +			</File>
   3.977 +			<File
   3.978 +				RelativePath=".\tiff_message.h"
   3.979 +				>
   3.980 +			</File>
   3.981 +			<File
   3.982 +				RelativePath=".\win32helpers\win32config.h"
   3.983 +				>
   3.984 +			</File>
   3.985 +		</Filter>
   3.986 +		<Filter
   3.987 +			Name="Resource Files"
   3.988 +			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
   3.989 +			UniqueIdentifier="{17DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
   3.990 +			>
   3.991 +		</Filter>
   3.992 +	</Files>
   3.993 +	<Globals>
   3.994 +	</Globals>
   3.995 +</VisualStudioProject>
     4.1 --- a/src/tiff_message.cc	Sat Oct 31 15:17:48 2009 +0100
     4.2 +++ b/src/tiff_message.cc	Tue Nov 03 13:56:24 2009 +0100
     4.3 @@ -24,6 +24,10 @@
     4.4  #include <set>
     4.5  #include <string>
     4.6  
     4.7 +#ifdef _WIN32
     4.8 +#include <stdio.h>
     4.9 +#endif
    4.10 +
    4.11  #include <boost/scoped_ptr.hpp>
    4.12  
    4.13  #ifdef HAVE_CONFIG_H
     5.1 --- a/src/vigra_impex/vigra_impex_msvc2008.vcproj	Sat Oct 31 15:17:48 2009 +0100
     5.2 +++ b/src/vigra_impex/vigra_impex_msvc2008.vcproj	Tue Nov 03 13:56:24 2009 +0100
     5.3 @@ -43,7 +43,7 @@
     5.4  				Name="VCCLCompilerTool"
     5.5  				Optimization="0"
     5.6  				EnableIntrinsicFunctions="true"
     5.7 -				AdditionalIncludeDirectories="&quot;..\..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\..\wxMSW-2.8.7\src\jpeg&quot;;&quot;..\..\..\wxMSW-2.8.7\src\png&quot;;&quot;..\..\..\wxMSW-2.8.7\src\zlib&quot;;&quot;..\..\..\boost-trunk&quot;;&quot;..\..\..\lcms-1.17\include&quot;;&quot;..\..\..\libxmi-1.2&quot;;.;..\..\..\Deploy\include"
     5.8 +				AdditionalIncludeDirectories="&quot;..\..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\zlib&quot;;&quot;..\..\..\boost-trunk&quot;;&quot;..\..\..\lcms-1.17\include&quot;;&quot;..\..\..\libxmi-1.2&quot;;.;..\..\..\Deploy\include"
     5.9  				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;NDEBUG;HasTIFF;HasJPEG;HasPNG;HasEXR;_WIN32;_CRT_SECURE_NO_DEPRECATE"
    5.10  				MinimalRebuild="true"
    5.11  				BasicRuntimeChecks="3"
    5.12 @@ -114,7 +114,7 @@
    5.13  				EnableIntrinsicFunctions="true"
    5.14  				FavorSizeOrSpeed="1"
    5.15  				WholeProgramOptimization="true"
    5.16 -				AdditionalIncludeDirectories="&quot;..\..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\..\boost_1_39_0;&quot;..\..\..\lcms-1.17\include&quot;;&quot;..\..\..\libxmi-1.2&quot;;.;..\..\..\Deploy\include"
    5.17 +				AdditionalIncludeDirectories="&quot;..\..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\..\boost_1_39_0;&quot;..\..\..\lcms-1.17\include&quot;;&quot;..\..\..\libxmi-1.2&quot;;.;..\..\..\Deploy\include"
    5.18  				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;NDEBUG;_LIB;HasTIFF;HasJPEG;HasPNG;HasEXR;_WIN32;_CRT_SECURE_NO_DEPRECATE"
    5.19  				RuntimeLibrary="0"
    5.20  				BufferSecurityCheck="false"
    5.21 @@ -186,7 +186,7 @@
    5.22  				EnableIntrinsicFunctions="true"
    5.23  				FavorSizeOrSpeed="1"
    5.24  				WholeProgramOptimization="true"
    5.25 -				AdditionalIncludeDirectories="&quot;..\..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\..\boost_1_39_0;&quot;..\..\..\lcms-1.17\include&quot;;&quot;..\..\..\libxmi-1.2&quot;;.;..\..\..\Deploy\include"
    5.26 +				AdditionalIncludeDirectories="&quot;..\..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\..\boost_1_39_0;&quot;..\..\..\lcms-1.17\include&quot;;&quot;..\..\..\libxmi-1.2&quot;;.;..\..\..\Deploy\include"
    5.27  				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;NDEBUG;_LIB;HasTIFF;HasJPEG;HasPNG;HasEXR;_WIN32;_CRT_SECURE_NO_DEPRECATE"
    5.28  				RuntimeLibrary="0"
    5.29  				BufferSecurityCheck="false"
    5.30 @@ -258,7 +258,7 @@
    5.31  				EnableIntrinsicFunctions="true"
    5.32  				FavorSizeOrSpeed="1"
    5.33  				WholeProgramOptimization="true"
    5.34 -				AdditionalIncludeDirectories="&quot;..\..\..\STLport-trunk\stlport&quot;;..\include;..\..\include;&quot;..\..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\..\boost_1_39_0;&quot;..\..\..\lcms-1.17\include&quot;;&quot;..\..\..\libxmi-1.2&quot;;.;..\..\..\Deploy\include"
    5.35 +				AdditionalIncludeDirectories="&quot;..\..\..\STLport-5.2.1\stlport&quot;;..\include;..\..\include;&quot;..\..\..\tiff-3.8.2\libtiff&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\jpeg&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\png&quot;;&quot;..\..\..\wxWidgets-2.8.10\src\zlib&quot;;..\..\..\boost_1_39_0;&quot;..\..\..\lcms-1.17\include&quot;;&quot;..\..\..\libxmi-1.2&quot;;.;..\..\..\Deploy\include"
    5.36  				PreprocessorDefinitions="VIGRA_STATIC_LIB;WIN32;NDEBUG;_LIB;HasTIFF;HasJPEG;HasPNG;HasEXR;_WIN32;_CRT_SECURE_NO_DEPRECATE"
    5.37  				RuntimeLibrary="0"
    5.38  				BufferSecurityCheck="false"