10 files changed, 2048 insertions, 2042 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..3149f93d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*		text=auto
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..6079c1f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*~
+build
+thirdparty
+cscope.*
+tags
diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj
index 3827d0c0..9b212ee6 100644
--- a/win32/libmupdf.vcproj
+++ b/win32/libmupdf.vcproj
@@ -1,577 +1,577 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="libmupdf"

-	ProjectGUID="{5F615F91-DFF8-4F05-BF48-6222B7D86519}"

-	RootNamespace="mupdf"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="4"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="4"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="pregen"

-			>

-			<File

-				RelativePath="..\pregen\cmap_cns.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pregen\cmap_gb.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pregen\cmap_japan.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pregen\cmap_korea.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pregen\cmap_unicode.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pregen\font_base14.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pregen\font_cjk.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="pdf"

-			>

-			<File

-				RelativePath="..\pdf\mupdf.h"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_annot.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_build.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_cmap.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_cmap_load.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_cmap_parse.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_cmap_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_colorspace.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_crypt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_debug.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_font.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_fontagl.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_fontenc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_fontfile.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_fontmtx.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_function.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_image.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_interpret.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_lex.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_nametree.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_outline.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_page.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_parse.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_pattern.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_repair.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_shade.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_store.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_stream.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_type3.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_unicode.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_xobject.c"

-				>

-			</File>

-			<File

-				RelativePath="..\pdf\pdf_xref.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="fitz"

-			>

-			<File

-				RelativePath="..\fitz\base_error.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\base_geometry.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\base_getopt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\base_hash.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\base_memory.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\base_string.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\base_time.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\crypt_aes.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\crypt_arc4.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\crypt_md5.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\crypt_sha2.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\dev_bbox.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\dev_list.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\dev_null.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\dev_text.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\dev_trace.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\filt_basic.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\filt_dctd.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\filt_faxd.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\filt_flate.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\filt_jbig2d.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\filt_jpxd.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\filt_lzwd.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\filt_predict.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\fitz.h"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\obj_array.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\obj_dict.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\obj_print.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\obj_simple.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\res_colorspace.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\res_font.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\res_path.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\res_pixmap.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\res_shade.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\res_text.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\stm_buffer.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\stm_open.c"

-				>

-			</File>

-			<File

-				RelativePath="..\fitz\stm_read.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="draw"

-			>

-			<File

-				RelativePath="..\draw\arch_port.c"

-				>

-			</File>

-			<File

-				RelativePath="..\draw\draw_affine.c"

-				>

-			</File>

-			<File

-				RelativePath="..\draw\draw_blend.c"

-				>

-			</File>

-			<File

-				RelativePath="..\draw\draw_device.c"

-				>

-			</File>

-			<File

-				RelativePath="..\draw\draw_edge.c"

-				>

-			</File>

-			<File

-				RelativePath="..\draw\draw_glyph.c"

-				>

-			</File>

-			<File

-				RelativePath="..\draw\draw_mesh.c"

-				>

-			</File>

-			<File

-				RelativePath="..\draw\draw_paint.c"

-				>

-			</File>

-			<File

-				RelativePath="..\draw\draw_path.c"

-				>

-			</File>

-			<File

-				RelativePath="..\draw\draw_scale.c"

-				>

-			</File>

-			<File

-				RelativePath="..\draw\draw_unpack.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="xps"

-			>

-			<File

-				RelativePath="..\xps\xps_common.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_doc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_glyphs.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_gradient.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_hash.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_image.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_jpeg.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_path.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_png.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_resource.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_tiff.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_tile.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_util.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_xml.c"

-				>

-			</File>

-			<File

-				RelativePath="..\xps\xps_zip.c"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libmupdf"
+	ProjectGUID="{5F615F91-DFF8-4F05-BF48-6222B7D86519}"
+	RootNamespace="mupdf"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="pregen"
+			>
+			<File
+				RelativePath="..\pregen\cmap_cns.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pregen\cmap_gb.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pregen\cmap_japan.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pregen\cmap_korea.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pregen\cmap_unicode.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pregen\font_base14.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pregen\font_cjk.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="pdf"
+			>
+			<File
+				RelativePath="..\pdf\mupdf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_annot.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_build.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_cmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_cmap_load.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_cmap_parse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_cmap_table.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_colorspace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_crypt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_debug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_font.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_fontagl.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_fontenc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_fontfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_fontmtx.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_function.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_image.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_interpret.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_lex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_nametree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_outline.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_page.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_parse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_pattern.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_repair.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_shade.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_store.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_stream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_type3.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_unicode.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_xobject.c"
+				>
+			</File>
+			<File
+				RelativePath="..\pdf\pdf_xref.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="fitz"
+			>
+			<File
+				RelativePath="..\fitz\base_error.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\base_geometry.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\base_getopt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\base_hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\base_memory.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\base_string.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\base_time.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\crypt_aes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\crypt_arc4.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\crypt_md5.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\crypt_sha2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\dev_bbox.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\dev_list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\dev_null.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\dev_text.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\dev_trace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\filt_basic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\filt_dctd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\filt_faxd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\filt_flate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\filt_jbig2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\filt_jpxd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\filt_lzwd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\filt_predict.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\fitz.h"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\obj_array.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\obj_dict.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\obj_print.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\obj_simple.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\res_colorspace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\res_font.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\res_path.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\res_pixmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\res_shade.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\res_text.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\stm_buffer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\stm_open.c"
+				>
+			</File>
+			<File
+				RelativePath="..\fitz\stm_read.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="draw"
+			>
+			<File
+				RelativePath="..\draw\arch_port.c"
+				>
+			</File>
+			<File
+				RelativePath="..\draw\draw_affine.c"
+				>
+			</File>
+			<File
+				RelativePath="..\draw\draw_blend.c"
+				>
+			</File>
+			<File
+				RelativePath="..\draw\draw_device.c"
+				>
+			</File>
+			<File
+				RelativePath="..\draw\draw_edge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\draw\draw_glyph.c"
+				>
+			</File>
+			<File
+				RelativePath="..\draw\draw_mesh.c"
+				>
+			</File>
+			<File
+				RelativePath="..\draw\draw_paint.c"
+				>
+			</File>
+			<File
+				RelativePath="..\draw\draw_path.c"
+				>
+			</File>
+			<File
+				RelativePath="..\draw\draw_scale.c"
+				>
+			</File>
+			<File
+				RelativePath="..\draw\draw_unpack.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="xps"
+			>
+			<File
+				RelativePath="..\xps\xps_common.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_doc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_glyphs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_gradient.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_image.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_jpeg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_path.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_png.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_resource.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_tiff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_tile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_xml.c"
+				>
+			</File>
+			<File
+				RelativePath="..\xps\xps_zip.c"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/libthirdparty.vcproj b/win32/libthirdparty.vcproj
index 3ebd4a85..c2d0c643 100644
--- a/win32/libthirdparty.vcproj
+++ b/win32/libthirdparty.vcproj
@@ -1,540 +1,540 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="libthirdparty"

-	ProjectGUID="{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}"

-	RootNamespace="mupdf"

-	TargetFrameworkVersion="196613"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="4"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"

-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="4"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"

-				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="libjpeg"

-			>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jaricom.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jcomapi.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdapimin.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdapistd.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdarith.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdatadst.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdatasrc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdcoefct.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdcolor.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jddctmgr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdhuff.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdinput.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdmainct.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdmarker.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdmaster.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdmerge.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdpostct.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdsample.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jdtrans.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jerror.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jfdctflt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jfdctfst.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jfdctint.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jidctflt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jidctfst.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jidctint.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jmemansi.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jmemmgr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jquant1.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jquant2.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jpeg-8c\jutils.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="libjbig2dec"

-			>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_arith.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_arith_iaid.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_arith_int.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_generic.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_huffman.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_image.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_metadata.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_mmr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_page.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_refinement.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_segment.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_symbol_dict.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\jbig2dec\jbig2_text.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="libz"

-			>

-			<File

-				RelativePath="..\thirdparty\zlib-1.2.5\adler32.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\zlib-1.2.5\compress.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\zlib-1.2.5\crc32.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\zlib-1.2.5\deflate.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\zlib-1.2.5\inffast.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\zlib-1.2.5\inflate.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\zlib-1.2.5\inftrees.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\zlib-1.2.5\trees.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\zlib-1.2.5\uncompr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\zlib-1.2.5\zutil.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="libopenjpeg"

-			>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\bio.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\cio.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\dwt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\event.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\image.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\j2k.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\j2k_lib.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\jp2.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\jpt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\mct.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\mqc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\openjpeg.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\pi.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\raw.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\t1.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\t2.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\tcd.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\tgt.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="libfreetype"

-			>

-			<File

-				RelativePath="..\thirdparty\freetype-2.4.4\src\cff\cff.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\freetype-2.4.4\src\psaux\psaux.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\freetype-2.4.4\src\psnames\psnames.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\freetype-2.4.4\src\sfnt\sfnt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\freetype-2.4.4\src\smooth\smooth.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\freetype-2.4.4\src\truetype\truetype.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\freetype-2.4.4\src\type1\type1.c"

-				>

-			</File>

-			<File

-				RelativePath="..\thirdparty\freetype-2.4.4\src\cid\type1cid.c"

-				>

-			</File>

-			<Filter

-				Name="base"

-				>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftbase.c"

-					>

-				</File>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftbbox.c"

-					>

-				</File>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftbitmap.c"

-					>

-				</File>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftgasp.c"

-					>

-				</File>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftglyph.c"

-					>

-				</File>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftinit.c"

-					>

-				</File>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftstroke.c"

-					>

-				</File>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftsynth.c"

-					>

-				</File>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftsystem.c"

-					>

-				</File>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\fttype1.c"

-					>

-				</File>

-				<File

-					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftxf86.c"

-					>

-				</File>

-			</Filter>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libthirdparty"
+	ProjectGUID="{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}"
+	RootNamespace="mupdf"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="libjpeg"
+			>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jaricom.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jcomapi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdapimin.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdapistd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdarith.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdatadst.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdatasrc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdcoefct.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdcolor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jddctmgr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdhuff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdinput.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdmainct.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdmarker.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdmaster.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdmerge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdpostct.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdsample.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jdtrans.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jerror.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jfdctflt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jfdctfst.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jfdctint.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jidctflt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jidctfst.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jidctint.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jmemansi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jmemmgr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jquant1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jquant2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jpeg-8c\jutils.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="libjbig2dec"
+			>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_arith.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_arith_iaid.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_arith_int.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_generic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_huffman.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_image.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_metadata.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_mmr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_page.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_refinement.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_segment.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_symbol_dict.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\jbig2dec\jbig2_text.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="libz"
+			>
+			<File
+				RelativePath="..\thirdparty\zlib-1.2.5\adler32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\zlib-1.2.5\compress.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\zlib-1.2.5\crc32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\zlib-1.2.5\deflate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\zlib-1.2.5\inffast.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\zlib-1.2.5\inflate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\zlib-1.2.5\inftrees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\zlib-1.2.5\trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\zlib-1.2.5\uncompr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\zlib-1.2.5\zutil.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="libopenjpeg"
+			>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\bio.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\cio.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\dwt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\event.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\image.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\j2k.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\j2k_lib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\jp2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\jpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\mct.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\mqc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\openjpeg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\pi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\raw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\t1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\t2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\tcd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\tgt.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="libfreetype"
+			>
+			<File
+				RelativePath="..\thirdparty\freetype-2.4.4\src\cff\cff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\freetype-2.4.4\src\psaux\psaux.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\freetype-2.4.4\src\psnames\psnames.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\freetype-2.4.4\src\sfnt\sfnt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\freetype-2.4.4\src\smooth\smooth.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\freetype-2.4.4\src\truetype\truetype.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\freetype-2.4.4\src\type1\type1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\thirdparty\freetype-2.4.4\src\cid\type1cid.c"
+				>
+			</File>
+			<Filter
+				Name="base"
+				>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftbase.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftbbox.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftbitmap.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftgasp.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftglyph.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftinit.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftstroke.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftsynth.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftsystem.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\fttype1.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftxf86.c"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/mupdf.sln b/win32/mupdf.sln
index 1ed478f7..4853cbf9 100644
--- a/win32/mupdf.sln
+++ b/win32/mupdf.sln
@@ -1,76 +1,76 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual C++ Express 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf", "mupdf.vcproj", "{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}

-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdparty.vcproj", "{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj", "{5F615F91-DFF8-4F05-BF48-6222B7D86519}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfdraw", "pdfdraw.vcproj", "{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}

-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfclean", "pdfclean.vcproj", "{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}

-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfshow", "pdfshow.vcproj", "{50644121-C85F-4EE9-9C54-F7D1BDFAE354}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}

-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfextract", "pdfextract.vcproj", "{BD4473E7-2DBE-4568-A0FC-38EED70182DC}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}

-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Debug|Win32.ActiveCfg = Debug|Win32

-		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Debug|Win32.Build.0 = Debug|Win32

-		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Release|Win32.ActiveCfg = Release|Win32

-		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Release|Win32.Build.0 = Release|Win32

-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Debug|Win32.Build.0 = Debug|Win32

-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Release|Win32.ActiveCfg = Release|Win32

-		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Release|Win32.Build.0 = Release|Win32

-		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Debug|Win32.Build.0 = Debug|Win32

-		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.ActiveCfg = Release|Win32

-		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.Build.0 = Release|Win32

-		{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Debug|Win32.ActiveCfg = Debug|Win32

-		{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Debug|Win32.Build.0 = Debug|Win32

-		{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Release|Win32.ActiveCfg = Release|Win32

-		{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Release|Win32.Build.0 = Release|Win32

-		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Debug|Win32.ActiveCfg = Debug|Win32

-		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Debug|Win32.Build.0 = Debug|Win32

-		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Release|Win32.ActiveCfg = Release|Win32

-		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Release|Win32.Build.0 = Release|Win32

-		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Debug|Win32.ActiveCfg = Debug|Win32

-		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Debug|Win32.Build.0 = Debug|Win32

-		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Release|Win32.ActiveCfg = Release|Win32

-		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Release|Win32.Build.0 = Release|Win32

-		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Debug|Win32.ActiveCfg = Debug|Win32

-		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Debug|Win32.Build.0 = Debug|Win32

-		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Release|Win32.ActiveCfg = Release|Win32

-		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf", "mupdf.vcproj", "{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdparty.vcproj", "{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj", "{5F615F91-DFF8-4F05-BF48-6222B7D86519}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfdraw", "pdfdraw.vcproj", "{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfclean", "pdfclean.vcproj", "{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfshow", "pdfshow.vcproj", "{50644121-C85F-4EE9-9C54-F7D1BDFAE354}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfextract", "pdfextract.vcproj", "{BD4473E7-2DBE-4568-A0FC-38EED70182DC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Debug|Win32.Build.0 = Debug|Win32
+		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Release|Win32.ActiveCfg = Release|Win32
+		{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Release|Win32.Build.0 = Release|Win32
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Debug|Win32.Build.0 = Debug|Win32
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Release|Win32.ActiveCfg = Release|Win32
+		{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Release|Win32.Build.0 = Release|Win32
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Debug|Win32.Build.0 = Debug|Win32
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.ActiveCfg = Release|Win32
+		{5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.Build.0 = Release|Win32
+		{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Debug|Win32.Build.0 = Debug|Win32
+		{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Release|Win32.ActiveCfg = Release|Win32
+		{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Release|Win32.Build.0 = Release|Win32
+		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Debug|Win32.Build.0 = Debug|Win32
+		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Release|Win32.ActiveCfg = Release|Win32
+		{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Release|Win32.Build.0 = Release|Win32
+		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Debug|Win32.ActiveCfg = Debug|Win32
+		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Debug|Win32.Build.0 = Debug|Win32
+		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Release|Win32.ActiveCfg = Release|Win32
+		{50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Release|Win32.Build.0 = Release|Win32
+		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Debug|Win32.Build.0 = Debug|Win32
+		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Release|Win32.ActiveCfg = Release|Win32
+		{BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/win32/mupdf.vcproj b/win32/mupdf.vcproj
index f2d60803..b0e899e1 100644
--- a/win32/mupdf.vcproj
+++ b/win32/mupdf.vcproj
@@ -1,177 +1,177 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="mupdf"

-	ProjectGUID="{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}"

-	RootNamespace="mupdf"

-	TargetFrameworkVersion="196613"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps"

-				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\apps\pdfapp.c"

-			>

-		</File>

-		<File

-			RelativePath="..\apps\win_main.c"

-			>

-		</File>

-		<File

-			RelativePath="..\apps\win_res.rc"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="mupdf"
+	ProjectGUID="{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}"
+	RootNamespace="mupdf"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps"
+				PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\apps\pdfapp.c"
+			>
+		</File>
+		<File
+			RelativePath="..\apps\win_main.c"
+			>
+		</File>
+		<File
+			RelativePath="..\apps\win_res.rc"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/pdfclean.vcproj b/win32/pdfclean.vcproj
index 1b225e04..2c6e5655 100644
--- a/win32/pdfclean.vcproj
+++ b/win32/pdfclean.vcproj
@@ -1,168 +1,168 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="pdfclean"

-	ProjectGUID="{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}"

-	RootNamespace="mupdf"

-	TargetFrameworkVersion="196613"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\fitz;..\pdf"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="..\fitz;..\pdf"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\apps\pdfclean.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pdfclean"
+	ProjectGUID="{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}"
+	RootNamespace="mupdf"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\apps\pdfclean.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/pdfdraw.vcproj b/win32/pdfdraw.vcproj
index 387b316c..769c2b19 100644
--- a/win32/pdfdraw.vcproj
+++ b/win32/pdfdraw.vcproj
@@ -1,168 +1,168 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="pdfdraw"

-	ProjectGUID="{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}"

-	RootNamespace="mupdf"

-	TargetFrameworkVersion="196613"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\fitz;..\pdf"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="..\fitz;..\pdf"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\apps\pdfdraw.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pdfdraw"
+	ProjectGUID="{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}"
+	RootNamespace="mupdf"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\apps\pdfdraw.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/pdfextract.vcproj b/win32/pdfextract.vcproj
index 00613ed0..91e975f9 100644
--- a/win32/pdfextract.vcproj
+++ b/win32/pdfextract.vcproj
@@ -1,168 +1,168 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="pdfextract"

-	ProjectGUID="{BD4473E7-2DBE-4568-A0FC-38EED70182DC}"

-	RootNamespace="mupdf"

-	TargetFrameworkVersion="196613"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\fitz;..\pdf"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="..\fitz;..\pdf"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\apps\pdfextract.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pdfextract"
+	ProjectGUID="{BD4473E7-2DBE-4568-A0FC-38EED70182DC}"
+	RootNamespace="mupdf"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\apps\pdfextract.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/pdfshow.vcproj b/win32/pdfshow.vcproj
index 66f253ec..a115fd20 100644
--- a/win32/pdfshow.vcproj
+++ b/win32/pdfshow.vcproj
@@ -1,168 +1,168 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="pdfshow"

-	ProjectGUID="{50644121-C85F-4EE9-9C54-F7D1BDFAE354}"

-	RootNamespace="mupdf"

-	TargetFrameworkVersion="196613"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\fitz;..\pdf"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="true"

-				AdditionalIncludeDirectories="..\fitz;..\pdf"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="true"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\apps\pdfshow.c"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pdfshow"
+	ProjectGUID="{50644121-C85F-4EE9-9C54-F7D1BDFAE354}"
+	RootNamespace="mupdf"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\fitz;..\pdf"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\apps\pdfshow.c"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>