Update OpenJPEG to v2.0.0.

2 files changed, 214 insertions, 94 deletions

diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj
index f073bbee..996b48aa 100644
--- a/win32/libmupdf.vcproj
+++ b/win32/libmupdf.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\scripts;..\fitz;..\ucdn;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\scripts;..\fitz;..\ucdn;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include"
 				PreprocessorDefinitions="DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\scripts;..\fitz;..\ucdn;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\scripts;..\fitz;..\ucdn;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -165,7 +165,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\scripts;..\fitz;..\ucdn;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\scripts;..\fitz;..\ucdn;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include"
 				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
diff --git a/win32/libthirdparty.vcproj b/win32/libthirdparty.vcproj
index f38fefeb..32576cfe 100644
--- a/win32/libthirdparty.vcproj
+++ b/win32/libthirdparty.vcproj
@@ -441,98 +441,218 @@
 		<Filter
 			Name="libopenjpeg"
 			>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\bio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\cidx_manager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\cio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\dwt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\event.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\image.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\j2k.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\j2k_lib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\jp2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\jpt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\mct.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\mqc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\openjpeg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\phix_manager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\pi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\ppix_manager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\raw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\t1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\t2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\tcd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\tgt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\thix_manager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\thirdparty\openjpeg\libopenjpeg\tpix_manager.c"
+			<Filter
+				Name="openjp2"
 				>
-			</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\bio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\bio.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\cio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\cio.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\dwt.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\dwt.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\event.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\event.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\function_list.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\function_list.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\image.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\image.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\indexbox_manager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\invert.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\invert.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\j2k.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\j2k.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\jp2.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\jp2.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\mct.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\mct.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\mqc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\mqc.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_includes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_intmath.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_inttypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_malloc.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\opj_stdint.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\pi.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\pi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\raw.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\raw.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t1.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t1.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t1_generate_luts.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t1_luts.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t2.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\t2.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\tcd.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\tcd.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\tgt.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\tgt.h"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c"
+					>
+				</File>
+				<File
+					RelativePath="..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="libfreetype"