diff options
| -rw-r--r-- | platform/windows/gsview/mudocument.cs | 17 | ||||
| -rw-r--r-- | platform/windows/libmupdf/libmupdf.vcxproj | 19 | ||||
| -rw-r--r-- | platform/windows/libmupdf/libmupdf.vcxproj.filters | 66 | ||||
| -rw-r--r-- | platform/windows/libmupdf_winRT.vcxproj | 21 | ||||
| -rw-r--r-- | platform/windows/libmupdf_winRT.vcxproj.filters | 484 | ||||
| -rw-r--r-- | platform/windows/mupdfnet/mupdfnet.cpp | 6 | ||||
| -rw-r--r-- | platform/windows/mupdfnet/mupdfnet.h | 6 | ||||
| -rw-r--r-- | platform/windows/mupdfwinrt/muctx.cpp | 171 | ||||
| -rw-r--r-- | platform/windows/mupdfwinrt/muctx.h | 1 |
9 files changed, 445 insertions, 346 deletions
diff --git a/platform/windows/gsview/mudocument.cs b/platform/windows/gsview/mudocument.cs index e41de6e3..eb7afac6 100644 --- a/platform/windows/gsview/mudocument.cs +++ b/platform/windows/gsview/mudocument.cs @@ -217,8 +217,8 @@ namespace gsview [DllImport("mupdfnet64.dll", EntryPoint = "mGetTextCharacter", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)] - private static extern int mGetTextCharacter64(IntPtr textpage, int block_num, - int line_num, int item_num, ref double top_x, + private static extern int mGetTextCharacter64(IntPtr ctx, IntPtr textpage, + int block_num, int line_num, int item_num, ref double top_x, ref double top_y, ref double height, ref double width); [DllImport("mupdfnet64.dll", EntryPoint = "mExtractPages", CharSet = CharSet.Auto, @@ -371,8 +371,8 @@ namespace gsview [DllImport("mupdfnet32.dll", EntryPoint = "mGetTextCharacter", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)] - private static extern int mGetTextCharacter32(IntPtr textpage, int block_num, - int line_num, int item_num, ref double top_x, + private static extern int mGetTextCharacter32(IntPtr ctx, IntPtr textpage, + int block_num, int line_num, int item_num, ref double top_x, ref double top_y, ref double height, ref double width); [DllImport("mupdfnet32.dll", EntryPoint = "mExtractPages", CharSet = CharSet.Auto, @@ -1127,7 +1127,7 @@ namespace gsview return output; } - private int tc_mGetTextCharacter(IntPtr textpage, int block_num, + private int tc_mGetTextCharacter(IntPtr ctx, IntPtr textpage, int block_num, int line_num, int item_num, ref double top_x, ref double top_y, ref double height, ref double width) { @@ -1135,10 +1135,10 @@ namespace gsview try { if (is64bit) - output = mGetTextCharacter64(textpage, block_num, line_num, + output = mGetTextCharacter64(ctx, textpage, block_num, line_num, item_num, ref top_x, ref top_y, ref height, ref width); else - output = mGetTextCharacter32(textpage, block_num, line_num, + output = mGetTextCharacter32(ctx, textpage, block_num, line_num, item_num, ref top_x, ref top_y, ref height, ref width); } catch (DllNotFoundException) @@ -1404,7 +1404,8 @@ namespace gsview for (int mm = 0; mm < num_chars; mm++) { var textchars = new TextCharacter(); - int character = tc_mGetTextCharacter(text, kk, jj, mm, ref top_x, + int character = tc_mGetTextCharacter(mu_object, + text, kk, jj, mm, ref top_x, ref top_y, ref height, ref width); textchars.X = top_x; textchars.Y = top_y; diff --git a/platform/windows/libmupdf/libmupdf.vcxproj b/platform/windows/libmupdf/libmupdf.vcxproj index 78df5e8d..cfea7582 100644 --- a/platform/windows/libmupdf/libmupdf.vcxproj +++ b/platform/windows/libmupdf/libmupdf.vcxproj @@ -19,7 +19,6 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\mupdf\cbz.h" /> <ClInclude Include="..\..\..\include\mupdf\fitz.h" /> <ClInclude Include="..\..\..\include\mupdf\fitz\annotation.h" /> <ClInclude Include="..\..\..\include\mupdf\fitz\bitmap.h" /> @@ -58,9 +57,10 @@ <ClInclude Include="..\..\..\include\mupdf\fitz\system.h" /> <ClInclude Include="..\..\..\include\mupdf\fitz\text.h" /> <ClInclude Include="..\..\..\include\mupdf\fitz\transition.h" /> + <ClInclude Include="..\..\..\include\mupdf\fitz\unzip.h" /> <ClInclude Include="..\..\..\include\mupdf\fitz\write-document.h" /> <ClInclude Include="..\..\..\include\mupdf\fitz\xml.h" /> - <ClInclude Include="..\..\..\include\mupdf\img.h" /> + <ClInclude Include="..\..\..\include\mupdf\html.h" /> <ClInclude Include="..\..\..\include\mupdf\memento.h" /> <ClInclude Include="..\..\..\include\mupdf\pdf-tools.h" /> <ClInclude Include="..\..\..\include\mupdf\pdf.h" /> @@ -82,7 +82,6 @@ <ClInclude Include="..\..\..\include\mupdf\pdf\xref.h" /> <ClInclude Include="..\..\..\include\mupdf\xps.h" /> <ClInclude Include="..\..\..\source\fitz\draw-imp.h" /> - <ClInclude Include="..\..\..\source\fitz\jmemcust.h" /> <ClInclude Include="..\..\..\source\fitz\ucdn.h" /> <ClInclude Include="..\..\..\source\fitz\unicodedata_db.h" /> <ClInclude Include="..\..\..\source\pdf\pdf-encodings.h" /> @@ -91,6 +90,8 @@ </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\source\cbz\mucbz.c" /> + <ClCompile Include="..\..\..\source\cbz\muimg.c" /> + <ClCompile Include="..\..\..\source\cbz\mutiff.c" /> <ClCompile Include="..\..\..\source\fitz\bbox-device.c" /> <ClCompile Include="..\..\..\source\fitz\bitmap.c" /> <ClCompile Include="..\..\..\source\fitz\buffer.c" /> @@ -157,18 +158,27 @@ <ClCompile Include="..\..\..\source\fitz\stext-search.c" /> <ClCompile Include="..\..\..\source\fitz\store.c" /> <ClCompile Include="..\..\..\source\fitz\stream-open.c" /> + <ClCompile Include="..\..\..\source\fitz\stream-prog.c" /> <ClCompile Include="..\..\..\source\fitz\stream-read.c" /> <ClCompile Include="..\..\..\source\fitz\string.c" /> <ClCompile Include="..\..\..\source\fitz\strtod.c" /> <ClCompile Include="..\..\..\source\fitz\svg-device.c" /> + <ClCompile Include="..\..\..\source\fitz\test-device.c" /> <ClCompile Include="..\..\..\source\fitz\text.c" /> <ClCompile Include="..\..\..\source\fitz\time.c" /> <ClCompile Include="..\..\..\source\fitz\trace-device.c" /> <ClCompile Include="..\..\..\source\fitz\transition.c" /> + <ClCompile Include="..\..\..\source\fitz\tree.c" /> <ClCompile Include="..\..\..\source\fitz\ucdn.c" /> <ClCompile Include="..\..\..\source\fitz\unzip.c" /> <ClCompile Include="..\..\..\source\fitz\xml.c" /> - <ClCompile Include="..\..\..\source\img\muimage.c" /> + <ClCompile Include="..\..\..\source\html\css-apply.c" /> + <ClCompile Include="..\..\..\source\html\css-parse.c" /> + <ClCompile Include="..\..\..\source\html\epub-doc.c" /> + <ClCompile Include="..\..\..\source\html\html-doc.c" /> + <ClCompile Include="..\..\..\source\html\html-font.c" /> + <ClCompile Include="..\..\..\source\html\html-layout.c" /> + <ClCompile Include="..\..\..\source\pdf\pdf-annot-edit.c" /> <ClCompile Include="..\..\..\source\pdf\pdf-annot.c" /> <ClCompile Include="..\..\..\source\pdf\pdf-appearance.c" /> <ClCompile Include="..\..\..\source\pdf\pdf-clean.c" /> @@ -211,7 +221,6 @@ <ClCompile Include="..\..\..\source\pdf\pdf-xobject.c" /> <ClCompile Include="..\..\..\source\pdf\pdf-xref-aux.c" /> <ClCompile Include="..\..\..\source\pdf\pdf-xref.c" /> - <ClCompile Include="..\..\..\source\tiff\mutiff.c" /> <ClCompile Include="..\..\..\source\tools\pdfclean.c" /> <ClCompile Include="..\..\..\source\xps\xps-common.c" /> <ClCompile Include="..\..\..\source\xps\xps-doc.c" /> diff --git a/platform/windows/libmupdf/libmupdf.vcxproj.filters b/platform/windows/libmupdf/libmupdf.vcxproj.filters index 62f050df..e08a9dfd 100644 --- a/platform/windows/libmupdf/libmupdf.vcxproj.filters +++ b/platform/windows/libmupdf/libmupdf.vcxproj.filters @@ -16,32 +16,23 @@ <Filter Include="fitz"> <UniqueIdentifier>{71d27c79-d67f-4b0e-8a5c-ad2355c905b1}</UniqueIdentifier> </Filter> - <Filter Include="img"> - <UniqueIdentifier>{7f13938e-5486-404e-8c72-1cb35d92d68b}</UniqueIdentifier> - </Filter> <Filter Include="pdf"> <UniqueIdentifier>{766fb080-9cd3-4755-a074-a20a7f1748b8}</UniqueIdentifier> </Filter> - <Filter Include="tiff"> - <UniqueIdentifier>{e464f8d3-dcda-4cbe-bae2-48bdc6f0afd7}</UniqueIdentifier> - </Filter> <Filter Include="tools"> <UniqueIdentifier>{92cc8877-4351-49e6-8a73-9696779675ed}</UniqueIdentifier> </Filter> <Filter Include="xps"> <UniqueIdentifier>{6350172f-767f-4cdd-8c14-3a9e5af8d4c4}</UniqueIdentifier> </Filter> + <Filter Include="html"> + <UniqueIdentifier>{cb023422-71c6-4ca1-beb1-28a9e92764fc}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\mupdf\cbz.h"> - <Filter>!include</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mupdf\fitz.h"> <Filter>!include</Filter> </ClInclude> - <ClInclude Include="..\..\..\include\mupdf\img.h"> - <Filter>!include</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mupdf\memento.h"> <Filter>!include</Filter> </ClInclude> @@ -171,9 +162,6 @@ <ClInclude Include="..\..\..\include\mupdf\fitz\xml.h"> <Filter>!include\fitz</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\fitz\jmemcust.h"> - <Filter>!include\fitz</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\mupdf\pdf\annot.h"> <Filter>!include\pdf</Filter> </ClInclude> @@ -240,6 +228,12 @@ <ClInclude Include="..\..\..\source\pdf\pdf-interpret-imp.h"> <Filter>pdf</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\mupdf\html.h"> + <Filter>!include</Filter> + </ClInclude> + <ClInclude Include="..\..\..\include\mupdf\fitz\unzip.h"> + <Filter>!include\fitz</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\source\fitz\document-no-run.c"> @@ -467,9 +461,6 @@ <ClCompile Include="..\..\..\source\fitz\jmemcust.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\img\muimage.c"> - <Filter>img</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\pdf\pdf-annot.c"> <Filter>pdf</Filter> </ClCompile> @@ -596,9 +587,6 @@ <ClCompile Include="..\..\..\source\pdf\pdf-xref.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\tiff\mutiff.c"> - <Filter>tiff</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\tools\pdfclean.c"> <Filter>tools</Filter> </ClCompile> @@ -644,5 +632,41 @@ <ClCompile Include="..\..\..\source\fitz\strtod.c"> <Filter>fitz</Filter> </ClCompile> + <ClCompile Include="..\..\..\source\pdf\pdf-annot-edit.c"> + <Filter>pdf</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\html\css-apply.c"> + <Filter>html</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\html\css-parse.c"> + <Filter>html</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\html\epub-doc.c"> + <Filter>html</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\html\html-doc.c"> + <Filter>html</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\html\html-font.c"> + <Filter>html</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\html\html-layout.c"> + <Filter>html</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\fitz\stream-prog.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\fitz\test-device.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\fitz\tree.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\cbz\mutiff.c"> + <Filter>cbz</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\cbz\muimg.c"> + <Filter>cbz</Filter> + </ClCompile> </ItemGroup> </Project>
\ No newline at end of file diff --git a/platform/windows/libmupdf_winRT.vcxproj b/platform/windows/libmupdf_winRT.vcxproj index 525a59d1..b29c66b4 100644 --- a/platform/windows/libmupdf_winRT.vcxproj +++ b/platform/windows/libmupdf_winRT.vcxproj @@ -40,6 +40,8 @@ </ItemGroup> <ItemGroup> <ClCompile Include="..\..\source\cbz\mucbz.c" /> + <ClCompile Include="..\..\source\cbz\muimg.c" /> + <ClCompile Include="..\..\source\cbz\mutiff.c" /> <ClCompile Include="..\..\source\fitz\bbox-device.c" /> <ClCompile Include="..\..\source\fitz\bitmap.c" /> <ClCompile Include="..\..\source\fitz\buffer.c" /> @@ -106,18 +108,27 @@ <ClCompile Include="..\..\source\fitz\stext-search.c" /> <ClCompile Include="..\..\source\fitz\store.c" /> <ClCompile Include="..\..\source\fitz\stream-open.c" /> + <ClCompile Include="..\..\source\fitz\stream-prog.c" /> <ClCompile Include="..\..\source\fitz\stream-read.c" /> <ClCompile Include="..\..\source\fitz\string.c" /> <ClCompile Include="..\..\source\fitz\strtod.c" /> <ClCompile Include="..\..\source\fitz\svg-device.c" /> + <ClCompile Include="..\..\source\fitz\test-device.c" /> <ClCompile Include="..\..\source\fitz\text.c" /> <ClCompile Include="..\..\source\fitz\time.c" /> <ClCompile Include="..\..\source\fitz\trace-device.c" /> <ClCompile Include="..\..\source\fitz\transition.c" /> + <ClCompile Include="..\..\source\fitz\tree.c" /> <ClCompile Include="..\..\source\fitz\ucdn.c" /> <ClCompile Include="..\..\source\fitz\unzip.c" /> <ClCompile Include="..\..\source\fitz\xml.c" /> - <ClCompile Include="..\..\source\img\muimage.c" /> + <ClCompile Include="..\..\source\html\css-apply.c" /> + <ClCompile Include="..\..\source\html\css-parse.c" /> + <ClCompile Include="..\..\source\html\epub-doc.c" /> + <ClCompile Include="..\..\source\html\html-doc.c" /> + <ClCompile Include="..\..\source\html\html-font.c" /> + <ClCompile Include="..\..\source\html\html-layout.c" /> + <ClCompile Include="..\..\source\pdf\pdf-annot-edit.c" /> <ClCompile Include="..\..\source\pdf\pdf-annot.c" /> <ClCompile Include="..\..\source\pdf\pdf-appearance.c" /> <ClCompile Include="..\..\source\pdf\pdf-clean.c" /> @@ -160,7 +171,6 @@ <ClCompile Include="..\..\source\pdf\pdf-xobject.c" /> <ClCompile Include="..\..\source\pdf\pdf-xref-aux.c" /> <ClCompile Include="..\..\source\pdf\pdf-xref.c" /> - <ClCompile Include="..\..\source\tiff\mutiff.c" /> <ClCompile Include="..\..\source\tools\pdfclean.c" /> <ClCompile Include="..\..\source\xps\xps-common.c" /> <ClCompile Include="..\..\source\xps\xps-doc.c" /> @@ -192,6 +202,7 @@ <ClInclude Include="..\..\include\mupdf\fitz\function.h" /> <ClInclude Include="..\..\include\mupdf\fitz\getopt.h" /> <ClInclude Include="..\..\include\mupdf\fitz\glyph-cache.h" /> + <ClInclude Include="..\..\include\mupdf\fitz\glyph.h" /> <ClInclude Include="..\..\include\mupdf\fitz\hash.h" /> <ClInclude Include="..\..\include\mupdf\fitz\image.h" /> <ClInclude Include="..\..\include\mupdf\fitz\link.h" /> @@ -203,6 +214,7 @@ <ClInclude Include="..\..\include\mupdf\fitz\output-pnm.h" /> <ClInclude Include="..\..\include\mupdf\fitz\output-pwg.h" /> <ClInclude Include="..\..\include\mupdf\fitz\output-svg.h" /> + <ClInclude Include="..\..\include\mupdf\fitz\output-tga.h" /> <ClInclude Include="..\..\include\mupdf\fitz\output.h" /> <ClInclude Include="..\..\include\mupdf\fitz\path.h" /> <ClInclude Include="..\..\include\mupdf\fitz\pixmap.h" /> @@ -214,9 +226,12 @@ <ClInclude Include="..\..\include\mupdf\fitz\system.h" /> <ClInclude Include="..\..\include\mupdf\fitz\text.h" /> <ClInclude Include="..\..\include\mupdf\fitz\transition.h" /> + <ClInclude Include="..\..\include\mupdf\fitz\tree.h" /> + <ClInclude Include="..\..\include\mupdf\fitz\unzip.h" /> + <ClInclude Include="..\..\include\mupdf\fitz\version.h" /> <ClInclude Include="..\..\include\mupdf\fitz\write-document.h" /> <ClInclude Include="..\..\include\mupdf\fitz\xml.h" /> - <ClInclude Include="..\..\include\mupdf\img.h" /> + <ClInclude Include="..\..\include\mupdf\html.h" /> <ClInclude Include="..\..\include\mupdf\memento.h" /> <ClInclude Include="..\..\include\mupdf\pdf-tools.h" /> <ClInclude Include="..\..\include\mupdf\pdf.h" /> diff --git a/platform/windows/libmupdf_winRT.vcxproj.filters b/platform/windows/libmupdf_winRT.vcxproj.filters index 86036ee8..d964561c 100644 --- a/platform/windows/libmupdf_winRT.vcxproj.filters +++ b/platform/windows/libmupdf_winRT.vcxproj.filters @@ -10,18 +10,12 @@ <Filter Include="!include\pdf"> <UniqueIdentifier>{7b0f7938-a977-4cd9-a8bc-aeef816ae84c}</UniqueIdentifier> </Filter> - <Filter Include="tiff"> - <UniqueIdentifier>{631e9425-7a6a-4529-95c8-06ea5b145899}</UniqueIdentifier> - </Filter> <Filter Include="cbz"> <UniqueIdentifier>{8de280a7-9403-401a-8ab5-bf7f0ce3a27f}</UniqueIdentifier> </Filter> <Filter Include="fitz"> <UniqueIdentifier>{ebee942a-03ff-4a0b-8e41-1ffa2a16d448}</UniqueIdentifier> </Filter> - <Filter Include="img"> - <UniqueIdentifier>{87d18a14-080e-4bad-8db6-c9df888baa1c}</UniqueIdentifier> - </Filter> <Filter Include="pdf"> <UniqueIdentifier>{ec1b8208-f4f4-4c3f-a071-dcecc79bbd72}</UniqueIdentifier> </Filter> @@ -34,57 +28,99 @@ <Filter Include="xps"> <UniqueIdentifier>{4e3d83f6-3258-4f7b-8174-bc825377658e}</UniqueIdentifier> </Filter> + <Filter Include="html"> + <UniqueIdentifier>{357f89f4-4c0a-4661-b81d-6173c5bdb134}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\source\fitz\document-no-run.c"> - <Filter>!include\fitz</Filter> - </ClCompile> <ClCompile Include="..\..\source\cbz\mucbz.c"> <Filter>cbz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\bbox-device.c"> + <ClCompile Include="..\..\source\tools\pdfclean.c"> + <Filter>tools</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-common.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-doc.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-glyphs.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-gradient.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-image.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-outline.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-path.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-resource.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-tile.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-util.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\xps\xps-zip.c"> + <Filter>xps</Filter> + </ClCompile> + <ClCompile Include="..\..\source\cbz\muimg.c"> + <Filter>cbz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\cbz\mutiff.c"> + <Filter>cbz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\test-device.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\bitmap.c"> + <ClCompile Include="..\..\source\fitz\text.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\buffer.c"> + <ClCompile Include="..\..\source\fitz\trace-device.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\colorspace.c"> + <ClCompile Include="..\..\source\fitz\transition.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\compressed-buffer.c"> + <ClCompile Include="..\..\source\fitz\tree.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\context.c"> + <ClCompile Include="..\..\source\fitz\unzip.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\crypt-aes.c"> + <ClCompile Include="..\..\source\fitz\xml.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\crypt-arc4.c"> + <ClCompile Include="..\..\source\fitz\bbox-device.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\crypt-md5.c"> + <ClCompile Include="..\..\source\fitz\buffer.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\crypt-sha2.c"> + <ClCompile Include="..\..\source\fitz\colorspace.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\device.c"> + <ClCompile Include="..\..\source\fitz\compressed-buffer.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\document-all.c"> + <ClCompile Include="..\..\source\fitz\context.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\document.c"> + <ClCompile Include="..\..\source\fitz\device.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\draw-affine.c"> + <ClCompile Include="..\..\source\fitz\document.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\draw-blend.c"> + <ClCompile Include="..\..\source\fitz\document-all.c"> <Filter>fitz</Filter> </ClCompile> <ClCompile Include="..\..\source\fitz\draw-device.c"> @@ -99,9 +135,6 @@ <ClCompile Include="..\..\source\fitz\draw-mesh.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\draw-paint.c"> - <Filter>fitz</Filter> - </ClCompile> <ClCompile Include="..\..\source\fitz\draw-path.c"> <Filter>fitz</Filter> </ClCompile> @@ -111,9 +144,6 @@ <ClCompile Include="..\..\source\fitz\draw-unpack.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\error.c"> - <Filter>fitz</Filter> - </ClCompile> <ClCompile Include="..\..\source\fitz\filter-basic.c"> <Filter>fitz</Filter> </ClCompile> @@ -147,15 +177,9 @@ <ClCompile Include="..\..\source\fitz\geometry.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\getopt.c"> - <Filter>fitz</Filter> - </ClCompile> <ClCompile Include="..\..\source\fitz\glyph.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\halftone.c"> - <Filter>fitz</Filter> - </ClCompile> <ClCompile Include="..\..\source\fitz\hash.c"> <Filter>fitz</Filter> </ClCompile> @@ -168,15 +192,6 @@ <ClCompile Include="..\..\source\fitz\list-device.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\load-jpeg.c"> - <Filter>fitz</Filter> - </ClCompile> - <ClCompile Include="..\..\source\fitz\load-jpx.c"> - <Filter>fitz</Filter> - </ClCompile> - <ClCompile Include="..\..\source\fitz\load-jxr.c"> - <Filter>fitz</Filter> - </ClCompile> <ClCompile Include="..\..\source\fitz\load-png.c"> <Filter>fitz</Filter> </ClCompile> @@ -192,13 +207,13 @@ <ClCompile Include="..\..\source\fitz\outline.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\output-pcl.c"> + <ClCompile Include="..\..\source\fitz\output.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\output-pwg.c"> + <ClCompile Include="..\..\source\fitz\output-pcl.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\output.c"> + <ClCompile Include="..\..\source\fitz\output-pwg.c"> <Filter>fitz</Filter> </ClCompile> <ClCompile Include="..\..\source\fitz\path.c"> @@ -207,9 +222,6 @@ <ClCompile Include="..\..\source\fitz\pixmap.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\printf.c"> - <Filter>fitz</Filter> - </ClCompile> <ClCompile Include="..\..\source\fitz\shade.c"> <Filter>fitz</Filter> </ClCompile> @@ -219,9 +231,6 @@ <ClCompile Include="..\..\source\fitz\stext-output.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\stext-paragraph.c"> - <Filter>fitz</Filter> - </ClCompile> <ClCompile Include="..\..\source\fitz\stext-search.c"> <Filter>fitz</Filter> </ClCompile> @@ -231,58 +240,103 @@ <ClCompile Include="..\..\source\fitz\stream-open.c"> <Filter>fitz</Filter> </ClCompile> + <ClCompile Include="..\..\source\fitz\stream-prog.c"> + <Filter>fitz</Filter> + </ClCompile> <ClCompile Include="..\..\source\fitz\stream-read.c"> <Filter>fitz</Filter> </ClCompile> + <ClCompile Include="..\..\source\fitz\svg-device.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\ftoa.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\printf.c"> + <Filter>fitz</Filter> + </ClCompile> <ClCompile Include="..\..\source\fitz\string.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\svg-device.c"> + <ClCompile Include="..\..\source\fitz\strtod.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\text.c"> + <ClCompile Include="..\..\source\fitz\error.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\load-jpeg.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\load-jpx.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\stext-paragraph.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\draw-affine.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\jmemcust.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\document-no-run.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\crypt-sha2.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\load-jxr.c"> <Filter>fitz</Filter> </ClCompile> <ClCompile Include="..\..\source\fitz\time.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\trace-device.c"> + <ClCompile Include="..\..\source\fitz\crypt-aes.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\transition.c"> + <ClCompile Include="..\..\source\fitz\halftone.c"> <Filter>fitz</Filter> </ClCompile> <ClCompile Include="..\..\source\fitz\ucdn.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\xml.c"> + <ClCompile Include="..\..\source\fitz\draw-paint.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\jmemcust.c"> + <ClCompile Include="..\..\source\fitz\bitmap.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\..\source\img\muimage.c"> - <Filter>img</Filter> + <ClCompile Include="..\..\source\fitz\crypt-arc4.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\crypt-md5.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\draw-blend.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\..\source\fitz\getopt.c"> + <Filter>fitz</Filter> </ClCompile> <ClCompile Include="..\..\source\pdf\pdf-annot.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\pdf\pdf-appearance.c"> + <ClCompile Include="..\..\source\pdf\pdf-annot-edit.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\pdf\pdf-clean.c"> + <ClCompile Include="..\..\source\pdf\pdf-appearance.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\pdf\pdf-cmap-load.c"> + <ClCompile Include="..\..\source\pdf\pdf-clean.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\pdf\pdf-cmap-parse.c"> + <ClCompile Include="..\..\source\pdf\pdf-cmap.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\pdf\pdf-cmap-table.c"> + <ClCompile Include="..\..\source\pdf\pdf-cmap-load.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\pdf\pdf-cmap.c"> + <ClCompile Include="..\..\source\pdf\pdf-cmap-parse.c"> <Filter>pdf</Filter> </ClCompile> <ClCompile Include="..\..\source\pdf\pdf-colorspace.c"> @@ -294,9 +348,6 @@ <ClCompile Include="..\..\source\pdf\pdf-device.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\pdf\pdf-encoding.c"> - <Filter>pdf</Filter> - </ClCompile> <ClCompile Include="..\..\source\pdf\pdf-event.c"> <Filter>pdf</Filter> </ClCompile> @@ -324,9 +375,6 @@ <ClCompile Include="..\..\source\pdf\pdf-lex.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\pdf\pdf-metrics.c"> - <Filter>pdf</Filter> - </ClCompile> <ClCompile Include="..\..\source\pdf\pdf-nametree.c"> <Filter>pdf</Filter> </ClCompile> @@ -384,68 +432,155 @@ <ClCompile Include="..\..\source\pdf\pdf-xobject.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\pdf\pdf-xref-aux.c"> - <Filter>pdf</Filter> - </ClCompile> <ClCompile Include="..\..\source\pdf\pdf-xref.c"> <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\tiff\mutiff.c"> - <Filter>tiff</Filter> - </ClCompile> - <ClCompile Include="..\..\source\tools\pdfclean.c"> - <Filter>tools</Filter> - </ClCompile> - <ClCompile Include="..\..\source\xps\xps-common.c"> - <Filter>xps</Filter> - </ClCompile> - <ClCompile Include="..\..\source\xps\xps-doc.c"> - <Filter>xps</Filter> - </ClCompile> - <ClCompile Include="..\..\source\xps\xps-glyphs.c"> - <Filter>xps</Filter> - </ClCompile> - <ClCompile Include="..\..\source\xps\xps-gradient.c"> - <Filter>xps</Filter> - </ClCompile> - <ClCompile Include="..\..\source\xps\xps-image.c"> - <Filter>xps</Filter> + <ClCompile Include="..\..\source\pdf\pdf-xref-aux.c"> + <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\xps\xps-outline.c"> - <Filter>xps</Filter> + <ClCompile Include="..\..\source\pdf\pdf-cmap-table.c"> + <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\xps\xps-path.c"> - <Filter>xps</Filter> + <ClCompile Include="..\..\source\pdf\pdf-encoding.c"> + <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\xps\xps-resource.c"> - <Filter>xps</Filter> + <ClCompile Include="..\..\source\pdf\pdf-metrics.c"> + <Filter>pdf</Filter> </ClCompile> - <ClCompile Include="..\..\source\xps\xps-tile.c"> - <Filter>xps</Filter> + <ClCompile Include="..\..\source\html\css-apply.c"> + <Filter>html</Filter> </ClCompile> - <ClCompile Include="..\..\source\xps\xps-util.c"> - <Filter>xps</Filter> + <ClCompile Include="..\..\source\html\css-parse.c"> + <Filter>html</Filter> </ClCompile> - <ClCompile Include="..\..\source\xps\xps-zip.c"> - <Filter>xps</Filter> + <ClCompile Include="..\..\source\html\epub-doc.c"> + <Filter>html</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\ftoa.c"> - <Filter>fitz</Filter> + <ClCompile Include="..\..\source\html\html-doc.c"> + <Filter>html</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\strtod.c"> - <Filter>fitz</Filter> + <ClCompile Include="..\..\source\html\html-font.c"> + <Filter>html</Filter> </ClCompile> - <ClCompile Include="..\..\source\fitz\unzip.c"> - <Filter>fitz</Filter> + <ClCompile Include="..\..\source\html\html-layout.c"> + <Filter>html</Filter> </ClCompile> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\include\mupdf\pdf\annot.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\cmap.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\crypt.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\document.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\event.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\field.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\font.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\javascript.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\object.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\output-pdf.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\page.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\parse.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\resource.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\widget.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\xref.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\cbz.h"> + <Filter>!include</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz.h"> + <Filter>!include</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\memento.h"> + <Filter>!include</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf.h"> + <Filter>!include</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\xps.h"> + <Filter>!include</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf\appearance.h"> + <Filter>!include\pdf</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\pdf-tools.h"> + <Filter>!include</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\html.h"> + <Filter>!include</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\annotation.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\bitmap.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\buffer.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\colorspace.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\compressed-buffer.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\context.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\crypt.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\device.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\display-list.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\document.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\filter.h"> + <Filter>!include\fitz</Filter> + </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\font.h"> + <Filter>!include\fitz</Filter> + </ClInclude> <ClInclude Include="..\..\include\mupdf\fitz\function.h"> <Filter>!include\fitz</Filter> </ClInclude> <ClInclude Include="..\..\include\mupdf\fitz\getopt.h"> <Filter>!include\fitz</Filter> </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\glyph.h"> + <Filter>!include\fitz</Filter> + </ClInclude> <ClInclude Include="..\..\include\mupdf\fitz\glyph-cache.h"> <Filter>!include\fitz</Filter> </ClInclude> @@ -485,6 +620,9 @@ <ClInclude Include="..\..\include\mupdf\fitz\output-svg.h"> <Filter>!include\fitz</Filter> </ClInclude> + <ClInclude Include="..\..\include\mupdf\fitz\output-tga.h"> + <Filter>!include\fitz</Filter> + </ClInclude> <ClInclude Include="..\..\include\mupdf\fitz\path.h"> <Filter>!include\fitz</Filter> </ClInclude> @@ -515,121 +653,25 @@ <ClInclude Include="..\..\include\mupdf\fitz\transition.h"> <Filter>!include\fitz</Filter> </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\write-document.h"> - <Filter>!include\fitz</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\xml.h"> - <Filter>!include\fitz</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\annotation.h"> - <Filter>!include\fitz</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\bitmap.h"> - <Filter>!include\fitz</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\buffer.h"> - <Filter>!include\fitz</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\colorspace.h"> - <Filter>!include\fitz</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\compressed-buffer.h"> - <Filter>!include\fitz</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\context.h"> - <Filter>!include\fitz</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\crypt.h"> - <Filter>!include\fitz</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\device.h"> + <ClInclude Include="..\..\include\mupdf\fitz\tree.h"> <Filter>!include\fitz</Filter> </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\display-list.h"> + <ClInclude Include="..\..\include\mupdf\fitz\unzip.h"> <Filter>!include\fitz</Filter> </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\document.h"> + <ClInclude Include="..\..\include\mupdf\fitz\version.h"> <Filter>!include\fitz</Filter> </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\filter.h"> + <ClInclude Include="..\..\include\mupdf\fitz\write-document.h"> <Filter>!include\fitz</Filter> </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz\font.h"> + <ClInclude Include="..\..\include\mupdf\fitz\xml.h"> <Filter>!include\fitz</Filter> </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\annot.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\cmap.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\crypt.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\document.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\event.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\field.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\font.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\javascript.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\object.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\output-pdf.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\page.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\parse.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\resource.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\widget.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\xref.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\cbz.h"> - <Filter>!include</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\fitz.h"> - <Filter>!include</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\img.h"> - <Filter>!include</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\memento.h"> - <Filter>!include</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf.h"> - <Filter>!include</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\xps.h"> - <Filter>!include</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf\appearance.h"> - <Filter>!include\pdf</Filter> - </ClInclude> - <ClInclude Include="..\..\include\mupdf\pdf-tools.h"> - <Filter>!include</Filter> + <ClInclude Include="..\..\source\fitz\draw-imp.h"> + <Filter>fitz</Filter> </ClInclude> <ClInclude Include="..\..\source\fitz\jmemcust.h"> - <Filter>!include\fitz</Filter> - </ClInclude> - <ClInclude Include="..\..\source\fitz\draw-imp.h"> <Filter>fitz</Filter> </ClInclude> <ClInclude Include="..\..\source\fitz\ucdn.h"> @@ -638,13 +680,13 @@ <ClInclude Include="..\..\source\fitz\unicodedata_db.h"> <Filter>fitz</Filter> </ClInclude> - <ClInclude Include="..\..\source\pdf\pdf-encodings.h"> + <ClInclude Include="..\..\source\pdf\pdf-interpret-imp.h"> <Filter>pdf</Filter> </ClInclude> - <ClInclude Include="..\..\source\pdf\pdf-glyphlist.h"> + <ClInclude Include="..\..\source\pdf\pdf-encodings.h"> <Filter>pdf</Filter> </ClInclude> - <ClInclude Include="..\..\source\pdf\pdf-interpret-imp.h"> + <ClInclude Include="..\..\source\pdf\pdf-glyphlist.h"> <Filter>pdf</Filter> </ClInclude> </ItemGroup> diff --git a/platform/windows/mupdfnet/mupdfnet.cpp b/platform/windows/mupdfnet/mupdfnet.cpp index a778537a..c544bcd9 100644 --- a/platform/windows/mupdfnet/mupdfnet.cpp +++ b/platform/windows/mupdfnet/mupdfnet.cpp @@ -356,7 +356,7 @@ SYMBOL_DECLSPEC int __stdcall mGetTextLine(void *page, int block_num, int line_n } /* Information down to the character level */ -SYMBOL_DECLSPEC int __stdcall mGetTextCharacter(void *page, int block_num, int line_num, +SYMBOL_DECLSPEC int __stdcall mGetTextCharacter(void *ctx, void *page, int block_num, int line_num, int item_num, double *top_x, double *top_y, double *height, double *width) { fz_text_block *block; @@ -365,6 +365,7 @@ SYMBOL_DECLSPEC int __stdcall mGetTextCharacter(void *page, int block_num, int l fz_text_page *text = (fz_text_page*)page; fz_char_and_box cab; int index = item_num; + muctx *mu_ctx = static_cast<muctx*>(ctx); block = text->blocks[block_num].u.text; line = block->lines[line_num]; @@ -377,7 +378,8 @@ SYMBOL_DECLSPEC int __stdcall mGetTextCharacter(void *page, int block_num, int l } cab.c = span->text[index].c; - fz_text_char_bbox(&(cab.bbox), span, index); + mu_ctx->GetCharBBox(&(cab.bbox), span, index); + *top_x = cab.bbox.x0; *top_y = cab.bbox.y0; *height = cab.bbox.y1 - *top_y; diff --git a/platform/windows/mupdfnet/mupdfnet.h b/platform/windows/mupdfnet/mupdfnet.h index 44a4382b..b300b1f6 100644 --- a/platform/windows/mupdfnet/mupdfnet.h +++ b/platform/windows/mupdfnet/mupdfnet.h @@ -63,9 +63,9 @@ EXTERN_C SYMBOL_DECLSPEC int __stdcall mGetTextBlock(void *text, int block_num, EXTERN_C SYMBOL_DECLSPEC int __stdcall mGetTextLine(void *text, int block_num, int line_num, double *top_x, double *top_y, double *height, double *width); -EXTERN_C SYMBOL_DECLSPEC int __stdcall mGetTextCharacter(void *text, int block_num, - int line_num, int item_num, double *top_x, double *top_y, double *height, - double *width); +EXTERN_C SYMBOL_DECLSPEC int __stdcall mGetTextCharacter(void *ctx, void *text, + int block_num, int line_num, int item_num, double *top_x, double *top_y, + double *height, double *width); EXTERN_C SYMBOL_DECLSPEC void __stdcall mReleaseText(void *ctx, void *page); diff --git a/platform/windows/mupdfwinrt/muctx.cpp b/platform/windows/mupdfwinrt/muctx.cpp index e51ea403..f5bd741b 100644 --- a/platform/windows/mupdfwinrt/muctx.cpp +++ b/platform/windows/mupdfwinrt/muctx.cpp @@ -14,7 +14,7 @@ static int textlen(fz_text_page *page); //#include <ppltasks.h> //using namespace concurrency; /* File streaming set up for WinRT */ -static int win_next_file(fz_stream *stm, int len) +static int win_next_file(fz_context *ctx, fz_stream *stm, int len) { void *temp = stm->state; win_stream_struct *state = reinterpret_cast <win_stream_struct*> (temp); @@ -60,7 +60,7 @@ static int win_next_file(fz_stream *stm, int len) return *stm->rp++; } -static void win_seek_file(fz_stream *stm, int offset, int whence) +static void win_seek_file(fz_context *ctx, fz_stream *stm, int offset, int whence) { void *temp = stm->state; win_stream_struct *stream = reinterpret_cast <win_stream_struct*> (temp); @@ -97,7 +97,7 @@ static void win_close_file(fz_context *ctx, void *state) status_t muctx::InitializeStream(IRandomAccessStream^ readStream, char *ext) { win_stream.stream = readStream; - fz_stream *mu_stream = fz_new_stream(mu_ctx, 0, win_next_file, win_close_file, NULL); + fz_stream *mu_stream = fz_new_stream(mu_ctx, 0, win_next_file, win_close_file); mu_stream->seek = win_seek_file; mu_stream->state = reinterpret_cast <void*> (&win_stream); @@ -108,7 +108,7 @@ status_t muctx::InitializeStream(IRandomAccessStream^ readStream, char *ext) } fz_always(mu_ctx) { - fz_close(mu_stream); + fz_drop_stream(mu_ctx, mu_stream); } fz_catch(mu_ctx) { @@ -146,11 +146,11 @@ static void unlock_mutex(void *user, int lock) void muctx::CleanUp(void) { - fz_free_outline(mu_ctx, mu_outline); - fz_close_document(mu_doc); + fz_drop_outline(mu_ctx, mu_outline); + fz_drop_document(mu_ctx, mu_doc); page_cache->Empty(mu_ctx); annot_cache->Empty(mu_ctx); - fz_free_context(mu_ctx); + fz_drop_context(mu_ctx); delete page_cache; delete annot_cache; @@ -204,11 +204,11 @@ muctx::muctx(void) /* Destructor */ muctx::~muctx(void) { - fz_free_outline(mu_ctx, mu_outline); - fz_close_document(mu_doc); + fz_drop_outline(mu_ctx, mu_outline); + fz_drop_document(mu_ctx, mu_doc); page_cache->Empty(mu_ctx); annot_cache->Empty(mu_ctx); - fz_free_context(mu_ctx); + fz_drop_context(mu_ctx); mu_ctx = NULL; mu_doc = NULL; @@ -222,10 +222,10 @@ muctx::~muctx(void) /* Return the documents page count */ int muctx::GetPageCount() { - if (this->mu_doc == NULL) + if (mu_doc == NULL) return -1; else - return this->mu_doc->count_pages(this->mu_doc); + return this->mu_doc->count_pages(mu_ctx, mu_doc); } /* Get page size */ @@ -237,14 +237,14 @@ int muctx::MeasurePage(int page_num, point_t *size) fz_try(mu_ctx) { - page = fz_load_page(mu_doc, page_num); - bounds = fz_bound_page(mu_doc, page, &rect); + page = fz_load_page(mu_ctx, mu_doc, page_num); + bounds = fz_bound_page(mu_ctx, page, &rect); size->X = bounds->x1 - bounds->x0; size->Y = bounds->y1 - bounds->y0; } fz_always(mu_ctx) { - fz_free_page(mu_doc, page); + fz_drop_page(mu_ctx, page); } fz_catch(mu_ctx) { @@ -260,7 +260,7 @@ point_t muctx::MeasurePage(fz_page *page) fz_rect rect; fz_rect *bounds; - bounds = fz_bound_page(mu_doc, page, &rect); + bounds = fz_bound_page(mu_ctx, page, &rect); pageSize.X = bounds->x1 - bounds->x0; pageSize.Y = bounds->y1 - bounds->y0; @@ -309,7 +309,7 @@ int muctx::GetContents(sh_vector_content contents_vec) fz_var(root); fz_try(mu_ctx) { - root = fz_load_outline(mu_doc); + root = fz_load_outline(mu_ctx, mu_doc); if (root != NULL) { has_content = 1; @@ -318,7 +318,7 @@ int muctx::GetContents(sh_vector_content contents_vec) } fz_always(mu_ctx) { - fz_free_outline(mu_ctx, root); + fz_drop_outline(mu_ctx, root); } fz_catch(mu_ctx) { @@ -341,12 +341,12 @@ int muctx::GetTextSearch(int page_num, char* needle, sh_vector_text texts_vec) fz_var(dev); fz_try(mu_ctx) { - page = fz_load_page(mu_doc, page_num); + page = fz_load_page(mu_ctx, mu_doc, page_num); sheet = fz_new_text_sheet(mu_ctx); text = fz_new_text_page(mu_ctx); dev = fz_new_text_device(mu_ctx, sheet, text); - fz_run_page(mu_doc, page, dev, &fz_identity, NULL); - fz_free_device(dev); /* Why does this need to be done here? Seems odd */ + fz_run_page(mu_ctx, page, dev, &fz_identity, NULL); + fz_drop_device(mu_ctx, dev); /* Why does this need to be done here? Seems odd */ dev = NULL; hit_count = fz_search_text_page(mu_ctx, text, needle, mu_hit_bbox, nelem(mu_hit_bbox)); @@ -362,10 +362,10 @@ int muctx::GetTextSearch(int page_num, char* needle, sh_vector_text texts_vec) } fz_always(mu_ctx) { - fz_free_page(mu_doc, page); - fz_free_device(dev); - fz_free_text_sheet(mu_ctx, sheet); - fz_free_text_page(mu_ctx, text); + fz_drop_page(mu_ctx, page); + fz_drop_device(mu_ctx, dev); + fz_drop_text_sheet(mu_ctx, sheet); + fz_drop_text_page(mu_ctx, text); } fz_catch(mu_ctx) { @@ -386,8 +386,8 @@ unsigned int muctx::GetLinks(int page_num, sh_vector_link links_vec) fz_var(links); fz_try(mu_ctx) { - page = fz_load_page(mu_doc, page_num); - links = fz_load_links(mu_doc, page); + page = fz_load_page(mu_ctx, mu_doc, page_num); + links = fz_load_links(mu_ctx, page); fz_link *curr_link = links; if (curr_link != NULL) @@ -433,7 +433,7 @@ unsigned int muctx::GetLinks(int page_num, sh_vector_link links_vec) } fz_always(mu_ctx) { - fz_free_page(mu_doc, page); + fz_drop_page(mu_ctx, page); fz_drop_link(mu_ctx, links); } fz_catch(mu_ctx) @@ -462,23 +462,23 @@ fz_display_list * muctx::CreateAnnotationList(int page_num) fz_try(mu_ctx) { fz_annot *annot; - page = fz_load_page(mu_doc, page_num); - annot = fz_first_annot(mu_doc, page); + page = fz_load_page(mu_ctx, mu_doc, page_num); + annot = fz_first_annot(mu_ctx, page); if (annot != NULL) { /* Create display list */ dlist = fz_new_display_list(mu_ctx); dev = fz_new_list_device(mu_ctx, dlist); - for (annot = fz_first_annot(mu_doc, page); annot; annot = fz_next_annot(mu_doc, annot)) - fz_run_annot(mu_doc, page, annot, dev, &fz_identity, NULL); + for (annot = fz_first_annot(mu_ctx, page); annot; annot = fz_next_annot(mu_ctx, page, annot)) + fz_run_annot(mu_ctx, page, annot, dev, &fz_identity, NULL); annot_cache->Add(page_num, 0, 0, dlist, mu_ctx); } } fz_always(mu_ctx) { - fz_free_device(dev); - fz_free_page(mu_doc, page); + fz_drop_device(mu_ctx, dev); + fz_drop_page(mu_ctx, page); } fz_catch(mu_ctx) { @@ -506,12 +506,12 @@ fz_display_list * muctx::CreateDisplayList(int page_num, int *width, int *height fz_try(mu_ctx) { - page = fz_load_page(mu_doc, page_num); + page = fz_load_page(mu_ctx, mu_doc, page_num); /* Create a new list */ dlist = fz_new_display_list(mu_ctx); dev = fz_new_list_device(mu_ctx, dlist); - fz_run_page_contents(mu_doc, page, dev, &fz_identity, NULL); + fz_run_page_contents(mu_ctx, page, dev, &fz_identity, NULL); page_size = MeasurePage(page); *width = page_size.X; *height = page_size.Y; @@ -520,8 +520,8 @@ fz_display_list * muctx::CreateDisplayList(int page_num, int *width, int *height } fz_always(mu_ctx) { - fz_free_device(dev); - fz_free_page(mu_doc, page); + fz_drop_device(mu_ctx, dev); + fz_drop_page(mu_ctx, page); } fz_catch(mu_ctx) { @@ -575,7 +575,7 @@ fz_display_list * muctx::CreateDisplayListText(int page_num, int *width, int *he fz_try(mu_ctx) { - page = fz_load_page(mu_doc, page_num); + page = fz_load_page(mu_ctx,mu_doc, page_num); sheet = fz_new_text_sheet(mu_ctx); text = fz_new_text_page(mu_ctx); @@ -585,14 +585,14 @@ fz_display_list * muctx::CreateDisplayListText(int page_num, int *width, int *he /* Deal with text device */ textdev = fz_new_text_device(mu_ctx, sheet, text); - fz_run_page(mu_doc, page, textdev, &fz_identity, NULL); + fz_run_page(mu_ctx, page, textdev, &fz_identity, NULL); *length = text->len; - fz_free_device(textdev); + fz_drop_device(mu_ctx, textdev); textdev = NULL; *text_out = text; - fz_run_page_contents(mu_doc, page, dev, &fz_identity, NULL); + fz_run_page_contents(mu_ctx, page, dev, &fz_identity, NULL); page_size = MeasurePage(page); *width = page_size.X; *height = page_size.Y; @@ -601,9 +601,9 @@ fz_display_list * muctx::CreateDisplayListText(int page_num, int *width, int *he } fz_always(mu_ctx) { - fz_free_device(dev); - fz_free_page(mu_doc, page); - fz_free_text_sheet(mu_ctx, sheet); + fz_drop_device(mu_ctx, dev); + fz_drop_page(mu_ctx, page); + fz_drop_text_sheet(mu_ctx, sheet); } fz_catch(mu_ctx) @@ -654,22 +654,22 @@ status_t muctx::RenderPageMT(void *dlist, void *a_dlist, int page_width, int pag bmp_width, bmp_height, bmp_data); fz_clear_pixmap_with_value(ctx_clone, pix, 255); dev = fz_new_draw_device(ctx_clone, pix); - fz_run_display_list(display_list, dev, pctm, NULL, NULL); + fz_run_display_list(ctx_clone, display_list, dev, pctm, NULL, NULL); if (annot_displaylist != NULL) - fz_run_display_list(annot_displaylist, dev, pctm, NULL, NULL); + fz_run_display_list(ctx_clone, annot_displaylist, dev, pctm, NULL, NULL); } fz_always(ctx_clone) { - fz_free_device(dev); + fz_drop_device(ctx_clone, dev); fz_drop_pixmap(ctx_clone, pix); } fz_catch(ctx_clone) { - fz_free_context(ctx_clone); + fz_drop_context(ctx_clone); return E_FAILURE; } - fz_free_context(ctx_clone); + fz_drop_context(ctx_clone); return S_ISOK; } @@ -689,7 +689,7 @@ status_t muctx::RenderPage(int page_num, unsigned char *bmp_data, int bmp_width, fz_try(mu_ctx) { - page = fz_load_page(mu_doc, page_num); + page = fz_load_page(mu_ctx, mu_doc, page_num); page_size = MeasurePage(page); pctm = fz_scale(pctm, scale, scale); /* Flip on Y */ @@ -702,17 +702,17 @@ status_t muctx::RenderPage(int page_num, unsigned char *bmp_data, int bmp_width, bmp_height, bmp_data); fz_clear_pixmap_with_value(mu_ctx, pix, 255); dev = fz_new_draw_device(mu_ctx, pix); - fz_run_page_contents(mu_doc, page, dev, pctm, NULL); + fz_run_page_contents(mu_ctx, page, dev, pctm, NULL); fz_annot *annot; - for (annot = fz_first_annot(mu_doc, page); annot; annot = fz_next_annot(mu_doc, annot)) - fz_run_annot(mu_doc, page, annot, dev, pctm, NULL); + for (annot = fz_first_annot(mu_ctx, page); annot; annot = fz_next_annot(mu_ctx, page, annot)) + fz_run_annot(mu_ctx, page, annot, dev, pctm, NULL); } fz_always(mu_ctx) { - fz_free_device(dev); + fz_drop_device(mu_ctx, dev); fz_drop_pixmap(mu_ctx, pix); - fz_free_page(mu_doc, page); + fz_drop_page(mu_ctx, page); } fz_catch(mu_ctx) { @@ -723,12 +723,12 @@ status_t muctx::RenderPage(int page_num, unsigned char *bmp_data, int bmp_width, bool muctx::RequiresPassword(void) { - return fz_needs_password(mu_doc) != 0; + return fz_needs_password(mu_ctx, mu_doc) != 0; } bool muctx::ApplyPassword(char* password) { - return fz_authenticate_password(mu_doc, password) != 0; + return fz_authenticate_password(mu_ctx, mu_doc, password) != 0; } std::string muctx::GetText(int page_num, int type) @@ -748,12 +748,12 @@ std::string muctx::GetText(int page_num, int type) fz_var(buf); fz_try(mu_ctx) { - page = fz_load_page(mu_doc, page_num); + page = fz_load_page(mu_ctx, mu_doc, page_num); sheet = fz_new_text_sheet(mu_ctx); text = fz_new_text_page(mu_ctx); dev = fz_new_text_device(mu_ctx, sheet, text); - fz_run_page(mu_doc, page, dev, &fz_identity, NULL); - fz_free_device(dev); + fz_run_page(mu_ctx, page, dev, &fz_identity, NULL); + fz_drop_device(mu_ctx, dev); dev = NULL; fz_analyze_text(mu_ctx, sheet, text); buf = fz_new_buffer(mu_ctx, 256); @@ -774,10 +774,10 @@ std::string muctx::GetText(int page_num, int type) } fz_always(mu_ctx) { - fz_free_device(dev); - fz_free_page(mu_doc, page); - fz_free_text_sheet(mu_ctx, sheet); - fz_free_text_page(mu_ctx, text); + fz_drop_device(mu_ctx, dev); + fz_drop_page(mu_ctx, page); + fz_drop_text_sheet(mu_ctx, sheet); + fz_drop_text_page(mu_ctx, text); fz_drop_buffer(mu_ctx, buf); } fz_catch(mu_ctx) @@ -790,7 +790,7 @@ std::string muctx::GetText(int page_num, int type) void muctx::ReleaseText(void *text) { fz_text_page *text_page = (fz_text_page*) text; - fz_free_text_page(mu_ctx, text_page); + fz_drop_text_page(mu_ctx, text_page); } /* To do: banding */ @@ -819,8 +819,8 @@ status_t muctx::SavePage(char *filename, int page_num, int resolution, int type, fz_try(mu_ctx) { - page = fz_load_page(mu_doc, page_num); - fz_bound_page(mu_doc, page, &bounds); + page = fz_load_page(mu_ctx, mu_doc, page_num); + fz_bound_page(mu_ctx, page, &bounds); zoom = resolution / 72; fz_scale(&ctm, zoom, zoom); tbounds = bounds; @@ -836,20 +836,20 @@ status_t muctx::SavePage(char *filename, int page_num, int resolution, int type, file = fopen(filename, "wb"); if (file == NULL) fz_throw(mu_ctx, FZ_ERROR_GENERIC, "cannot open file '%s'", filename); - out = fz_new_output_with_file(mu_ctx, file); + out = fz_new_output_with_file(mu_ctx, file, 0); dev = fz_new_svg_device(mu_ctx, out, tbounds.x1 - tbounds.x0, tbounds.y1 - tbounds.y0); if (dlist != NULL) - fz_run_display_list(dlist, dev, &ctm, &tbounds, NULL); + fz_run_display_list(mu_ctx, dlist, dev, &ctm, &tbounds, NULL); else - fz_run_page(mu_doc, page, dev, &ctm, NULL); + fz_run_page(mu_ctx, page, dev, &ctm, NULL); if (annot_dlist != NULL) - fz_run_display_list(annot_dlist, dev, &ctm, &tbounds, NULL); + fz_run_display_list(mu_ctx, annot_dlist, dev, &ctm, &tbounds, NULL); else { fz_annot *annot; - for (annot = fz_first_annot(mu_doc, page); annot; annot = fz_next_annot(mu_doc, annot)) - fz_run_annot(mu_doc, page, annot, dev, &fz_identity, NULL); + for (annot = fz_first_annot(mu_ctx, page); annot; annot = fz_next_annot(mu_ctx, page, annot)) + fz_run_annot(mu_ctx, page, annot, dev, &fz_identity, NULL); } } else @@ -859,16 +859,16 @@ status_t muctx::SavePage(char *filename, int page_num, int resolution, int type, fz_clear_pixmap_with_value(mu_ctx, pix, 255); dev = fz_new_draw_device(mu_ctx, pix); if (dlist != NULL) - fz_run_display_list(dlist, dev, &ctm, &tbounds, NULL); + fz_run_display_list(mu_ctx, dlist, dev, &ctm, &tbounds, NULL); else - fz_run_page(mu_doc, page, dev, &ctm, NULL); + fz_run_page(mu_ctx, page, dev, &ctm, NULL); if (annot_dlist != NULL) - fz_run_display_list(annot_dlist, dev, &ctm, &tbounds, NULL); + fz_run_display_list(mu_ctx, annot_dlist, dev, &ctm, &tbounds, NULL); else { fz_annot *annot; - for (annot = fz_first_annot(mu_doc, page); annot; annot = fz_next_annot(mu_doc, annot)) - fz_run_annot(mu_doc, page, annot, dev, &fz_identity, NULL); + for (annot = fz_first_annot(mu_ctx, page); annot; annot = fz_next_annot(mu_ctx, page, annot)) + fz_run_annot(mu_ctx, page, annot, dev, &fz_identity, NULL); } switch (type) { @@ -890,11 +890,11 @@ status_t muctx::SavePage(char *filename, int page_num, int resolution, int type, { if (pix != NULL) fz_drop_pixmap(mu_ctx, pix); - fz_free_device(dev); - fz_free_page(mu_doc, page); + fz_drop_device(mu_ctx, dev); + fz_drop_page(mu_ctx, page); if (out != NULL) { - fz_close_output(out); + fz_drop_output(mu_ctx, out); fclose(file); } } @@ -903,4 +903,9 @@ status_t muctx::SavePage(char *filename, int page_num, int resolution, int type, return E_FAILURE; } return S_ISOK; -}
\ No newline at end of file +} + +void muctx::GetCharBBox(fz_rect *rect, fz_text_span *span, int index) +{ + fz_text_char_bbox(mu_ctx, rect, span, index); +} diff --git a/platform/windows/mupdfwinrt/muctx.h b/platform/windows/mupdfwinrt/muctx.h index 5b870543..314d404b 100644 --- a/platform/windows/mupdfwinrt/muctx.h +++ b/platform/windows/mupdfwinrt/muctx.h @@ -114,6 +114,7 @@ public: bool ApplyPassword(char* password); status_t SavePage(char *filename, int pagenum, int resolution, int type, bool append); + void GetCharBBox(fz_rect *rect, fz_text_span *span, int index); #ifdef _WINRT_DLL status_t InitializeStream(IRandomAccessStream^ readStream, char *ext); |