From 81a97d655e373d7371e70f6a2051a41f606c62dc Mon Sep 17 00:00:00 2001
From: Robin Watts <robin.watts@artifex.com>
Date: Wed, 16 Oct 2013 15:03:14 +0100
Subject: Update mupdf to use latest openjpeg pulled from ghostpdl.

The OpenJPEG in gs is v2, with various patches for fixes. These are in
the process of being passed upstream. We now automatically pull the
openjpeg tree out of GhostPDL and put it in as one particular branch
in the thirdparty/openjpeg.git repo. Change to track this in MuPDF.

This is in keeping with what we have been doing with the jbig2dec
repo for a while now.
---
 Makethird                           |   8 +-
 platform/android/jni/Core.mk        |   2 +-
 platform/android/jni/ThirdParty.mk  |  52 ++---
 platform/win32/libmupdf.vcproj      |  10 +-
 platform/win32/libthirdparty.vcproj | 434 ++++++++++++++++++------------------
 thirdparty/openjpeg                 |   2 +-
 6 files changed, 260 insertions(+), 248 deletions(-)

diff --git a/Makethird b/Makethird
index d9730227..d6db3b40 100644
--- a/Makethird
+++ b/Makethird
@@ -9,7 +9,7 @@
 FREETYPE_DIR := thirdparty/freetype
 JBIG2DEC_DIR := thirdparty/jbig2dec
 JPEG_DIR := thirdparty/jpeg
-OPENJPEG_DIR := thirdparty/openjpeg
+OPENJPEG_DIR := thirdparty/openjpeg/libopenjpeg
 OPENSSL_DIR := thirdparty/openssl
 ZLIB_DIR := thirdparty/zlib
 CURL_DIR := thirdparty/curl
@@ -202,7 +202,7 @@ endif
 
 # --- OpenJPEG ---
 
-ifneq "$(wildcard $(OPENJPEG_DIR)/README)" ""
+ifneq "$(wildcard $(OPENJPEG_DIR)/CMakeLists.txt)" ""
 
 OPENJPEG_LIB := $(OUT)/libopenjpeg.a
 OPENJPEG_OUT := $(OUT)/openjpeg
@@ -235,10 +235,10 @@ OPENJPEG_SRC := \
 $(OPENJPEG_LIB): $(addprefix $(OPENJPEG_OUT)/, $(OPENJPEG_SRC:%.c=%.o))
 $(OPENJPEG_OUT):
 	$(MKDIR_CMD)
-$(OPENJPEG_OUT)/%.o: $(OPENJPEG_DIR)/src/lib/openjp2/%.c | $(OPENJPEG_OUT)
+$(OPENJPEG_OUT)/%.o: $(OPENJPEG_DIR)/%.c | $(OPENJPEG_OUT)
 	$(CC_CMD) -DOPJ_STATIC -DOPJ_HAVE_STDINT_H
 
-OPENJPEG_CFLAGS += -I$(OPENJPEG_DIR)/src/lib/openjp2
+OPENJPEG_CFLAGS += -I$(OPENJPEG_DIR)
 else
 OPENJPEG_CFLAGS := $(SYS_OPENJPEG_CFLAGS)
 OPENJPEG_LIBS := $(SYS_OPENJPEG_LIBS)
diff --git a/platform/android/jni/Core.mk b/platform/android/jni/Core.mk
index 6432843e..26d5a629 100644
--- a/platform/android/jni/Core.mk
+++ b/platform/android/jni/Core.mk
@@ -22,7 +22,7 @@ endif
 
 LOCAL_C_INCLUDES := \
 	../../thirdparty/jbig2dec \
-	../../thirdparty/openjpeg/src/lib/openjp2 \
+	../../thirdparty/openjpeg/libopenjpeg \
 	../../thirdparty/jpeg \
 	../../thirdparty/zlib \
 	../../thirdparty/freetype/include \
diff --git a/platform/android/jni/ThirdParty.mk b/platform/android/jni/ThirdParty.mk
index e4cd3d67..0092a438 100644
--- a/platform/android/jni/ThirdParty.mk
+++ b/platform/android/jni/ThirdParty.mk
@@ -6,7 +6,7 @@ MY_ROOT := ../..
 
 LOCAL_C_INCLUDES := \
 	../../thirdparty/jbig2dec \
-	../../thirdparty/openjpeg/src/lib/openjp2 \
+	../../thirdparty/openjpeg/libopenjpeg \
 	../../thirdparty/jpeg \
 	../../thirdparty/zlib \
 	../../thirdparty/freetype/include \
@@ -41,31 +41,31 @@ LOCAL_SRC_FILES := \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_segment.c \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_symbol_dict.c \
 	$(MY_ROOT)/thirdparty/jbig2dec/jbig2_text.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/bio.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/cidx_manager.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/cio.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/dwt.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/event.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/function_list.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/image.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/invert.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/j2k.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/jp2.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/mct.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/mqc.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/openjpeg.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/opj_clock.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/phix_manager.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/pi.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/ppix_manager.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/raw.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/t1.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/t1_generate_luts.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/t2.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/tcd.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/tgt.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/thix_manager.c \
-	$(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/tpix_manager.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/bio.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/cidx_manager.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/cio.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/dwt.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/event.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/function_list.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/image.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/invert.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/j2k.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/jp2.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/mct.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/mqc.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/openjpeg.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/opj_clock.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/phix_manager.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/pi.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/ppix_manager.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/raw.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/t1.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/t1_generate_luts.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/t2.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/tcd.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/tgt.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/thix_manager.c \
+	$(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/tpix_manager.c \
 	$(MY_ROOT)/thirdparty/jpeg/jaricom.c \
 	$(MY_ROOT)/thirdparty/jpeg/jcomapi.c \
 	$(MY_ROOT)/thirdparty/jpeg/jdapimin.c \
diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj
index 3aa188f0..bf0e7a34 100644
--- a/platform/win32/libmupdf.vcproj
+++ b/platform/win32/libmupdf.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include"
 				PreprocessorDefinitions="DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -165,7 +165,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include"
 				PreprocessorDefinitions="MEMENTO=1;DEBUG=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -227,7 +227,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include"
+				AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include;..\..\thirdparty\openssl\include"
 				PreprocessorDefinitions="DEBUG=1;HAVE_OPENSSL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -292,7 +292,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\src\lib\openjp2;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include"
+				AdditionalIncludeDirectories="..\..\scripts;..\..\include;..\..\ucdn;..\..\generated;..\..\thirdparty\jbig2dec;..\..\thirdparty\jpeg;..\..\thirdparty\openjpeg\libopenjpeg;..\..\thirdparty\zlib;..\..\thirdparty\freetype\include"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj
index ac17de00..8172f952 100644
--- a/platform/win32/libthirdparty.vcproj
+++ b/platform/win32/libthirdparty.vcproj
@@ -441,218 +441,230 @@
 		<Filter
 			Name="libopenjpeg"
 			>
-			<Filter
-				Name="openjp2"
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\bio.c"
 				>
-				<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>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\bio.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\cidx_manager.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\cidx_manager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\cio.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\cio.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\dwt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\dwt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\event.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\fix.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\function_list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\function_list.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\image.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\image.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\indexbox_manager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\int.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\invert.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\invert.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\j2k.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\j2k.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\j2k_lib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\j2k_lib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\jp2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\jp2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\mct.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\mct.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\mqc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\mqc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\openjpeg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\openjpeg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_config_private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_includes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_intmath.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_inttypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_malloc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\opj_stdint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\phix_manager.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\pi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\pi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\ppix_manager.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\raw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\raw.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t1.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t1_generate_luts.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t1_luts.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\t2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\tcd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\tcd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\tgt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\tgt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\thix_manager.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\openjpeg\libopenjpeg\tpix_manager.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="libfreetype"
diff --git a/thirdparty/openjpeg b/thirdparty/openjpeg
index d3c8a54c..50c69167 160000
--- a/thirdparty/openjpeg
+++ b/thirdparty/openjpeg
@@ -1 +1 @@
-Subproject commit d3c8a54c8572b506cb08d767d0c1549bba16217b
+Subproject commit 50c6916741d3fff15cdc282696f1db2f52dee46e
-- 
cgit v1.2.3