WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 4684 → Rev 4683

 /contrib/media/updf/android/AndroidManifest.xml
 ,0 → 1,23
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.artifex.mupdf"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <supports-screens android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:anyDensity="true" />
+    <uses-sdk android:minSdkVersion="8" />
+    <application android:label="@string/app_name"
+                 android:icon="@drawable/icon"
+                 android:debuggable="true">
+        <activity android:name="MuPDFActivity"
+                  android:label="@string/app_name"
+                  android:theme="@style/Theme.NoBackground.NoTitle">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

 /contrib/media/updf/android/ReadMe.txt
 ,0 → 1,111
+To build/debug android build.
+) Download the android sdk, and install it. On windows I unpacked it as:
+   C:\Program Files\android-sdk-windows
+on Macos as:
+   /Library/android-sdk-mac_x86
+On windows add: C:/Progra~1/android-sdk-windows/tools to your path.
+On linux/macos add the equivalent.
+) Download the android ndk, and install in. On windows I unpacked it as:
+   C:\Program Files\android-ndk-r5
+on Macos as:
+   /Library/android-ndk-r5
+On windows add: C:/Progra~1/android-ndk-r5 to your path. On linux/macos
+add the equivalent.
+) On windows, to use the ndk, you *must* be running under cygwin. This means
+you need to install Cygwin 1.7 or greater now.
+In the current release of the ndk (r5), when running under cygwin, there are
+bugs to do with the automatic conversion of dependencies from DOS format
+paths to cygwin format paths. The 2 fixes can be found in:
+ <http://groups.google.com/group/android-ndk/msg/b385e47e1484c2d4>
+) Bring up a shell, and run 'android'. This will bring up a graphical
+gui for the sdk. From here you can install the different SDK components
+for the different flavours of android. Download them all - bandwidth and disk
+space are cheap, right?
+) Now go to the Virtual Devices entry on the right hand side. You need to
+create yourself an emulator image to use. Click 'New...' on the right hand
+side and a window will appear. Fill in the entries as follows:
+     Name: FroyoEm
+     Target: Android 2.2 - API Level 8
+     SD card: Size: 1024MiB
+     Skin: Resolution: 480x756  (756 just fits my macbook screen, but 800 may
+                                 be 'more standard')
+Click 'Create AVD' and wait for a minute or so while it is prepared. Now
+you can exit the GUI.
+) Now we are ready to build mupdf for Android. Check out a copy of MuPDF
+(but you've done that already, cos you're reading this, right?).
+) You will also need a copy of mupdf-thirdparty.zip (see the source code
+link on http://mupdf.com/). Unpack the contents of this into a 'thirdparty'
+directory created within the mupdf directory (i.e. at the same level as
+fitz, pdf, android etc).
+) Finally, you will need a copy of a 'generated' directory. This is not
+currently available to download. The easiest way to obtain this is to do
+a standard windows or linux build of mupdf, which generates the required
+files as part of the build process.
+) Change into the android directory, and edit local.properties into your
+favourite editor. Change the sdk path there as appropriate. This should be
+the only bit of localisation you need to do.
+) Change into the android directory (note, the android directory, NOT
+the android/jni directory!), and execute (in a Cygwin window on Windows!):
+       ndk-build
+This should build the native code portion. Then execute:
+       ant debug
+or on windows under cygwin:
+       ant.bat debug
+This should build the java wrapper.
+) Now start the emulator by executing:
+       emulator -avd FroyoEm
+This will take a while to full start up (be patient).
+) We now need to give the demo file something to chew on, so let's copy
+a file into the SD card image of the emulator (this should only need to be
+done once). With the emulator running type:
+       adb push ../../MyTests/pdf_reference17.pdf /mnt/sdcard/Download/test.pdf
+(where obviously ../../MyTests/pdf_reference17.pdf is altered for your
+machine). (adb lives in <sdk>/platform-tools if it's not on your path).
+) With the emulator running (see step 11), execute
+       ant install
+('ant.bat install' on Windows) and that will copy MuPDF into the emulator
+where you can run it from the launchpad screen.
+) To see debug messages from the emulator (including stdout/stderr from
+our app), execute:
+       adb logcat
+Good luck!

 /contrib/media/updf/android/build.properties
 ,0 → 1,17
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+# This file is only used by the Ant script.
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.

/contrib/media/updf/android/build.sh
0,0 → 1,0
ndk-build && ant.bat install

 /contrib/media/updf/android/build.xml
 ,0 → 1,84
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="MuPDF" default="help">
+<!-- The local.properties file is created and updated by the 'android'
+     tool.
+     It contains the path to the SDK. It should *NOT* be checked into
+     Version Control Systems. -->
+    <property file="local.properties" />
+    <!-- The build.properties file can be created by you and is never touched
+         by the 'android' tool. This is the place to change some of the
+         default property values used by the Ant rules.
+         Here are some properties you may want to change/update:
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+         -->
+    <property file="build.properties" />
+    <!-- The default.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <property file="default.properties" />
+    <!-- Custom Android task to deal with the project target, and import the
+         proper rules.
+         This requires ant 1.6.0 or above. -->
+    <path id="android.antlibs">
+        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+    </path>
+    <taskdef name="setup"
+        classname="com.android.ant.SetupTask"
+        classpathref="android.antlibs" />
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+<!--
+    <target name="-pre-build">
+    </target>
+    <target name="-pre-compile">
+    </target>
+    [This is typically used for code obfuscation.
+     Compiled code location: ${out.classes.absolute.dir}
+     If this is not done in place, override ${out.dex.input.absolute.dir}]
+    <target name="-post-compile">
+    </target>
+-->
+    <!-- Execute the Android Setup task that will setup some properties
+         specific to the target, and import the build rules files.
+         The rules file is imported from
+            <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <setup> task.
+             - customize it to your needs.
+         - Customize the whole script.
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, *after* the <setup> task
+             - disable the import of the rules by changing the setup task
+               below to <setup import="false" />.
+             - customize to your needs.
+    -->
+    <setup />
+</project>

 /contrib/media/updf/android/default.properties
 ,0 → 1,11
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+# Project target.
+target=android-8

 /contrib/media/updf/android/jni/Android.mk
 ,0 → 1,22
+LOCAL_PATH := $(call my-dir)
+TOP_LOCAL_PATH := $(LOCAL_PATH)
+MUPDF_ROOT := ..
+include $(TOP_LOCAL_PATH)/Core.mk
+include $(TOP_LOCAL_PATH)/ThirdParty.mk
+include $(CLEAR_VARS)
+LOCAL_C_INCLUDES := \
+        $(MUPDF_ROOT)/draw \
+        $(MUPDF_ROOT)/fitz \
+        $(MUPDF_ROOT)/pdf
+LOCAL_CFLAGS :=
+LOCAL_MODULE    := mupdf
+LOCAL_SRC_FILES := mupdf.c
+LOCAL_STATIC_LIBRARIES := mupdfcore mupdfthirdparty
+LOCAL_LDLIBS    := -lm -llog -ljnigraphics
+include $(BUILD_SHARED_LIBRARY)

/contrib/media/updf/android/jni/Application.mk
0,0 → 1,3
# The ARMv7 is significanly faster due to the use of the hardware FPU
APP_ABI := armeabi armeabi-v7a
APP_OPTIM := debug

 /contrib/media/updf/android/jni/Core.mk
 ,0 → 1,99
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+MY_ROOT := ../..
+LOCAL_C_INCLUDES := \
+        ../thirdparty/jbig2dec \
+        ../thirdparty/openjpeg-1.4/libopenjpeg \
+        ../thirdparty/jpeg-8c \
+        ../thirdparty/zlib-1.2.5 \
+        ../thirdparty/freetype-2.4.4/include \
+        ../draw \
+        ../fitz \
+        ../pdf \
+        ../scripts \
+        ..
+LOCAL_MODULE    := mupdfcore
+LOCAL_SRC_FILES := \
+        $(MY_ROOT)/fitz/base_error.c \
+        $(MY_ROOT)/fitz/base_geometry.c \
+        $(MY_ROOT)/fitz/base_getopt.c \
+        $(MY_ROOT)/fitz/base_hash.c \
+        $(MY_ROOT)/fitz/base_memory.c \
+        $(MY_ROOT)/fitz/base_object.c \
+        $(MY_ROOT)/fitz/base_string.c \
+        $(MY_ROOT)/fitz/base_time.c \
+        $(MY_ROOT)/fitz/crypt_aes.c \
+        $(MY_ROOT)/fitz/crypt_arc4.c \
+        $(MY_ROOT)/fitz/crypt_md5.c \
+        $(MY_ROOT)/fitz/crypt_sha2.c \
+        $(MY_ROOT)/fitz/dev_bbox.c \
+        $(MY_ROOT)/fitz/dev_list.c \
+        $(MY_ROOT)/fitz/dev_null.c \
+        $(MY_ROOT)/fitz/dev_text.c \
+        $(MY_ROOT)/fitz/dev_trace.c \
+        $(MY_ROOT)/fitz/filt_basic.c \
+        $(MY_ROOT)/fitz/filt_dctd.c \
+        $(MY_ROOT)/fitz/filt_faxd.c \
+        $(MY_ROOT)/fitz/filt_flate.c \
+        $(MY_ROOT)/fitz/filt_jbig2d.c \
+        $(MY_ROOT)/fitz/filt_jpxd.c \
+        $(MY_ROOT)/fitz/filt_lzwd.c \
+        $(MY_ROOT)/fitz/filt_predict.c \
+        $(MY_ROOT)/fitz/obj_print.c \
+        $(MY_ROOT)/fitz/res_colorspace.c \
+        $(MY_ROOT)/fitz/res_font.c \
+        $(MY_ROOT)/fitz/res_path.c \
+        $(MY_ROOT)/fitz/res_pixmap.c \
+        $(MY_ROOT)/fitz/res_shade.c \
+        $(MY_ROOT)/fitz/res_text.c \
+        $(MY_ROOT)/fitz/stm_buffer.c \
+        $(MY_ROOT)/fitz/stm_open.c \
+        $(MY_ROOT)/fitz/stm_read.c \
+        $(MY_ROOT)/draw/arch_arm.c \
+        $(MY_ROOT)/draw/arch_port.c \
+        $(MY_ROOT)/draw/draw_affine.c \
+        $(MY_ROOT)/draw/draw_blend.c \
+        $(MY_ROOT)/draw/draw_device.c \
+        $(MY_ROOT)/draw/draw_edge.c \
+        $(MY_ROOT)/draw/draw_glyph.c \
+        $(MY_ROOT)/draw/draw_mesh.c \
+        $(MY_ROOT)/draw/draw_paint.c \
+        $(MY_ROOT)/draw/draw_path.c \
+        $(MY_ROOT)/draw/draw_scale.c \
+        $(MY_ROOT)/draw/draw_unpack.c \
+        $(MY_ROOT)/pdf/pdf_annot.c \
+        $(MY_ROOT)/pdf/pdf_cmap.c \
+        $(MY_ROOT)/pdf/pdf_cmap_load.c \
+        $(MY_ROOT)/pdf/pdf_cmap_parse.c \
+        $(MY_ROOT)/pdf/pdf_cmap_table.c \
+        $(MY_ROOT)/pdf/pdf_colorspace.c \
+        $(MY_ROOT)/pdf/pdf_crypt.c \
+        $(MY_ROOT)/pdf/pdf_encoding.c \
+        $(MY_ROOT)/pdf/pdf_font.c \
+        $(MY_ROOT)/pdf/pdf_fontfile.c \
+        $(MY_ROOT)/pdf/pdf_function.c \
+        $(MY_ROOT)/pdf/pdf_image.c \
+        $(MY_ROOT)/pdf/pdf_interpret.c \
+        $(MY_ROOT)/pdf/pdf_lex.c \
+        $(MY_ROOT)/pdf/pdf_metrics.c \
+        $(MY_ROOT)/pdf/pdf_nametree.c \
+        $(MY_ROOT)/pdf/pdf_outline.c \
+        $(MY_ROOT)/pdf/pdf_page.c \
+        $(MY_ROOT)/pdf/pdf_parse.c \
+        $(MY_ROOT)/pdf/pdf_pattern.c \
+        $(MY_ROOT)/pdf/pdf_repair.c \
+        $(MY_ROOT)/pdf/pdf_shade.c \
+        $(MY_ROOT)/pdf/pdf_store.c \
+        $(MY_ROOT)/pdf/pdf_stream.c \
+        $(MY_ROOT)/pdf/pdf_type3.c \
+        $(MY_ROOT)/pdf/pdf_unicode.c \
+        $(MY_ROOT)/pdf/pdf_xobject.c \
+        $(MY_ROOT)/pdf/pdf_xref.c
+LOCAL_LDLIBS    := -lm -llog -ljnigraphics
+include $(BUILD_STATIC_LIBRARY)

 /contrib/media/updf/android/jni/ThirdParty.mk
 ,0 → 1,153
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+MY_ROOT := ../..
+LOCAL_C_INCLUDES := \
+        ../thirdparty/jbig2dec \
+        ../thirdparty/openjpeg-1.4/libopenjpeg \
+        ../thirdparty/jpeg-8c \
+        ../thirdparty/zlib-1.2.5 \
+        ../thirdparty/freetype-2.4.4/include \
+        ../scripts
+LOCAL_CFLAGS := \
+        -DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON -DHAVE_STDINT_H
+LOCAL_MODULE    := mupdfthirdparty
+LOCAL_SRC_FILES := \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_arith.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_arith_int.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_arith_iaid.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_huffman.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_segment.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_page.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_symbol_dict.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_text.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_generic.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_refinement.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_mmr.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_image.c \
+        $(MY_ROOT)/thirdparty/jbig2dec/jbig2_metadata.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/bio.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/cio.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/dwt.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/event.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/image.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/j2k.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/j2k_lib.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/jp2.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/jpt.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/mct.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/mqc.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/openjpeg.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/pi.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/raw.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/t1.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/t2.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/tcd.c \
+        $(MY_ROOT)/thirdparty/openjpeg-1.4/libopenjpeg/tgt.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jaricom.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcapimin.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcapistd.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcarith.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jccoefct.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jccolor.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcdctmgr.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jchuff.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcinit.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcmainct.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcmarker.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcmaster.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcomapi.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcparam.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcprepct.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jcsample.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jctrans.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdapimin.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdapistd.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdarith.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdatadst.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdatasrc.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdcoefct.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdcolor.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jddctmgr.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdhuff.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdinput.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdmainct.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdmarker.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdmaster.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdmerge.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdpostct.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdsample.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jdtrans.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jerror.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jfdctflt.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jfdctfst.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jfdctint.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jidctflt.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jidctfst.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jidctint.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jquant1.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jquant2.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jutils.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jmemmgr.c \
+        $(MY_ROOT)/thirdparty/jpeg-8c/jmemansi.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/adler32.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/compress.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/crc32.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/deflate.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/gzclose.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/gzlib.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/gzread.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/gzwrite.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/infback.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/inffast.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/inflate.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/inftrees.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/trees.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/uncompr.c \
+        $(MY_ROOT)/thirdparty/zlib-1.2.5/zutil.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/autofit/autofit.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftbase.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftbbox.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftbdf.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftbitmap.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftdebug.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftgasp.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftglyph.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftgxval.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftinit.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftlcdfil.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftmm.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftotval.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftpfr.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftstroke.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftsynth.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftsystem.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/fttype1.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftwinfnt.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftxf86.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/base/ftpatent.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/bdf/bdf.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/cache/ftcache.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/cff/cff.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/cid/type1cid.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/gzip/ftgzip.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/lzw/ftlzw.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/pcf/pcf.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/pfr/pfr.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/psaux/psaux.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/pshinter/pshinter.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/psnames/psnames.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/raster/raster.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/smooth/smooth.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/sfnt/sfnt.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/truetype/truetype.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/type1/type1.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/type42/type42.c \
+        $(MY_ROOT)/thirdparty/freetype-2.4.4/src/winfonts/winfnt.c
+include $(BUILD_STATIC_LIBRARY)

 /contrib/media/updf/android/jni/mupdf.c
 ,0 → 1,212
+#include <jni.h>
+#include <time.h>
+#include <android/log.h>
+#include <android/bitmap.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "fitz.h"
+#include "mupdf.h"
+#define LOG_TAG "libmupdf"
+#define LOGI(...) __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
+#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
+/* Set to 1 to enable debug log traces. */
+#define DEBUG 0
+/* Globals */
+fz_colorspace *colorspace;
+fz_glyph_cache *glyphcache;
+pdf_xref *xref;
+int pagenum = 1;
+int resolution = 160;
+float pageWidth = 100;
+float pageHeight = 100;
+fz_display_list *currentPageList;
+fz_rect currentMediabox;
+int currentRotate;
+JNIEXPORT int JNICALL
+Java_com_artifex_mupdf_MuPDFCore_openFile(JNIEnv * env, jobject thiz, jstring jfilename)
+{
+        const char *filename;
+        char *password = "";
+        int accelerate = 1;
+        fz_error error;
+        int pages;
+        filename = (*env)->GetStringUTFChars(env, jfilename, NULL);
+        if (filename == NULL)
+        {
+                LOGE("Failed to get filename");
+                return 0;
+        }
+        if (accelerate)
+                fz_accelerate();
+        glyphcache = fz_new_glyph_cache();
+        colorspace = fz_device_rgb;
+        LOGE("Opening document...");
+        error = pdf_open_xref(&xref, filename, password);
+        if (error)
+        {
+                LOGE("Cannot open document: '%s'\n", filename);
+                return 0;
+        }
+        LOGE("Loading page tree...");
+        error = pdf_load_page_tree(xref);
+        if (error)
+        {
+                LOGE("Cannot load page tree: '%s'\n", filename);
+                return 0;
+        }
+        pages = pdf_count_pages(xref);
+        LOGE("Done! %d pages", pages);
+        return pages;
+}
+JNIEXPORT void JNICALL
+Java_com_artifex_mupdf_MuPDFCore_gotoPageInternal(JNIEnv *env, jobject thiz, int page)
+{
+        float zoom;
+        fz_matrix ctm;
+        fz_bbox bbox;
+        fz_error error;
+        fz_device *dev;
+        pdf_page *currentPage;
+        /* In the event of an error, ensure we give a non-empty page */
+        pageWidth = 100;
+        pageHeight = 100;
+        LOGE("Goto page %d...", page);
+        if (currentPageList != NULL)
+        {
+                fz_free_display_list(currentPageList);
+                currentPageList = NULL;
+        }
+        pagenum = page;
+        error = pdf_load_page(&currentPage, xref, pagenum);
+        if (error)
+                return;
+        zoom = resolution / 72;
+        currentMediabox = currentPage->mediabox;
+        currentRotate = currentPage->rotate;
+        ctm = fz_translate(0, -currentMediabox.y1);
+        ctm = fz_concat(ctm, fz_scale(zoom, -zoom));
+        ctm = fz_concat(ctm, fz_rotate(currentRotate));
+        bbox = fz_round_rect(fz_transform_rect(ctm, currentMediabox));
+        pageWidth = bbox.x1-bbox.x0;
+        pageHeight = bbox.y1-bbox.y0;
+        /* Render to list */
+        currentPageList = fz_new_display_list();
+        dev = fz_new_list_device(currentPageList);
+        error = pdf_run_page(xref, currentPage, dev, fz_identity);
+        pdf_free_page(currentPage);
+        if (error)
+                LOGE("cannot make displaylist from page %d", pagenum);
+        fz_free_device(dev);
+}
+JNIEXPORT float JNICALL
+Java_com_artifex_mupdf_MuPDFCore_getPageWidth(JNIEnv *env, jobject thiz)
+{
+        LOGE("PageWidth=%g", pageWidth);
+        return pageWidth;
+}
+JNIEXPORT float JNICALL
+Java_com_artifex_mupdf_MuPDFCore_getPageHeight(JNIEnv *env, jobject thiz)
+{
+        LOGE("PageHeight=%g", pageHeight);
+        return pageHeight;
+}
+JNIEXPORT jboolean JNICALL
+Java_com_artifex_mupdf_MuPDFCore_drawPage(JNIEnv *env, jobject thiz, jobject bitmap,
+                int pageW, int pageH, int patchX, int patchY, int patchW, int patchH)
+{
+        AndroidBitmapInfo info;
+        void *pixels;
+        int ret;
+        fz_error error;
+        fz_device *dev;
+        float zoom;
+        fz_matrix ctm;
+        fz_bbox bbox;
+        fz_pixmap *pix;
+        float xscale, yscale;
+        fz_bbox rect;
+        LOGI("In native method\n");
+        if ((ret = AndroidBitmap_getInfo(env, bitmap, &info)) < 0) {
+                LOGE("AndroidBitmap_getInfo() failed ! error=%d", ret);
+                return 0;
+        }
+        LOGI("Checking format\n");
+        if (info.format != ANDROID_BITMAP_FORMAT_RGBA_8888) {
+                LOGE("Bitmap format is not RGBA_8888 !");
+                return 0;
+        }
+        LOGI("locking pixels\n");
+        if ((ret = AndroidBitmap_lockPixels(env, bitmap, &pixels)) < 0) {
+                LOGE("AndroidBitmap_lockPixels() failed ! error=%d", ret);
+                return 0;
+        }
+        /* Call mupdf to render display list to screen */
+        LOGE("Rendering page=%dx%d patch=[%d,%d,%d,%d]",
+                        pageW, pageH, patchX, patchY, patchW, patchH);
+        rect.x0 = patchX;
+        rect.y0 = patchY;
+        rect.x1 = patchX + patchW;
+        rect.y1 = patchY + patchH;
+        pix = fz_new_pixmap_with_rect_and_data(colorspace, rect, pixels);
+        if (currentPageList == NULL)
+        {
+                fz_clear_pixmap_with_color(pix, 0xd0);
+                return 0;
+        }
+        fz_clear_pixmap_with_color(pix, 0xff);
+        zoom = resolution / 72;
+        ctm = fz_translate(-currentMediabox.x0, -currentMediabox.y1);
+        ctm = fz_concat(ctm, fz_scale(zoom, -zoom));
+        ctm = fz_concat(ctm, fz_rotate(currentRotate));
+        bbox = fz_round_rect(fz_transform_rect(ctm,currentMediabox));
+        /* Now, adjust ctm so that it would give the correct page width
+         * heights. */
+        xscale = (float)pageW/(float)(bbox.x1-bbox.x0);
+        yscale = (float)pageH/(float)(bbox.y1-bbox.y0);
+        ctm = fz_concat(ctm, fz_scale(xscale, yscale));
+        bbox = fz_round_rect(fz_transform_rect(ctm,currentMediabox));
+        dev = fz_new_draw_device(glyphcache, pix);
+        fz_execute_display_list(currentPageList, dev, ctm, bbox);
+        fz_free_device(dev);
+        fz_drop_pixmap(pix);
+        LOGE("Rendered");
+        AndroidBitmap_unlockPixels(env, bitmap);
+        return 1;
+}
+JNIEXPORT void JNICALL
+Java_com_artifex_mupdf_MuPDFCore_destroying(JNIEnv * env, jobject thiz)
+{
+        fz_free_display_list(currentPageList);
+        currentPageList = NULL;
+        pdf_free_xref(xref);
+        xref = NULL;
+        fz_free_glyph_cache(glyphcache);
+        glyphcache = NULL;
+}

/contrib/media/updf/android/res/drawable-hdpi/icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/contrib/media/updf/android/res/drawable-ldpi/icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/contrib/media/updf/android/res/drawable-mdpi/icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /contrib/media/updf/android/res/layout/main.xml
 ,0 → 1,8
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+</LinearLayout>

/contrib/media/updf/android/res/values/strings.xml
0,0 → 1,4
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">MuPDF</string>
</resources>

/contrib/media/updf/android/res/values/theme.xml
0,0 → 1,7
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.NoBackground.NoTitle" parent="android:Theme">
<item name="android:windowBackground">@null</item>
<item name="android:windowNoTitle">true</item>
</style>
</resources>

 /contrib/media/updf/android/src/com/artifex/mupdf/MuPDFActivity.java
 ,0 → 1,162
+package com.artifex.mupdf;
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.*;
+import android.view.View.OnClickListener;
+import android.widget.*;
+import android.widget.LinearLayout.*;
+import java.io.File;
+import com.artifex.mupdf.PixmapView;
+public class MuPDFActivity extends Activity
+{
+        /* The core rendering instance */
+        private MuPDFCore core;
+        private MuPDFCore openFile()
+        {
+                String storageState = Environment.getExternalStorageState();
+                File path, file;
+                MuPDFCore core;
+                if (Environment.MEDIA_MOUNTED.equals(storageState))
+                {
+                        System.out.println("Media mounted read/write");
+                }
+                else if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(storageState))
+                {
+                        System.out.println("Media mounted read only");
+                }
+                else
+                {
+                        System.out.println("No media at all! Bale!\n");
+                        return null;
+                }
+                path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+                file = new File(path, "test.pdf");
+                System.out.println("Trying to open "+file.toString());
+                try
+                {
+                        core = new MuPDFCore(file.toString());
+                }
+                catch (Exception e)
+                {
+                        System.out.println(e);
+                        return null;
+                }
+                return core;
+        }
+        /** Called when the activity is first created. */
+        @Override
+        public void onCreate(Bundle savedInstanceState)
+        {
+                PixmapView pixmapView;
+                if (core == null) {
+                        core = (MuPDFCore)getLastNonConfigurationInstance();
+                }
+                if (core == null) {
+                        core = openFile();
+                }
+                if (core == null)
+                {
+                        /* FIXME: Error handling here! */
+                        return;
+                }
+                pixmapView = new PixmapView(this, core);
+                super.onCreate(savedInstanceState);
+                /* Now create the UI */
+                RelativeLayout layout;
+                LinearLayout bar;
+                MyButtonHandler bh = new MyButtonHandler(pixmapView);
+                bar = new LinearLayout(this);
+                bar.setOrientation(LinearLayout.HORIZONTAL);
+                bh.buttonStart = new Button(this);
+                bh.buttonStart.setText("<<");
+                bh.buttonStart.setOnClickListener(bh);
+                bar.addView(bh.buttonStart);
+                bh.buttonPrev = new Button(this);
+                bh.buttonPrev.setText("<");
+                bh.buttonPrev.setOnClickListener(bh);
+                bar.addView(bh.buttonPrev);
+                bh.buttonNext = new Button(this);
+                bh.buttonNext.setText(">");
+                bh.buttonNext.setOnClickListener(bh);
+                bar.addView(bh.buttonNext);
+                bh.buttonEnd = new Button(this);
+                bh.buttonEnd.setText(">>");
+                bh.buttonEnd.setOnClickListener(bh);
+                bar.addView(bh.buttonEnd);
+                layout = new RelativeLayout(this);
+                layout.setLayoutParams(new RelativeLayout.LayoutParams(
+                                        RelativeLayout.LayoutParams.FILL_PARENT,
+                                        RelativeLayout.LayoutParams.FILL_PARENT));
+                layout.setGravity(Gravity.FILL);
+                RelativeLayout.LayoutParams barParams =
+                        new RelativeLayout.LayoutParams(
+                                        RelativeLayout.LayoutParams.FILL_PARENT,
+                                        RelativeLayout.LayoutParams.WRAP_CONTENT);
+                barParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+                bar.setId(100);
+                layout.addView(bar, barParams);
+                RelativeLayout.LayoutParams pixmapParams =
+                        new RelativeLayout.LayoutParams(
+                                        RelativeLayout.LayoutParams.FILL_PARENT,
+                                        RelativeLayout.LayoutParams.FILL_PARENT);
+                pixmapParams.addRule(RelativeLayout.ABOVE,100);
+                layout.addView(pixmapView, pixmapParams);
+                setContentView(layout);
+        }
+        public Object onRetainNonConfigurationInstance()
+        {
+                MuPDFCore mycore = core;
+                core = null;
+                return mycore;
+        }
+        public void onDestroy()
+        {
+                if (core != null)
+                        core.onDestroy();
+                core = null;
+                super.onDestroy();
+        }
+        private class MyButtonHandler implements OnClickListener
+        {
+                Button buttonStart;
+                Button buttonPrev;
+                Button buttonNext;
+                Button buttonEnd;
+                PixmapView pixmapView;
+                public MyButtonHandler(PixmapView pixmapView)
+                {
+                        this.pixmapView = pixmapView;
+                }
+                public void onClick(View v)
+                {
+                        if (v == buttonStart)
+                                pixmapView.changePage(Integer.MIN_VALUE);
+                        else if (v == buttonPrev)
+                                pixmapView.changePage(-1);
+                        else if (v == buttonNext)
+                                pixmapView.changePage(+1);
+                        else if (v == buttonEnd)
+                                pixmapView.changePage(Integer.MAX_VALUE);
+                }
+        }
+}

 /contrib/media/updf/android/src/com/artifex/mupdf/MuPDFCore.java
 ,0 → 1,54
+package com.artifex.mupdf;
+import android.graphics.*;
+public class MuPDFCore
+{
+        /* load our native library */
+        static {
+                System.loadLibrary("mupdf");
+        }
+        /* Readable members */
+        public int pageNum;
+        public int numPages;
+        public float pageWidth;
+        public float pageHeight;
+        /* The native functions */
+        private static native int openFile(String filename);
+        private static native void gotoPageInternal(int localActionPageNum);
+        private static native float getPageWidth();
+        private static native float getPageHeight();
+        public static native void drawPage(Bitmap bitmap,
+                        int pageW, int pageH,
+                        int patchX, int patchY,
+                        int patchW, int patchH);
+        public static native void destroying();
+        public MuPDFCore(String filename) throws Exception
+        {
+                numPages = openFile(filename);
+                if (numPages <= 0)
+                {
+                        throw new Exception("Failed to open "+filename);
+                }
+                pageNum = 0;
+        }
+        /* Shim function */
+        public void gotoPage(int page)
+        {
+                if (page > numPages-1)
+                        page = numPages-1;
+                else if (page < 0)
+                        page = 0;
+                gotoPageInternal(page);
+                this.pageNum = page;
+                this.pageWidth = getPageWidth();
+                this.pageHeight = getPageHeight();
+        }
+        public void onDestroy() {
+                destroying();
+        }
+}

 /contrib/media/updf/android/src/com/artifex/mupdf/PixmapView.java
 ,0 → 1,579
+package com.artifex.mupdf;
+import android.app.*;
+import android.os.*;
+import android.content.*;
+import android.content.res.*;
+import android.graphics.*;
+import android.util.*;
+import android.view.*;
+import android.widget.*;
+import java.net.*;
+import java.io.*;
+public class PixmapView extends SurfaceView implements SurfaceHolder.Callback
+{
+        private SurfaceHolder holder;
+        private MuPDFThread thread = null;
+        private boolean threadStarted = false;
+        private MuPDFCore core;
+        /* Constructor */
+        public PixmapView(Context context, MuPDFCore core)
+        {
+                super(context);
+                System.out.println("PixmapView construct");
+                this.core = core;
+                holder = getHolder();
+                holder.addCallback(this);
+                thread = new MuPDFThread(holder, core);
+                setFocusable(true); // need to get the key events
+        }
+        /* load our native library */
+        static {
+                System.loadLibrary("mupdf");
+        }
+        /* Handlers for keys - so we can actually do stuff */
+        @Override
+        public boolean onKeyDown(int keyCode, KeyEvent event)
+        {
+                if (thread.onKeyDown(keyCode, event))
+                        return true;
+                return super.onKeyDown(keyCode, event);
+        }
+        @Override
+        public boolean onKeyUp(int keyCode, KeyEvent event)
+        {
+                if (thread.onKeyUp(keyCode, event))
+                        return true;
+                return super.onKeyUp(keyCode, event);
+        }
+        @Override
+        public boolean onTouchEvent(MotionEvent event)
+        {
+                if (thread.onTouchEvent(event))
+                        return true;
+                return super.onTouchEvent(event);
+        }
+        public void changePage(int delta)
+        {
+                thread.changePage(delta);
+        }
+        /* Handlers for SurfaceHolder callbacks; these are called when the
+         * surface is created/destroyed/changed. We need to ensure that we only
+         * draw into the surface between the created and destroyed calls.
+         * Therefore, we start/stop the thread that actually runs MuPDF on
+         * creation/destruction. */
+        public void surfaceCreated(SurfaceHolder holder)
+        {
+        }
+        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height)
+        {
+                thread.newScreenSize(width, height);
+                if (!threadStarted)
+                {
+                        threadStarted = true;
+                        thread.setRunning(true);
+                        thread.start();
+                }
+        }
+        public void surfaceDestroyed(SurfaceHolder holder)
+        {
+                boolean retry = true;
+                System.out.println("Surface destroyed 1 this="+this);
+                thread.setRunning(false);
+                System.out.println("Surface destroyed 2");
+                while (retry)
+                {
+                        try
+                        {
+                                thread.join();
+                                retry = false;
+                        }
+                        catch (InterruptedException e)
+                        {
+                        }
+                }
+                threadStarted = false;
+                System.out.println("Surface destroyed 3");
+        }
+        class MuPDFThread extends Thread
+        {
+                private SurfaceHolder holder;
+                private boolean running = false;
+                private int keycode = -1;
+                private int screenWidth;
+                private int screenHeight;
+                private int screenGeneration;
+                private Bitmap bitmap;
+                private MuPDFCore core;
+                /* The following variables deal with the size of the current page;
+                 * specifically, its position on the screen, its raw size, its
+                 * current scale, and its current scaled size (in terms of whole
+                 * pixels).
+                 */
+                private int pageOriginX;
+                private int pageOriginY;
+                private float pageScale;
+                private int pageWidth;
+                private int pageHeight;
+                /* The following variables deal with the multitouch handling */
+                private final int NONE = 0;
+                private final int DRAG = 1;
+                private final int ZOOM = 2;
+                private int touchMode = NONE;
+                private float touchInitialSpacing;
+                private float touchDragStartX;
+                private float touchDragStartY;
+                private float touchInitialOriginX;
+                private float touchInitialOriginY;
+                private float touchInitialScale;
+                private PointF touchZoomMidpoint;
+                /* The following control the inner loop; other events etc cause
+                 * action to be set. The inner loop runs around a tight loop
+                 * performing the action requested of it.
+                 */
+                private boolean wakeMe = false;
+                private int action;
+                private final int SLEEP = 0;
+                private final int REDRAW = 1;
+                private final int DIE = 2;
+                private final int GOTOPAGE = 3;
+                private int actionPageNum;
+                /* Members for blitting, declared here to avoid causing gcs */
+                private Rect srcRect;
+                private RectF dstRect;
+                public MuPDFThread(SurfaceHolder holder, MuPDFCore core)
+                {
+                        this.holder = holder;
+                        this.core = core;
+                        touchZoomMidpoint = new PointF(0,0);
+                        srcRect = new Rect(0,0,0,0);
+                        dstRect = new RectF(0,0,0,0);
+                }
+                public void setRunning(boolean running)
+                {
+                        this.running = running;
+                        if (!running)
+                        {
+                                System.out.println("killing 1");
+                                synchronized(this)
+                                {
+                                        System.out.println("killing 2");
+                                        action = DIE;
+                                        if (wakeMe)
+                                        {
+                                                wakeMe = false;
+                                                System.out.println("killing 3");
+                                                this.notify();
+                                                System.out.println("killing 4");
+                                        }
+                                }
+                        }
+                }
+                public void newScreenSize(int width, int height)
+                {
+                        this.screenWidth = width;
+                        this.screenHeight = height;
+                        this.screenGeneration++;
+                }
+                public boolean onKeyDown(int keyCode, KeyEvent msg)
+                {
+                        keycode = keyCode;
+                        return false;
+                }
+                public boolean onKeyUp(int keyCode, KeyEvent msg)
+                {
+                        return false;
+                }
+                public synchronized void changePage(int delta)
+                {
+                        action = GOTOPAGE;
+                        if (delta == Integer.MIN_VALUE)
+                                actionPageNum = 0;
+                        else if (delta == Integer.MAX_VALUE)
+                                actionPageNum = core.numPages-1;
+                        else
+                        {
+                                actionPageNum += delta;
+                                if (actionPageNum < 0)
+                                        actionPageNum = 0;
+                                if (actionPageNum > core.numPages-1)
+                                        actionPageNum = core.numPages-1;
+                        }
+                        if (wakeMe)
+                        {
+                                wakeMe = false;
+                                this.notify();
+                        }
+                }
+                private float spacing(MotionEvent event)
+                {
+                        float x = event.getX(0) - event.getX(1);
+                        float y = event.getY(0) - event.getY(1);
+                        return FloatMath.sqrt(x*x+y*y);
+                }
+                private void midpoint(PointF point, MotionEvent event)
+                {
+                        float x = event.getX(0) + event.getX(1);
+                        float y = event.getY(0) + event.getY(1);
+                        point.set(x/2, y/2);
+                }
+                private synchronized void forceRedraw()
+                {
+                        if (wakeMe)
+                        {
+                                wakeMe = false;
+                                this.notify();
+                        }
+                        action = REDRAW;
+                }
+                public synchronized void setPageOriginTo(int x, int y)
+                {
+                        /* Adjust the coordinates so that the page always covers the
+                         * centre of the screen. */
+                        if (x + pageWidth < screenWidth/2)
+                        {
+                                x = screenWidth/2 - pageWidth;
+                        }
+                        else if (x > screenWidth/2)
+                        {
+                                x = screenWidth/2;
+                        }
+                        if (y + pageHeight < screenHeight/2)
+                        {
+                                y = screenHeight/2 - pageHeight;
+                        }
+                        else if (y > screenHeight/2)
+                        {
+                                y = screenHeight/2;
+                        }
+                        if ((x != pageOriginX) || (y != pageOriginY))
+                        {
+                                pageOriginX = x;
+                                pageOriginY = y;
+                        }
+                        forceRedraw();
+                }
+                public void setPageScaleTo(float scale, PointF midpoint)
+                {
+                        float x, y;
+                        /* Convert midpoint (in screen coords) to page coords */
+                        x = (midpoint.x - pageOriginX)/pageScale;
+                        y = (midpoint.y - pageOriginY)/pageScale;
+                        /* Find new scaled page sizes */
+                        synchronized(this)
+                        {
+                                pageWidth = (int)(core.pageWidth*scale+0.5);
+                                if (pageWidth < screenWidth/2)
+                                {
+                                        scale = screenWidth/2/core.pageWidth;
+                                        pageWidth = (int)(core.pageWidth*scale+0.5);
+                                }
+                                pageHeight = (int)(core.pageHeight*scale+0.5);
+                                if (pageHeight < screenHeight/2)
+                                {
+                                        scale = screenHeight/2/core.pageHeight;
+                                        pageWidth = (int)(core.pageWidth *scale+0.5);
+                                        pageHeight = (int)(core.pageHeight*scale+0.5);
+                                }
+                                pageScale = scale;
+                                /* Now given this new scale, calculate page origins so that
+                                 * x and y are at midpoint */
+                                float xscale = (float)pageWidth /core.pageWidth;
+                                float yscale = (float)pageHeight/core.pageHeight;
+                                setPageOriginTo((int)(midpoint.x - x*xscale + 0.5),
+                                                (int)(midpoint.y - y*yscale + 0.5));
+                        }
+                }
+                public void scalePageToScreen()
+                {
+                        float scaleX, scaleY;
+                        scaleX = (float)screenWidth /core.pageWidth;
+                        scaleY = (float)screenHeight/core.pageHeight;
+                        synchronized(this)
+                        {
+                                if (scaleX < scaleY)
+                                        pageScale = scaleX;
+                                else
+                                        pageScale = scaleY;
+                                pageWidth = (int)(core.pageWidth * pageScale + 0.5);
+                                pageHeight = (int)(core.pageHeight * pageScale + 0.5);
+                                pageOriginX = (screenWidth - pageWidth)/2;
+                                pageOriginY = (screenHeight - pageHeight)/2;
+                                forceRedraw();
+                        }
+                        System.out.println("scalePageToScreen: Raw="+
+                                        core.pageWidth+"x"+core.pageHeight+" scaled="+
+                                        pageWidth+","+pageHeight+" pageScale="+
+                                        pageScale);
+                }
+                public boolean onTouchEvent(MotionEvent event)
+                {
+                        int action = event.getAction();
+                        boolean done = false;
+                        switch (action & MotionEvent.ACTION_MASK)
+                        {
+                                case MotionEvent.ACTION_DOWN:
+                                        touchMode = DRAG;
+                                        touchDragStartX = event.getX();
+                                        touchDragStartY = event.getY();
+                                        touchInitialOriginX = pageOriginX;
+                                        touchInitialOriginY = pageOriginY;
+                                        System.out.println("Starting dragging from: "+touchDragStartX+","+touchDragStartY+" ("+pageOriginX+","+pageOriginY+")");
+                                        done = true;
+                                        break;
+                                case MotionEvent.ACTION_POINTER_DOWN:
+                                        touchInitialSpacing = spacing(event);
+                                        if (touchInitialSpacing > 10f)
+                                        {
+                                                System.out.println("Started zooming: spacing="+touchInitialSpacing);
+                                                touchInitialScale = pageScale;
+                                                touchMode = ZOOM;
+                                                done = true;
+                                        }
+                                        break;
+                                case MotionEvent.ACTION_UP:
+                                case MotionEvent.ACTION_POINTER_UP:
+                                        if (touchMode != NONE)
+                                        {
+                                                System.out.println("Released!");
+                                                touchMode = NONE;
+                                                done = true;
+                                        }
+                                        break;
+                                case MotionEvent.ACTION_MOVE:
+                                        if (touchMode == DRAG)
+                                        {
+                                                float x = touchInitialOriginX+event.getX()-touchDragStartX;
+                                                float y = touchInitialOriginY+event.getY()-touchDragStartY;
+                                                System.out.println("Dragged to "+x+","+y);
+                                                setPageOriginTo((int)(x+0.5),(int)(y+0.5));
+                                                done = true;
+                                        }
+                                        else if (touchMode == ZOOM)
+                                        {
+                                                float newSpacing = spacing(event);
+                                                if (newSpacing > 10f)
+                                                {
+                                                        float newScale = touchInitialScale*newSpacing/touchInitialSpacing;
+                                                        System.out.println("Zoomed to "+newSpacing);
+                                                        midpoint(touchZoomMidpoint,event);
+                                                        setPageScaleTo(newScale,touchZoomMidpoint);
+                                                        done = true;
+                                                }
+                                        }
+                        }
+                        return done;
+                }
+                public void run()
+                {
+                        boolean redraw = false;
+                        int patchW = 0;
+                        int patchH = 0;
+                        int patchX = 0;
+                        int patchY = 0;
+                        int localPageW = 0;
+                        int localPageH = 0;
+                        int localScreenGeneration = screenGeneration;
+                        int localAction;
+                        int localActionPageNum = core.pageNum;
+                        /* Set up our default action */
+                        action = GOTOPAGE;
+                        actionPageNum = core.pageNum;
+                        while (action != DIE)
+                        {
+                                synchronized(this)
+                                {
+                                        while (action == SLEEP)
+                                        {
+                                                wakeMe = true;
+                                                try
+                                                {
+                                                        System.out.println("Render thread sleeping");
+                                                        this.wait();
+                                                        System.out.println("Render thread woken");
+                                                }
+                                                catch (java.lang.InterruptedException e)
+                                                {
+                                                        System.out.println("Render thread exception:"+e);
+                                                }
+                                        }
+                                        /* Now we do as little as we can get away with while
+                                         * synchronised. In general this means copying any action
+                                         * or global variables into local ones so that when we
+                                         * unsynchronoise, other people can alter them again.
+                                         */
+                                        switch (action)
+                                        {
+                                                case DIE:
+                                                        System.out.println("Woken to die!");
+                                                        break;
+                                                case GOTOPAGE:
+                                                        localActionPageNum = actionPageNum;
+                                                        break;
+                                                case REDRAW:
+                                                        /* Figure out what area of the page we want to
+                                                         * redraw (in local variables, in docspace).
+                                                         * We'll always draw a screensized lump, unless
+                                                         * that's too big. */
+                                                        System.out.println("page="+pageWidth+","+pageHeight+" ("+core.pageWidth+","+core.pageHeight+"@"+pageScale+") @ "+pageOriginX+","+pageOriginY);
+                                                        localPageW = pageWidth;
+                                                        localPageH = pageHeight;
+                                                        patchW = pageWidth;
+                                                        patchH = pageHeight;
+                                                        patchX = -pageOriginX;
+                                                        patchY = -pageOriginY;
+                                                        if (patchX < 0)
+                                                                patchX = 0;
+                                                        if (patchW > screenWidth)
+                                                                patchW = screenWidth;
+                                                        srcRect.left = 0;
+                                                        if (patchX+patchW > pageWidth)
+                                                        {
+                                                                srcRect.left += patchX+patchW-pageWidth;
+                                                                patchX = pageWidth-patchW;
+                                                        }
+                                                        if (patchY < 0)
+                                                                patchY = 0;
+                                                        if (patchH > screenHeight)
+                                                                patchH = screenHeight;
+                                                        srcRect.top = 0;
+                                                        if (patchY+patchH > pageHeight)
+                                                        {
+                                                                srcRect.top += patchY+patchH-pageHeight;
+                                                                patchY = pageHeight-patchH;
+                                                        }
+                                                        dstRect.left = pageOriginX;
+                                                        if (dstRect.left < 0)
+                                                                dstRect.left = 0;
+                                                        dstRect.top = pageOriginY;
+                                                        if (dstRect.top < 0)
+                                                                dstRect.top = 0;
+                                                        dstRect.right = dstRect.left + patchW;
+                                                        srcRect.right = srcRect.left + patchW;
+                                                        if (srcRect.right > screenWidth)
+                                                        {
+                                                                dstRect.right -= srcRect.right-screenWidth;
+                                                                srcRect.right = screenWidth;
+                                                        }
+                                                        if (dstRect.right > screenWidth)
+                                                        {
+                                                                srcRect.right -= dstRect.right-screenWidth;
+                                                                dstRect.right = screenWidth;
+                                                        }
+                                                        dstRect.bottom = dstRect.top + patchH;
+                                                        srcRect.bottom = srcRect.top + patchH;
+                                                        if (srcRect.bottom > screenHeight)
+                                                        {
+                                                                dstRect.bottom -=srcRect.bottom-screenHeight;
+                                                                srcRect.bottom = screenHeight;
+                                                        }
+                                                        if (dstRect.bottom > screenHeight)
+                                                        {
+                                                                srcRect.bottom -=dstRect.bottom-screenHeight;
+                                                                dstRect.bottom = screenHeight;
+                                                        }
+                                                        System.out.println("patch=["+patchX+","+patchY+","+patchW+","+patchH+"]");
+                                                        break;
+                                        }
+                                        localAction = action;
+                                        if (action != DIE)
+                                                action = SLEEP;
+                                }
+                                /* In the redraw case:
+                                 * pW, pH, pX, pY, localPageW, localPageH are now all set
+                                 * in local variables, and we are safe from the global vars
+                                 * being altered in calls from other threads. This is all
+                                 * the information we need to actually do our render.
+                                 */
+                                switch (localAction)
+                                {
+                                        case GOTOPAGE:
+                                                core.gotoPage(localActionPageNum);
+                                                scalePageToScreen();
+                                                action = REDRAW;
+                                                break;
+                                        case REDRAW:
+                                                if ((bitmap == null) ||
+                                                        (bitmap.getWidth() != patchW) ||
+                                                        (bitmap.getHeight() != patchH))
+                                                {
+                                                        /* make bitmap of required size */
+                                                        bitmap = Bitmap.createBitmap(patchW, patchH, Bitmap.Config.ARGB_8888);
+                                                }
+                                                System.out.println("Calling redraw native method");
+                                                core.drawPage(bitmap, localPageW, localPageH, patchX, patchY, patchW, patchH);
+                                                System.out.println("Called native method");
+                                                {
+                                                        Canvas c = null;
+                                                        try
+                                                        {
+                                                                c = holder.lockCanvas(null);
+                                                                synchronized(holder)
+                                                                {
+                                                                        if (localScreenGeneration == screenGeneration)
+                                                                        {
+                                                                                doDraw(c);
+                                                                        }
+                                                                        else
+                                                                        {
+                                                                                /* Someone has changed the screen
+                                                                                 * under us! Better redraw again...
+                                                                                 */
+                                                                                action = REDRAW;
+                                                                        }
+                                                                }
+                                                        }
+                                                        finally
+                                                        {
+                                                                if (c != null)
+                                                                        holder.unlockCanvasAndPost(c);
+                                                        }
+                                                }
+                                }
+                        }
+                }
+                protected void doDraw(Canvas canvas)
+                {
+                        if ((canvas == null) || (bitmap == null))
+                                return;
+                        /* Clear the screen */
+                        canvas.drawRGB(128,128,128);
+                        /* Draw our bitmap on top */
+                        System.out.println("Blitting bitmap from "+srcRect.left+","+srcRect.top+","+srcRect.right+","+srcRect.bottom+" to "+dstRect.left+","+dstRect.top+","+dstRect.right+","+dstRect.bottom);
+                        canvas.drawBitmap(bitmap, srcRect, dstRect, (Paint)null);
+                }
+        }
+}

 /contrib/media/updf/debian/changelog
 ,0 → 1,14
+mupdf (0.8-1) unstable; urgency=low
+  * MuPDF version 0.8
+mupdf (0.7-1) unstable; urgency=low
+  * MuPDF version 0.7
+ -- Tor Andersson <tor@ghostscript.com>  Thu, 27 May 2010 17:11:13 +0100
+mupdf (0.6-1) unstable; urgency=low
+  * First release of MuPDF with debian package.
+ -- Tor Andersson <tor@ghostscript.com>  Thu, 27 May 2010 17:11:13 +0100

/contrib/media/updf/debian/compat
0,0 → 1,0
5

 /contrib/media/updf/debian/control
 ,0 → 1,39
+Source: mupdf
+Section: text
+Priority: optional
+Maintainer: Tor Andersson <tor@ghostscript.com>
+Build-Depends: debhelper (>= 5), make, pkg-config, gcc, coreutils, binutils, tar, libfreetype6-dev, libx11-dev, libxext-dev, libjbig2dec-dev, libopenjpeg-dev, libjpeg62-dev, zlib1g-dev
+Standards-Version: 3.7.2
+Package: libmupdf-dev
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Development files for the MuPDF viewer
+ MuPDF is a lightweight PDF viewer and toolkit written in portable C.
+ .
+ This package contains the static library and headers.
+Package: mupdf
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: A lightweight PDF viewer
+ MuPDF is a lightweight PDF viewer and toolkit written in portable C.
+ .
+ The renderer in MuPDF is tailored for high quality anti-aliased graphics.
+ It renders text with metrics and spacing accurate to within fractions of a
+ pixel for the highest fidelity in reproducing the look of a printed page
+ on screen.
+Package: mupdf-tools
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Commmand line tools for the MuPDF viewer
+ MuPDF is a lightweight PDF viewer and toolkit written in portable C.
+ .
+ This package contains command line tools using the MuPDF library:
+ .
+ pdfdraw to render pages to image files.
+ .
+ pdfshow to examine objects in a PDF file.
+ .
+ pdfclean to decompress and pretty print streams and objects in PDF files.

 /contrib/media/updf/debian/copyright
 ,0 → 1,63
+This package was debianized by Sebastian Rasmussen <sebras@hotmail.com> on
+Mon, 15 Mar 2010 01:12:20 +0100.
+It was downloaded from http://mupdf.com/repos/mupdf
+Upstream Author: Tor Andersson <tor@ghostscript.com>
+Copyright: MuPDF is Copyright 2006-2010 Artifex Software, Inc.
+License:
+MuPDF is free software: you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation, either version 3 of the License, or (at your option) any later
+version.
+MuPDF is Copyright 2006-2010 Artifex Software, Inc.
+For commercial licensing please contact sales@artifex.com.
+The character map and mapping for pdf resources are from Adobe and are
+covered by their own copyright and license:
+-----------------------------------------------------------
+Copyright 1990-20xx Adobe Systems Incorporated.
+All rights reserved.
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
+Redistributions of source code must retain the above
+copyright notice, this list of conditions and the following
+disclaimer.
+Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials
+provided with the distribution.
+Neither the name of Adobe Systems Incorporated nor the names
+of its contributors may be used to endorse or promote
+products derived from this software without specific prior
+written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------
+The Debian packaging is (C) 2010, Sebastian Rasmussen <sebras@hotmail.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

/contrib/media/updf/debian/libmupdf-dev.install
0,0 → 1,4
fitz/fitz.h usr/include
mupdf/mupdf.h usr/include
debian/mupdf.pc usr/lib/pkgconfig
debian/tmp/usr/lib/libmupdf.a

/contrib/media/updf/debian/mupdf-tools.docs
0,0 → 1,0
README

/contrib/media/updf/debian/mupdf-tools.install
0,0 → 1,3
debian/tmp/usr/bin/pdfclean
debian/tmp/usr/bin/pdfdraw
debian/tmp/usr/bin/pdfshow

/contrib/media/updf/debian/mupdf.applications
0,0 → 1,7
mupdf
command=mupdf
name=MuPDF
expect_uris=false
requires_terminal=false
mime_types=application/x-pdf
can_open_multiple_files=false

 /contrib/media/updf/debian/mupdf.desktop
 ,0 → 1,15
+[Desktop Entry]
+Encoding=UTF-8
+Name=MuPDF
+GenericName=PDF file viewer
+Comment=PDF file viewer
+Exec=mupdf %f
+TryExec=mupdf
+Icon=mupdf
+Terminal=false
+Type=Application
+MimeType=application/pdf;application/x-pdf;
+Categories=Viewer;Graphics;
+[Desktop Action View]
+Exec=mupdf %f

/contrib/media/updf/debian/mupdf.docs
0,0 → 1,0
README

/contrib/media/updf/debian/mupdf.install
0,0 → 1,5
debian/mupdf.xpm usr/share/pixmaps
debian/mupdf.png usr/share/pixmaps
debian/mupdf.desktop usr/share/applications
debian/mupdf.applications usr/share/application-registry
debian/tmp/usr/bin/mupdf

/contrib/media/updf/debian/mupdf.manpages
0,0 → 1,0
debian/mupdf.1

 /contrib/media/updf/debian/mupdf.menu
 ,0 → 1,8
+?package(mupdf):\
+        needs="x11" \
+        section="Applications/Viewers" \
+        command="/usr/bin/mupdf" \
+        title="MuPDF" \
+        hints="Documents" \
+        icon="/usr/share/pixmaps/mupdf.xpm" \
+        longtitle="MuPDF: A lightweight PDF viewer written in portable C"

/contrib/media/updf/debian/mupdf.mime
0,0 → 1,2
application/pdf; mupdf %s; test=test -n "$DISPLAY" ; nametemplate=%s.pdf; priority=5
application/x-pdf; mupdf %s; test=test -n "$DISPLAY" ; nametemplate=%s.pdf; priority=5

 /contrib/media/updf/debian/mupdf.pc
 ,0 → 1,12
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+Name: mupdf
+Description: Library for rendering PDF documents
+Requires.private: freetype2
+Version: 0.5.0
+Libs: -L${libdir} -lmupdf
+Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
+Cflags: -I${includedir}

/contrib/media/updf/debian/mupdf.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /contrib/media/updf/debian/mupdf.xpm
 ,0 → 1,39
+/* XPM */
+static char * mupdf_icon_bitmap_32_xpm[] = {
+"32 32 4 1",
+"       c None",
+".      c #FFFFFF",
+"+      c #000000",
+"@      c #2572AC",
+"                                ",
+"                    ......      ",
+"                  ..++++++..    ",
+"                 .++++++++++.   ",
+"                .++++@@@@++++.  ",
+"               .+++@@@@@@@@+++. ",
+"               .++@@@......@++. ",
+" .....        .+++@@@.....@@+++.",
+" .++++.       .++@@@.....@@@@++.",
+" .++++.       .++@@@.....@@@@++.",
+" .+++++.      .++@@......@@@@++.",
+" .+++++.      .++@@......@@@@++.",
+" .++++++.     .+++...@...@@@+++.",
+" .++++++.      .++...@...@@@++. ",
+" .+++++++.     .+++.@@...@@+++. ",
+" .+++++++.      .++++@...++++.  ",
+" .++++++++.     ..++++++++++.   ",
+" .++++++++.     .+..++++++..    ",
+" .++++.++++.   .+++.......      ",
+" .++++.++++.   .++++.++++.      ",
+" .++++..++++. .++++..+.++.      ",
+" .++++..++++. .++++.......      ",
+" .++++. .++++.++++. .+.++.      ",
+" .++++. .++++.++++. .+.++.      ",
+" .++++.  .+++++++.  .+.++.      ",
+" .++++.  .+++++++.  .+.++.      ",
+" .++++.   .+++++.   .+.++.      ",
+" .++++.   .+++++.   .+.++.      ",
+" .++++.    .+++.    .+.++.      ",
+" .++++.    .+++.    .++++.      ",
+" ......     ...     ......      ",
+"                                "};

 /contrib/media/updf/debian/rules
 ,0 → 1,49
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+build: build-stamp
+build-stamp:
+        dh_testdir
+        dh_testroot
+        $(MAKE) build=release prefix=$(CURDIR)/debian/tmp/usr install
+        touch $@
+clean:
+        dh_testdir
+        dh_testroot
+        rm -f build-stamp
+        -$(MAKE) clean
+        dh_clean
+# Build architecture-independent files here.
+binary-indep: build
+        dh_testdir
+        dh_testroot
+        dh_installdirs
+        dh_installdocs
+        dh_installchangelogs
+        dh_installmenu
+        dh_installmime
+        dh_installman
+        dh_compress
+# Build architecture-dependent files here.
+binary-arch: build
+        dh_testdir
+        dh_testroot
+        dh_installdirs -a
+        dh_install -a
+        dh_strip -a
+        dh_fixperms -a
+        dh_makeshlibs -a
+        dh_installdeb -a
+        dh_shlibdeps -a
+        dh_gencontrol -a
+        dh_md5sums -a
+        dh_builddeb -a
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
 Property changes:
 Added: svn:executable
 +*
 \ No newline at end of property

/contrib/media/updf/win32/README.txt
0,0 → 1,0
This MSVC project needs the thirdparty sources to be in place.

 /contrib/media/updf/win32/generate.bat
 ,0 → 1,35
+@echo off
+if not exist scripts/fontdump.c cd ..
+if not exist generated mkdir generated
+cl /nologo -Ifitz -Ipdf scripts/fontdump.c
+cl /nologo -Ifitz -Ipdf scripts/cmapdump.c
+if not exist fontdump.exe goto usage
+if not exist cmapdump.exe goto usage
+if not exist generated/font_base14.h fontdump.exe generated/font_base14.h fonts/Dingbats.cff fonts/NimbusMonL-Bold.cff fonts/NimbusMonL-BoldObli.cff fonts/NimbusMonL-Regu.cff fonts/NimbusMonL-ReguObli.cff fonts/NimbusRomNo9L-Medi.cff fonts/NimbusRomNo9L-MediItal.cff fonts/NimbusRomNo9L-Regu.cff fonts/NimbusRomNo9L-ReguItal.cff fonts/NimbusSanL-Bold.cff fonts/NimbusSanL-BoldItal.cff fonts/NimbusSanL-Regu.cff fonts/NimbusSanL-ReguItal.cff fonts/StandardSymL.cff
+if not exist generated/font_droid.h fontdump.exe generated/font_droid.h fonts/droid/DroidSans.ttf fonts/droid/DroidSansMono.ttf
+if not exist generated/font_cjk.h fontdump.exe generated/font_cjk.h fonts/droid/DroidSansFallback.ttf
+if not exist generated/cmap_cns.h cmapdump.exe generated/cmap_cns.h cmaps/cns/Adobe-CNS1-UCS2 cmaps/cns/Adobe-CNS1-0 cmaps/cns/Adobe-CNS1-1 cmaps/cns/Adobe-CNS1-2 cmaps/cns/Adobe-CNS1-3 cmaps/cns/Adobe-CNS1-4 cmaps/cns/Adobe-CNS1-5 cmaps/cns/Adobe-CNS1-6 cmaps/cns/B5-H cmaps/cns/B5-V cmaps/cns/B5pc-H cmaps/cns/B5pc-V cmaps/cns/CNS-EUC-H cmaps/cns/CNS-EUC-V cmaps/cns/CNS1-H cmaps/cns/CNS1-V cmaps/cns/CNS2-H cmaps/cns/CNS2-V cmaps/cns/ETen-B5-H cmaps/cns/ETen-B5-V cmaps/cns/ETenms-B5-H cmaps/cns/ETenms-B5-V cmaps/cns/ETHK-B5-H cmaps/cns/ETHK-B5-V cmaps/cns/HKdla-B5-H cmaps/cns/HKdla-B5-V cmaps/cns/HKdlb-B5-H cmaps/cns/HKdlb-B5-V cmaps/cns/HKgccs-B5-H cmaps/cns/HKgccs-B5-V cmaps/cns/HKm314-B5-H cmaps/cns/HKm314-B5-V cmaps/cns/HKm471-B5-H cmaps/cns/HKm471-B5-V cmaps/cns/HKscs-B5-H cmaps/cns/HKscs-B5-V cmaps/cns/UniCNS-UCS2-H cmaps/cns/UniCNS-UCS2-V cmaps/cns/UniCNS-UTF16-H cmaps/cns/UniCNS-UTF16-V
+if not exist generated/cmap_gb.h cmapdump.exe generated/cmap_gb.h cmaps/gb/Adobe-GB1-UCS2 cmaps/gb/Adobe-GB1-0 cmaps/gb/Adobe-GB1-1 cmaps/gb/Adobe-GB1-2 cmaps/gb/Adobe-GB1-3 cmaps/gb/Adobe-GB1-4 cmaps/gb/Adobe-GB1-5 cmaps/gb/GB-EUC-H cmaps/gb/GB-EUC-V cmaps/gb/GB-H cmaps/gb/GB-V cmaps/gb/GBK-EUC-H cmaps/gb/GBK-EUC-V cmaps/gb/GBK2K-H cmaps/gb/GBK2K-V cmaps/gb/GBKp-EUC-H cmaps/gb/GBKp-EUC-V cmaps/gb/GBpc-EUC-H cmaps/gb/GBpc-EUC-V cmaps/gb/GBT-EUC-H cmaps/gb/GBT-EUC-V cmaps/gb/GBT-H cmaps/gb/GBT-V cmaps/gb/GBTpc-EUC-H cmaps/gb/GBTpc-EUC-V cmaps/gb/UniGB-UCS2-H cmaps/gb/UniGB-UCS2-V cmaps/gb/UniGB-UTF16-H cmaps/gb/UniGB-UTF16-V
+if not exist generated/cmap_japan.h cmapdump.exe generated/cmap_japan.h cmaps/japan/Adobe-Japan1-UCS2 cmaps/japan/78-EUC-H cmaps/japan/78-EUC-V cmaps/japan/78-H cmaps/japan/78-RKSJ-H cmaps/japan/78-RKSJ-V cmaps/japan/78-V cmaps/japan/78ms-RKSJ-H cmaps/japan/78ms-RKSJ-V cmaps/japan/83pv-RKSJ-H cmaps/japan/90ms-RKSJ-H cmaps/japan/90ms-RKSJ-V cmaps/japan/90msp-RKSJ-H cmaps/japan/90msp-RKSJ-V cmaps/japan/90pv-RKSJ-H cmaps/japan/90pv-RKSJ-V cmaps/japan/Add-H cmaps/japan/Add-RKSJ-H cmaps/japan/Add-RKSJ-V cmaps/japan/Add-V cmaps/japan/Adobe-Japan1-0 cmaps/japan/Adobe-Japan1-1 cmaps/japan/Adobe-Japan1-2 cmaps/japan/Adobe-Japan1-3 cmaps/japan/Adobe-Japan1-4 cmaps/japan/Adobe-Japan1-5 cmaps/japan/Adobe-Japan1-6 cmaps/japan/EUC-H cmaps/japan/EUC-V cmaps/japan/Ext-H cmaps/japan/Ext-RKSJ-H cmaps/japan/Ext-RKSJ-V cmaps/japan/Ext-V cmaps/japan/H cmaps/japan/Hankaku cmaps/japan/Hiragana cmaps/japan/Katakana cmaps/japan/NWP-H cmaps/japan/NWP-V cmaps/japan/RKSJ-H cmaps/japan/RKSJ-V cmaps/japan/Roman cmaps/japan/UniJIS-UCS2-H cmaps/japan/UniJIS-UCS2-HW-H cmaps/japan/UniJIS-UCS2-HW-V cmaps/japan/UniJIS-UCS2-V cmaps/japan/UniJISPro-UCS2-HW-V cmaps/japan/UniJISPro-UCS2-V cmaps/japan/V cmaps/japan/WP-Symbol cmaps/japan/Adobe-Japan2-0 cmaps/japan/Hojo-EUC-H cmaps/japan/Hojo-EUC-V cmaps/japan/Hojo-H cmaps/japan/Hojo-V cmaps/japan/UniHojo-UCS2-H cmaps/japan/UniHojo-UCS2-V cmaps/japan/UniHojo-UTF16-H cmaps/japan/UniHojo-UTF16-V cmaps/japan/UniJIS-UTF16-H cmaps/japan/UniJIS-UTF16-V
+if not exist generated/cmap_korea.h cmapdump.exe generated/cmap_korea.h cmaps/korea/Adobe-Korea1-UCS2 cmaps/korea/Adobe-Korea1-0 cmaps/korea/Adobe-Korea1-1 cmaps/korea/Adobe-Korea1-2 cmaps/korea/KSC-EUC-H cmaps/korea/KSC-EUC-V cmaps/korea/KSC-H cmaps/korea/KSC-Johab-H cmaps/korea/KSC-Johab-V cmaps/korea/KSC-V cmaps/korea/KSCms-UHC-H cmaps/korea/KSCms-UHC-HW-H cmaps/korea/KSCms-UHC-HW-V cmaps/korea/KSCms-UHC-V cmaps/korea/KSCpc-EUC-H cmaps/korea/KSCpc-EUC-V cmaps/korea/UniKS-UCS2-H cmaps/korea/UniKS-UCS2-V cmaps/korea/UniKS-UTF16-H cmaps/korea/UniKS-UTF16-V
+del cmapdump.obj fontdump.obj cmapdump.exe fontdump.exe
+goto fin
+:usage
+echo ERROR: Run this script in the mupdf directory.
+echo ERROR: Run this script in a Visual Studio command prompt.
+pause
+:fin

 /contrib/media/updf/win32/libmupdf.vcproj
 ,0 → 1,541
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+        ProjectType="Visual C++"
+        Version="8.00"
+        Name="libmupdf"
+        ProjectGUID="{5F615F91-DFF8-4F05-BF48-6222B7D86519}"
+        RootNamespace="mupdf"
+        >
+        <Platforms>
+                <Platform
+                        Name="Win32"
+                />
+        </Platforms>
+        <ToolFiles>
+        </ToolFiles>
+        <Configurations>
+                <Configuration
+                        Name="Debug|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="4"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                                Description="Generate CMap and Font source files"
+                                CommandLine="generate.bat"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="0"
+                                AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+                                MinimalRebuild="true"
+                                BasicRuntimeChecks="3"
+                                RuntimeLibrary="1"
+                                WarningLevel="3"
+                                DebugInformationFormat="4"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLibrarianTool"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="4"
+                        CharacterSet="2"
+                        WholeProgramOptimization="1"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                                Description="Generate CMap and Font source files"
+                                CommandLine="generate.bat"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="2"
+                                EnableIntrinsicFunctions="true"
+                                AdditionalIncludeDirectories="..\scripts;..\fitz;..\pdf;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+                                RuntimeLibrary="0"
+                                EnableFunctionLevelLinking="true"
+                                WarningLevel="3"
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLibrarianTool"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+        </Configurations>
+        <References>
+        </References>
+        <Files>
+                <Filter
+                        Name="pdf"
+                        >
+                        <File
+                                RelativePath="..\pdf\data_encodings.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\data_glyphlist.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\mupdf.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_annot.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_cmap.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_cmap_load.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_cmap_parse.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_cmap_table.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_colorspace.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_crypt.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_encoding.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_font.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_fontfile.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_function.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_image.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_interpret.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_lex.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_metrics.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_nametree.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_outline.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_page.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_parse.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_pattern.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_repair.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_shade.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_store.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_stream.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_type3.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_unicode.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_xobject.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\pdf\pdf_xref.c"
+                                >
+                        </File>
+                </Filter>
+                <Filter
+                        Name="fitz"
+                        >
+                        <File
+                                RelativePath="..\fitz\base_error.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\base_geometry.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\base_getopt.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\base_hash.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\base_memory.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\base_object.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\base_string.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\base_time.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\crypt_aes.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\crypt_arc4.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\crypt_md5.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\crypt_sha2.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\dev_bbox.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\dev_list.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\dev_null.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\dev_text.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\dev_trace.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\filt_basic.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\filt_dctd.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\filt_faxd.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\filt_flate.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\filt_jbig2d.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\filt_jpxd.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\filt_lzwd.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\filt_predict.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\fitz.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\obj_print.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\res_bitmap.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\res_colorspace.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\res_font.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\res_halftone.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\res_path.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\res_pixmap.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\res_shade.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\res_text.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\stm_buffer.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\stm_open.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\fitz\stm_read.c"
+                                >
+                        </File>
+                </Filter>
+                <Filter
+                        Name="draw"
+                        >
+                        <File
+                                RelativePath="..\draw\arch_port.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\draw\draw_affine.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\draw\draw_blend.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\draw\draw_device.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\draw\draw_edge.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\draw\draw_glyph.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\draw\draw_mesh.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\draw\draw_paint.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\draw\draw_path.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\draw\draw_scale.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\draw\draw_unpack.c"
+                                >
+                        </File>
+                </Filter>
+                <Filter
+                        Name="xps"
+                        >
+                        <File
+                                RelativePath="..\xps\xps_common.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_doc.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_glyphs.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_gradient.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_image.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_jpeg.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_path.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_png.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_resource.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_tiff.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_tile.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_util.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_xml.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\xps\xps_zip.c"
+                                >
+                        </File>
+                </Filter>
+        </Files>
+        <Globals>
+        </Globals>
+</VisualStudioProject>

 /contrib/media/updf/win32/libthirdparty.vcproj
 ,0 → 1,547
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+        ProjectType="Visual C++"
+        Version="8.00"
+        Name="libthirdparty"
+        ProjectGUID="{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}"
+        RootNamespace="mupdf"
+        >
+        <Platforms>
+                <Platform
+                        Name="Win32"
+                />
+        </Platforms>
+        <ToolFiles>
+        </ToolFiles>
+        <Configurations>
+                <Configuration
+                        Name="Debug|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="4"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="0"
+                                AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;"
+                                MinimalRebuild="true"
+                                BasicRuntimeChecks="3"
+                                RuntimeLibrary="1"
+                                WarningLevel="3"
+                                DebugInformationFormat="4"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLibrarianTool"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="4"
+                        CharacterSet="2"
+                        WholeProgramOptimization="1"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="2"
+                                EnableIntrinsicFunctions="true"
+                                AdditionalIncludeDirectories="..\scripts;..\thirdparty\jbig2dec;..\thirdparty\jpeg-8c;..\thirdparty\openjpeg-1.4\libopenjpeg;..\thirdparty\zlib-1.2.5;..\thirdparty\freetype-2.4.4\include"
+                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;OPJ_STATIC;FT_CONFIG_MODULES_H=\&quot;slimftmodules.h\&quot;;FT_CONFIG_OPTIONS_H=\&quot;slimftoptions.h\&quot;"
+                                RuntimeLibrary="0"
+                                EnableFunctionLevelLinking="true"
+                                WarningLevel="3"
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLibrarianTool"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+        </Configurations>
+        <References>
+        </References>
+        <Files>
+                <Filter
+                        Name="libjpeg"
+                        >
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jaricom.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jcomapi.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdapimin.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdapistd.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdarith.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdatadst.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdatasrc.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdcoefct.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdcolor.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jddctmgr.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdhuff.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdinput.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdmainct.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdmarker.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdmaster.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdmerge.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdpostct.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdsample.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jdtrans.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jerror.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jfdctflt.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jfdctfst.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jfdctint.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jidctflt.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jidctfst.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jidctint.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jmemansi.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jmemmgr.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jquant1.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jquant2.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jpeg-8c\jutils.c"
+                                >
+                        </File>
+                </Filter>
+                <Filter
+                        Name="libjbig2dec"
+                        >
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_arith.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_arith_iaid.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_arith_int.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_generic.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_huffman.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_image.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_metadata.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_mmr.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_page.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_refinement.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_segment.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_symbol_dict.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\jbig2dec\jbig2_text.c"
+                                >
+                        </File>
+                </Filter>
+                <Filter
+                        Name="libz"
+                        >
+                        <File
+                                RelativePath="..\thirdparty\zlib-1.2.5\adler32.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\zlib-1.2.5\compress.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\zlib-1.2.5\crc32.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\zlib-1.2.5\deflate.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\zlib-1.2.5\inffast.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\zlib-1.2.5\inflate.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\zlib-1.2.5\inftrees.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\zlib-1.2.5\trees.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\zlib-1.2.5\uncompr.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\zlib-1.2.5\zutil.c"
+                                >
+                        </File>
+                </Filter>
+                <Filter
+                        Name="libopenjpeg"
+                        >
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\bio.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\cio.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\dwt.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\event.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\image.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\j2k.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\j2k_lib.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\jp2.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\jpt.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\mct.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\mqc.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\openjpeg.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\pi.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\raw.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\t1.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\t2.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\tcd.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\openjpeg-1.4\libopenjpeg\tgt.c"
+                                >
+                        </File>
+                </Filter>
+                <Filter
+                        Name="libfreetype"
+                        >
+                        <File
+                                RelativePath="..\thirdparty\freetype-2.4.4\src\cff\cff.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\freetype-2.4.4\src\psaux\psaux.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\freetype-2.4.4\src\pshinter\pshinter.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\freetype-2.4.4\src\psnames\psnames.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\freetype-2.4.4\src\raster\raster.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\freetype-2.4.4\src\sfnt\sfnt.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\freetype-2.4.4\src\smooth\smooth.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\freetype-2.4.4\src\truetype\truetype.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\freetype-2.4.4\src\type1\type1.c"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\thirdparty\freetype-2.4.4\src\cid\type1cid.c"
+                                >
+                        </File>
+                        <Filter
+                                Name="base"
+                                >
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftbase.c"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftbbox.c"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftbitmap.c"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftgasp.c"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftglyph.c"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftinit.c"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftstroke.c"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftsynth.c"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftsystem.c"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\fttype1.c"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\thirdparty\freetype-2.4.4\src\base\ftxf86.c"
+                                        >
+                                </File>
+                        </Filter>
+                </Filter>
+        </Files>
+        <Globals>
+        </Globals>
+</VisualStudioProject>

 /contrib/media/updf/win32/mupdf.sln
 ,0 → 1,86
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf", "mupdf.vcproj", "{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}"
+        ProjectSection(ProjectDependencies) = postProject
+                {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+                {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdparty.vcproj", "{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj", "{5F615F91-DFF8-4F05-BF48-6222B7D86519}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfdraw", "pdfdraw.vcproj", "{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}"
+        ProjectSection(ProjectDependencies) = postProject
+                {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+                {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfclean", "pdfclean.vcproj", "{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}"
+        ProjectSection(ProjectDependencies) = postProject
+                {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+                {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfshow", "pdfshow.vcproj", "{50644121-C85F-4EE9-9C54-F7D1BDFAE354}"
+        ProjectSection(ProjectDependencies) = postProject
+                {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+                {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfextract", "pdfextract.vcproj", "{BD4473E7-2DBE-4568-A0FC-38EED70182DC}"
+        ProjectSection(ProjectDependencies) = postProject
+                {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+                {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpsdraw", "xpsdraw.vcproj", "{E6A93617-41BD-45B2-BF61-4F7ED263CDF2}"
+        ProjectSection(ProjectDependencies) = postProject
+                {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+                {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+        EndProjectSection
+EndProject
+Global
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|Win32 = Debug|Win32
+                Release|Win32 = Release|Win32
+        EndGlobalSection
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Debug|Win32.ActiveCfg = Debug|Win32
+                {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Debug|Win32.Build.0 = Debug|Win32
+                {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Release|Win32.ActiveCfg = Release|Win32
+                {E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}.Release|Win32.Build.0 = Release|Win32
+                {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Debug|Win32.ActiveCfg = Debug|Win32
+                {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Debug|Win32.Build.0 = Debug|Win32
+                {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Release|Win32.ActiveCfg = Release|Win32
+                {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.Release|Win32.Build.0 = Release|Win32
+                {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Debug|Win32.ActiveCfg = Debug|Win32
+                {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Debug|Win32.Build.0 = Debug|Win32
+                {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.ActiveCfg = Release|Win32
+                {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.Build.0 = Release|Win32
+                {26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Debug|Win32.ActiveCfg = Debug|Win32
+                {26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Debug|Win32.Build.0 = Debug|Win32
+                {26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Release|Win32.ActiveCfg = Release|Win32
+                {26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Release|Win32.Build.0 = Release|Win32
+                {923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Debug|Win32.ActiveCfg = Debug|Win32
+                {923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Debug|Win32.Build.0 = Debug|Win32
+                {923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Release|Win32.ActiveCfg = Release|Win32
+                {923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Release|Win32.Build.0 = Release|Win32
+                {50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Debug|Win32.ActiveCfg = Debug|Win32
+                {50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Debug|Win32.Build.0 = Debug|Win32
+                {50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Release|Win32.ActiveCfg = Release|Win32
+                {50644121-C85F-4EE9-9C54-F7D1BDFAE354}.Release|Win32.Build.0 = Release|Win32
+                {BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Debug|Win32.ActiveCfg = Debug|Win32
+                {BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Debug|Win32.Build.0 = Debug|Win32
+                {BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Release|Win32.ActiveCfg = Release|Win32
+                {BD4473E7-2DBE-4568-A0FC-38EED70182DC}.Release|Win32.Build.0 = Release|Win32
+                {E6A93617-41BD-45B2-BF61-4F7ED263CDF2}.Debug|Win32.ActiveCfg = Debug|Win32
+                {E6A93617-41BD-45B2-BF61-4F7ED263CDF2}.Debug|Win32.Build.0 = Debug|Win32
+                {E6A93617-41BD-45B2-BF61-4F7ED263CDF2}.Release|Win32.ActiveCfg = Release|Win32
+                {E6A93617-41BD-45B2-BF61-4F7ED263CDF2}.Release|Win32.Build.0 = Release|Win32
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+EndGlobal

 /contrib/media/updf/win32/mupdf.vcproj
 ,0 → 1,177
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+        ProjectType="Visual C++"
+        Version="8.00"
+        Name="mupdf"
+        ProjectGUID="{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}"
+        RootNamespace="mupdf"
+        TargetFrameworkVersion="196613"
+        >
+        <Platforms>
+                <Platform
+                        Name="Win32"
+                />
+        </Platforms>
+        <ToolFiles>
+        </ToolFiles>
+        <Configurations>
+                <Configuration
+                        Name="Debug|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="0"
+                                AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps"
+                                PreprocessorDefinitions="FT2_BUILD_LIBRARY;OPJ_STATIC"
+                                MinimalRebuild="true"
+                                BasicRuntimeChecks="3"
+                                RuntimeLibrary="1"
+                                WarningLevel="3"
+                                DebugInformationFormat="4"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        WholeProgramOptimization="1"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="2"
+                                EnableIntrinsicFunctions="true"
+                                AdditionalIncludeDirectories="..\fitz;..\pdf;..\xps"
+                                RuntimeLibrary="0"
+                                EnableFunctionLevelLinking="true"
+                                WarningLevel="3"
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                OptimizeReferences="2"
+                                EnableCOMDATFolding="2"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+        </Configurations>
+        <References>
+        </References>
+        <Files>
+                <File
+                        RelativePath="..\apps\pdfapp.c"
+                        >
+                </File>
+                <File
+                        RelativePath="..\apps\win_main.c"
+                        >
+                </File>
+                <File
+                        RelativePath="..\apps\win_res.rc"
+                        >
+                </File>
+        </Files>
+        <Globals>
+        </Globals>
+</VisualStudioProject>

 /contrib/media/updf/win32/pdfclean.vcproj
 ,0 → 1,168
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+        ProjectType="Visual C++"
+        Version="8.00"
+        Name="pdfclean"
+        ProjectGUID="{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}"
+        RootNamespace="mupdf"
+        TargetFrameworkVersion="196613"
+        >
+        <Platforms>
+                <Platform
+                        Name="Win32"
+                />
+        </Platforms>
+        <ToolFiles>
+        </ToolFiles>
+        <Configurations>
+                <Configuration
+                        Name="Debug|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="0"
+                                AdditionalIncludeDirectories="..\fitz;..\pdf"
+                                MinimalRebuild="true"
+                                BasicRuntimeChecks="3"
+                                RuntimeLibrary="1"
+                                WarningLevel="3"
+                                DebugInformationFormat="4"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        WholeProgramOptimization="1"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="2"
+                                EnableIntrinsicFunctions="true"
+                                AdditionalIncludeDirectories="..\fitz;..\pdf"
+                                RuntimeLibrary="0"
+                                EnableFunctionLevelLinking="true"
+                                WarningLevel="3"
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                OptimizeReferences="2"
+                                EnableCOMDATFolding="2"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+        </Configurations>
+        <References>
+        </References>
+        <Files>
+                <File
+                        RelativePath="..\apps\pdfclean.c"
+                        >
+                </File>
+        </Files>
+        <Globals>
+        </Globals>
+</VisualStudioProject>

 /contrib/media/updf/win32/pdfdraw.vcproj
 ,0 → 1,168
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+        ProjectType="Visual C++"
+        Version="8.00"
+        Name="pdfdraw"
+        ProjectGUID="{26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}"
+        RootNamespace="mupdf"
+        TargetFrameworkVersion="196613"
+        >
+        <Platforms>
+                <Platform
+                        Name="Win32"
+                />
+        </Platforms>
+        <ToolFiles>
+        </ToolFiles>
+        <Configurations>
+                <Configuration
+                        Name="Debug|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="0"
+                                AdditionalIncludeDirectories="..\fitz;..\pdf"
+                                MinimalRebuild="true"
+                                BasicRuntimeChecks="3"
+                                RuntimeLibrary="1"
+                                WarningLevel="3"
+                                DebugInformationFormat="4"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        WholeProgramOptimization="1"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="2"
+                                EnableIntrinsicFunctions="true"
+                                AdditionalIncludeDirectories="..\fitz;..\pdf"
+                                RuntimeLibrary="0"
+                                EnableFunctionLevelLinking="true"
+                                WarningLevel="3"
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                OptimizeReferences="2"
+                                EnableCOMDATFolding="2"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+        </Configurations>
+        <References>
+        </References>
+        <Files>
+                <File
+                        RelativePath="..\apps\pdfdraw.c"
+                        >
+                </File>
+        </Files>
+        <Globals>
+        </Globals>
+</VisualStudioProject>

 /contrib/media/updf/win32/pdfextract.vcproj
 ,0 → 1,168
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+        ProjectType="Visual C++"
+        Version="8.00"
+        Name="pdfextract"
+        ProjectGUID="{BD4473E7-2DBE-4568-A0FC-38EED70182DC}"
+        RootNamespace="mupdf"
+        TargetFrameworkVersion="196613"
+        >
+        <Platforms>
+                <Platform
+                        Name="Win32"
+                />
+        </Platforms>
+        <ToolFiles>
+        </ToolFiles>
+        <Configurations>
+                <Configuration
+                        Name="Debug|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="0"
+                                AdditionalIncludeDirectories="..\fitz;..\pdf"
+                                MinimalRebuild="true"
+                                BasicRuntimeChecks="3"
+                                RuntimeLibrary="1"
+                                WarningLevel="3"
+                                DebugInformationFormat="4"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        WholeProgramOptimization="1"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="2"
+                                EnableIntrinsicFunctions="true"
+                                AdditionalIncludeDirectories="..\fitz;..\pdf"
+                                RuntimeLibrary="0"
+                                EnableFunctionLevelLinking="true"
+                                WarningLevel="3"
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                OptimizeReferences="2"
+                                EnableCOMDATFolding="2"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+        </Configurations>
+        <References>
+        </References>
+        <Files>
+                <File
+                        RelativePath="..\apps\pdfextract.c"
+                        >
+                </File>
+        </Files>
+        <Globals>
+        </Globals>
+</VisualStudioProject>

 /contrib/media/updf/win32/pdfshow.vcproj
 ,0 → 1,168
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+        ProjectType="Visual C++"
+        Version="8.00"
+        Name="pdfshow"
+        ProjectGUID="{50644121-C85F-4EE9-9C54-F7D1BDFAE354}"
+        RootNamespace="mupdf"
+        TargetFrameworkVersion="196613"
+        >
+        <Platforms>
+                <Platform
+                        Name="Win32"
+                />
+        </Platforms>
+        <ToolFiles>
+        </ToolFiles>
+        <Configurations>
+                <Configuration
+                        Name="Debug|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="0"
+                                AdditionalIncludeDirectories="..\fitz;..\pdf"
+                                MinimalRebuild="true"
+                                BasicRuntimeChecks="3"
+                                RuntimeLibrary="1"
+                                WarningLevel="3"
+                                DebugInformationFormat="4"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        WholeProgramOptimization="1"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="2"
+                                EnableIntrinsicFunctions="true"
+                                AdditionalIncludeDirectories="..\fitz;..\pdf"
+                                RuntimeLibrary="0"
+                                EnableFunctionLevelLinking="true"
+                                WarningLevel="3"
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                OptimizeReferences="2"
+                                EnableCOMDATFolding="2"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+        </Configurations>
+        <References>
+        </References>
+        <Files>
+                <File
+                        RelativePath="..\apps\pdfshow.c"
+                        >
+                </File>
+        </Files>
+        <Globals>
+        </Globals>
+</VisualStudioProject>

 /contrib/media/updf/win32/xpsdraw.vcproj
 ,0 → 1,171
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+        ProjectType="Visual C++"
+        Version="8.00"
+        Name="xpsdraw"
+        ProjectGUID="{E6A93617-41BD-45B2-BF61-4F7ED263CDF2}"
+        RootNamespace="mupdf"
+        >
+        <Platforms>
+                <Platform
+                        Name="Win32"
+                />
+        </Platforms>
+        <ToolFiles>
+        </ToolFiles>
+        <Configurations>
+                <Configuration
+                        Name="Debug|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="0"
+                                AdditionalIncludeDirectories="..\fitz;..\xps"
+                                MinimalRebuild="true"
+                                BasicRuntimeChecks="3"
+                                RuntimeLibrary="1"
+                                WarningLevel="3"
+                                DebugInformationFormat="4"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                RandomizedBaseAddress="1"
+                                DataExecutionPrevention="0"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+                        ConfigurationType="1"
+                        CharacterSet="2"
+                        WholeProgramOptimization="1"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="2"
+                                EnableIntrinsicFunctions="true"
+                                AdditionalIncludeDirectories="..\fitz;..\xps"
+                                RuntimeLibrary="0"
+                                EnableFunctionLevelLinking="true"
+                                WarningLevel="3"
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                GenerateDebugInformation="true"
+                                OptimizeReferences="2"
+                                EnableCOMDATFolding="2"
+                                RandomizedBaseAddress="1"
+                                DataExecutionPrevention="0"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+        </Configurations>
+        <References>
+        </References>
+        <Files>
+                <File
+                        RelativePath="..\apps\xpsdraw.c"
+                        >
+                </File>
+        </Files>
+        <Globals>
+        </Globals>
+</VisualStudioProject>

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4684 → Rev 4683

/contrib/media/updf/android/local.properties
0,0 → 1,2
#sdk.dir=/Library/android-sdk-mac_x86
sdk.dir=C:\\Program Files\\android-sdk-windows

/contrib/media/updf/debian/mupdf-tools.manpages
0,0 → 1,3
debian/pdfclean.1
debian/pdfdraw.1
debian/pdfshow.1