Fix of winRT solution for the changes with openjpeg plus fix for change in fz_device_bgr definition

4 files changed, 210 insertions, 91 deletions

diff --git a/winrt/libmupdf_winRT.vcxproj b/winrt/libmupdf_winRT.vcxproj
index fdd8efde..083a7068 100644
--- a/winrt/libmupdf_winRT.vcxproj
+++ b/winrt/libmupdf_winRT.vcxproj
@@ -306,7 +306,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\scripts;..\ucdn;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg;..\thirdparty\openjpeg\src\lib\openjp2;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
diff --git a/winrt/libthirdparty_winRT.vcxproj b/winrt/libthirdparty_winRT.vcxproj
index 31bbe9eb..386f6d95 100644
--- a/winrt/libthirdparty_winRT.vcxproj
+++ b/winrt/libthirdparty_winRT.vcxproj
@@ -106,29 +106,31 @@
     <ClCompile Include="..\thirdparty\jpeg\jquant1.c" />
     <ClCompile Include="..\thirdparty\jpeg\jquant2.c" />
     <ClCompile Include="..\thirdparty\jpeg\jutils.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\bio.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\cidx_manager.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\cio.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\dwt.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\event.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\image.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\j2k.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\j2k_lib.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\jp2.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\jpt.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\mct.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\mqc.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\openjpeg.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\phix_manager.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\pi.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\ppix_manager.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\raw.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\t1.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\t2.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\tcd.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\tgt.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\thix_manager.c" />
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\tpix_manager.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\bio.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\cio.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\dwt.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\event.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\function_list.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\image.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\invert.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\j2k.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\jp2.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\mct.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\mqc.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\pi.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\raw.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t1.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t1_generate_luts.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t2.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tcd.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tgt.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c" />
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c" />
     <ClCompile Include="..\thirdparty\zlib\adler32.c" />
     <ClCompile Include="..\thirdparty\zlib\compress.c" />
     <ClCompile Include="..\thirdparty\zlib\crc32.c" />
@@ -225,6 +227,33 @@
     <ClInclude Include="..\thirdparty\freetype\include\freetype\tttags.h" />
     <ClInclude Include="..\thirdparty\freetype\include\freetype\ttunpat.h" />
     <ClInclude Include="..\thirdparty\freetype\include\ft2build.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\bio.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\cio.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\dwt.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\event.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\function_list.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\image.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\indexbox_manager.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\invert.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\j2k.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\jp2.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\mct.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\mqc.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_includes.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_intmath.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_inttypes.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_malloc.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_stdint.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\pi.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\raw.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t1.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t1_luts.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t2.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\tcd.h" />
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\tgt.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{c0d1c355-1bee-40e1-9ef4-fd9fffdbf396}</ProjectGuid>
diff --git a/winrt/libthirdparty_winRT.vcxproj.filters b/winrt/libthirdparty_winRT.vcxproj.filters
index 3915a387..55f068b0 100644
--- a/winrt/libthirdparty_winRT.vcxproj.filters
+++ b/winrt/libthirdparty_winRT.vcxproj.filters
@@ -34,6 +34,9 @@
     <Filter Include="libz">
       <UniqueIdentifier>{5e55ef18-6449-49c1-99aa-1cd88b6f4453}</UniqueIdentifier>
     </Filter>
+    <Filter Include="libopenjpeg\openjp2">
+      <UniqueIdentifier>{3a31ee2f-bdac-4091-a83f-7a6236269aaf}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\thirdparty\freetype\src\cff\cff.c">
@@ -237,104 +240,110 @@
     <ClCompile Include="..\thirdparty\jpeg\jutils.c">
       <Filter>libjpeg</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\bio.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\zlib\adler32.c">
+      <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\cidx_manager.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\zlib\compress.c">
+      <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\cio.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\zlib\crc32.c">
+      <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\dwt.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\zlib\deflate.c">
+      <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\event.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\zlib\inffast.c">
+      <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\image.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\zlib\inflate.c">
+      <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\j2k.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\zlib\inftrees.c">
+      <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\j2k_lib.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\zlib\trees.c">
+      <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\jp2.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\zlib\uncompr.c">
+      <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\jpt.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\zlib\zutil.c">
+      <Filter>libz</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\mct.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\phix_manager.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\mqc.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\pi.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\openjpeg.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\ppix_manager.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\phix_manager.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\raw.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\pi.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t1.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\ppix_manager.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t1_generate_luts.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\raw.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\t2.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\t1.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tcd.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\t2.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tgt.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\tcd.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\thix_manager.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\tgt.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\tpix_manager.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\thix_manager.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\mct.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\openjpeg\libopenjpeg\tpix_manager.c">
-      <Filter>libopenjpeg</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\mqc.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\adler32.c">
-      <Filter>libz</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\compress.c">
-      <Filter>libz</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\crc32.c">
-      <Filter>libz</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\dwt.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\deflate.c">
-      <Filter>libz</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\event.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\inffast.c">
-      <Filter>libz</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\function_list.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\inflate.c">
-      <Filter>libz</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\image.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\inftrees.c">
-      <Filter>libz</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\invert.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\trees.c">
-      <Filter>libz</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\j2k.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\uncompr.c">
-      <Filter>libz</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\jp2.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\zlib\zutil.c">
-      <Filter>libz</Filter>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\bio.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.c">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\thirdparty\openjpeg\src\lib\openjp2\cio.c">
+      <Filter>libopenjpeg\openjp2</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -590,5 +599,86 @@
     <ClInclude Include="..\thirdparty\freetype\include\freetype\internal\services\svxf86nm.h">
       <Filter>libfreetype\include\freetype\internal\services</Filter>
     </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_includes.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_intmath.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_inttypes.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_malloc.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_stdint.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\pi.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\raw.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t1.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t1_luts.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\t2.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\tcd.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\tgt.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\mct.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\mqc.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\openjpeg.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\opj_clock.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\dwt.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\event.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\function_list.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\image.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\indexbox_manager.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\invert.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\j2k.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\jp2.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\bio.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\cidx_manager.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\thirdparty\openjpeg\src\lib\openjp2\cio.h">
+      <Filter>libopenjpeg\openjp2</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/winrt/mupdfwinrt/muctx.cpp b/winrt/mupdfwinrt/muctx.cpp
index 1b30b31b..ec088708 100644
--- a/winrt/mupdfwinrt/muctx.cpp
+++ b/winrt/mupdfwinrt/muctx.cpp
@@ -472,7 +472,7 @@ HRESULT muctx::RenderPage(int page_num, int width, int height,
 		/* Flip on Y */
 		ctm.f = height;
 		ctm.d = -ctm.d;
-		pix = fz_new_pixmap_with_data(ctx_clone, fz_device_bgr, width, height, bmp_data);
+		pix = fz_new_pixmap_with_data(ctx_clone, fz_device_bgr(ctx_clone), width, height, bmp_data);
 		fz_clear_pixmap_with_value(ctx_clone, pix, 255);
 		dev = fz_new_draw_device(ctx_clone, pix);
 		fz_run_page(mu_doc, page, dev, pctm, NULL);