diff options
author | Michael Vrhel <michael.vrhel@artifex.com> | 2013-05-13 10:00:28 -0700 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2013-05-16 19:25:59 +0100 |
commit | 973a751daebd4ead092d6d05a1688a0077c5e2e9 (patch) | |
tree | a34340399df6c4f2c54a487f1e2b9cd1fd8e84f0 /winrt | |
parent | 99a850eefe43ba55ac34114db586d82637f0af0f (diff) | |
download | mupdf-973a751daebd4ead092d6d05a1688a0077c5e2e9.tar.xz |
Minor fixes to winRT project and text search code to account for changes in golden
Diffstat (limited to 'winrt')
-rw-r--r-- | winrt/libmupdf_winRT.vcxproj | 12 | ||||
-rw-r--r-- | winrt/libmupdf_winRT.vcxproj.filters | 36 | ||||
-rw-r--r-- | winrt/mupdfwinrt/muctx.cpp | 4 |
3 files changed, 41 insertions, 11 deletions
diff --git a/winrt/libmupdf_winRT.vcxproj b/winrt/libmupdf_winRT.vcxproj index 5f93acb5..fdd8efde 100644 --- a/winrt/libmupdf_winRT.vcxproj +++ b/winrt/libmupdf_winRT.vcxproj @@ -67,13 +67,11 @@ <ClCompile Include="..\fitz\dev_bbox.c" /> <ClCompile Include="..\fitz\dev_list.c" /> <ClCompile Include="..\fitz\dev_null.c" /> - <ClCompile Include="..\fitz\dev_text.c" /> <ClCompile Include="..\fitz\dev_trace.c" /> <ClCompile Include="..\fitz\doc_document.c" /> <ClCompile Include="..\fitz\doc_interactive.c" /> <ClCompile Include="..\fitz\doc_link.c" /> <ClCompile Include="..\fitz\doc_outline.c" /> - <ClCompile Include="..\fitz\doc_search.c" /> <ClCompile Include="..\fitz\filt_basic.c" /> <ClCompile Include="..\fitz\filt_dctd.c" /> <ClCompile Include="..\fitz\filt_faxd.c" /> @@ -93,6 +91,7 @@ <ClCompile Include="..\fitz\res_font.c" /> <ClCompile Include="..\fitz\res_func.c" /> <ClCompile Include="..\fitz\res_halftone.c" /> + <ClCompile Include="..\fitz\res_image.c" /> <ClCompile Include="..\fitz\res_path.c" /> <ClCompile Include="..\fitz\res_pixmap.c" /> <ClCompile Include="..\fitz\res_shade.c" /> @@ -103,6 +102,11 @@ <ClCompile Include="..\fitz\stm_open.c" /> <ClCompile Include="..\fitz\stm_output.c" /> <ClCompile Include="..\fitz\stm_read.c" /> + <ClCompile Include="..\fitz\text_extract.c" /> + <ClCompile Include="..\fitz\text_output.c" /> + <ClCompile Include="..\fitz\text_paragraph.c" /> + <ClCompile Include="..\fitz\text_search.c" /> + <ClCompile Include="..\image\muimage.c" /> <ClCompile Include="..\pdf\pdf_annot.c" /> <ClCompile Include="..\pdf\pdf_cmap.c" /> <ClCompile Include="..\pdf\pdf_cmap_load.c" /> @@ -138,6 +142,7 @@ <ClCompile Include="..\pdf\pdf_xobject.c" /> <ClCompile Include="..\pdf\pdf_xref.c" /> <ClCompile Include="..\pdf\pdf_xref_aux.c" /> + <ClCompile Include="..\ucdn\ucdn.c" /> <ClCompile Include="..\xps\xps_common.c" /> <ClCompile Include="..\xps\xps_doc.c" /> <ClCompile Include="..\xps\xps_glyphs.c" /> @@ -155,6 +160,7 @@ <ClInclude Include="..\fitz\fitz-internal.h" /> <ClInclude Include="..\fitz\fitz.h" /> <ClInclude Include="..\fitz\memento.h" /> + <ClInclude Include="..\image\muimage.h" /> <ClInclude Include="..\pdf\data_encodings.h" /> <ClInclude Include="..\pdf\data_glyphlist.h" /> <ClInclude Include="..\pdf\mupdf-internal.h" /> @@ -300,7 +306,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>false</SDLCheck> - <AdditionalIncludeDirectories>..\scripts;..\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\libopenjpeg;..\thirdparty\zlib;..\thirdparty\freetype\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>DEBUG=1;_WINRT;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> diff --git a/winrt/libmupdf_winRT.vcxproj.filters b/winrt/libmupdf_winRT.vcxproj.filters index 359f4908..0224d33a 100644 --- a/winrt/libmupdf_winRT.vcxproj.filters +++ b/winrt/libmupdf_winRT.vcxproj.filters @@ -16,6 +16,12 @@ <Filter Include="xps"> <UniqueIdentifier>{be1af520-39c9-4c25-938e-4c90e486c89c}</UniqueIdentifier> </Filter> + <Filter Include="ucdn"> + <UniqueIdentifier>{3e7ffbf1-2975-4b19-96d3-ed2e168c870e}</UniqueIdentifier> + </Filter> + <Filter Include="image"> + <UniqueIdentifier>{726654cd-aa58-4ed2-90df-7e02c3615031}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\cbz\mucbz.c"> @@ -102,9 +108,6 @@ <ClCompile Include="..\fitz\dev_null.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\fitz\dev_text.c"> - <Filter>fitz</Filter> - </ClCompile> <ClCompile Include="..\fitz\dev_trace.c"> <Filter>fitz</Filter> </ClCompile> @@ -120,9 +123,6 @@ <ClCompile Include="..\fitz\doc_outline.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\fitz\doc_search.c"> - <Filter>fitz</Filter> - </ClCompile> <ClCompile Include="..\fitz\filt_basic.c"> <Filter>fitz</Filter> </ClCompile> @@ -348,6 +348,27 @@ <ClCompile Include="..\fitz\res_func.c"> <Filter>fitz</Filter> </ClCompile> + <ClCompile Include="..\fitz\text_extract.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\fitz\text_output.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\fitz\text_paragraph.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\fitz\text_search.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\ucdn\ucdn.c"> + <Filter>ucdn</Filter> + </ClCompile> + <ClCompile Include="..\fitz\res_image.c"> + <Filter>fitz</Filter> + </ClCompile> + <ClCompile Include="..\image\muimage.c"> + <Filter>image</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\cbz\mucbz.h"> @@ -380,5 +401,8 @@ <ClInclude Include="..\xps\muxps.h"> <Filter>xps</Filter> </ClInclude> + <ClInclude Include="..\image\muimage.h"> + <Filter>image</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/winrt/mupdfwinrt/muctx.cpp b/winrt/mupdfwinrt/muctx.cpp index af1255ff..091846e7 100644 --- a/winrt/mupdfwinrt/muctx.cpp +++ b/winrt/mupdfwinrt/muctx.cpp @@ -526,9 +526,9 @@ String^ muctx::GetHTML(int page_num) fz_run_page(mu_doc, page, dev, &fz_identity, NULL); fz_free_device(dev); dev = NULL; - fz_text_analysis(ctx_clone, sheet, text); + fz_analyze_text(ctx_clone, sheet, text); buf = fz_new_buffer(ctx_clone, 256); - out = fz_new_output_buffer(ctx_clone, buf); + out = fz_new_output_with_buffer(ctx_clone, buf); fz_print_text_page_html(ctx_clone, out, text); html = char_to_String((char*) buf->data); } |