diff --git a/contrib/media/updf/android/AndroidManifest.xml b/contrib/media/updf/android/AndroidManifest.xml deleted file mode 100644 index 1bea0f8a71..0000000000 --- a/contrib/media/updf/android/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - diff --git a/contrib/media/updf/android/ReadMe.txt b/contrib/media/updf/android/ReadMe.txt deleted file mode 100644 index c46c88b6b4..0000000000 --- a/contrib/media/updf/android/ReadMe.txt +++ /dev/null @@ -1,111 +0,0 @@ -To build/debug android build. - -1) 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. - -2) 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. - -3) 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: - - - -4) 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? - -5) 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. - -6) 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?). - -7) 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). - -8) 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. - -9) 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. - -10) 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. - -11) Now start the emulator by executing: - - emulator -avd FroyoEm - -This will take a while to full start up (be patient). - -12) 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 /platform-tools if it's not on your path). - -13) 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. - -14) To see debug messages from the emulator (including stdout/stderr from -our app), execute: - - adb logcat - -Good luck! diff --git a/contrib/media/updf/android/build.properties b/contrib/media/updf/android/build.properties deleted file mode 100644 index edc7f23050..0000000000 --- a/contrib/media/updf/android/build.properties +++ /dev/null @@ -1,17 +0,0 @@ -# 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. - diff --git a/contrib/media/updf/android/build.sh b/contrib/media/updf/android/build.sh deleted file mode 100644 index 36ad883f44..0000000000 --- a/contrib/media/updf/android/build.sh +++ /dev/null @@ -1 +0,0 @@ -ndk-build && ant.bat install diff --git a/contrib/media/updf/android/build.xml b/contrib/media/updf/android/build.xml deleted file mode 100644 index 3ba2015be4..0000000000 --- a/contrib/media/updf/android/build.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/media/updf/android/default.properties b/contrib/media/updf/android/default.properties deleted file mode 100644 index 0b9250e021..0000000000 --- a/contrib/media/updf/android/default.properties +++ /dev/null @@ -1,11 +0,0 @@ -# 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 diff --git a/contrib/media/updf/android/jni/Android.mk b/contrib/media/updf/android/jni/Android.mk deleted file mode 100644 index 2e84204e76..0000000000 --- a/contrib/media/updf/android/jni/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -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) diff --git a/contrib/media/updf/android/jni/Application.mk b/contrib/media/updf/android/jni/Application.mk deleted file mode 100644 index 16de579678..0000000000 --- a/contrib/media/updf/android/jni/Application.mk +++ /dev/null @@ -1,3 +0,0 @@ -# The ARMv7 is significanly faster due to the use of the hardware FPU -APP_ABI := armeabi armeabi-v7a -APP_OPTIM := debug diff --git a/contrib/media/updf/android/jni/Core.mk b/contrib/media/updf/android/jni/Core.mk deleted file mode 100644 index 4c3e75b51a..0000000000 --- a/contrib/media/updf/android/jni/Core.mk +++ /dev/null @@ -1,99 +0,0 @@ -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) diff --git a/contrib/media/updf/android/jni/ThirdParty.mk b/contrib/media/updf/android/jni/ThirdParty.mk deleted file mode 100644 index 2a50b05fee..0000000000 --- a/contrib/media/updf/android/jni/ThirdParty.mk +++ /dev/null @@ -1,153 +0,0 @@ -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) diff --git a/contrib/media/updf/android/jni/mupdf.c b/contrib/media/updf/android/jni/mupdf.c deleted file mode 100644 index 463899af1e..0000000000 --- a/contrib/media/updf/android/jni/mupdf.c +++ /dev/null @@ -1,212 +0,0 @@ -#include -#include -#include -#include - -#include -#include -#include - -#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(¤tPage, 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; -} diff --git a/contrib/media/updf/android/local.properties b/contrib/media/updf/android/local.properties deleted file mode 100644 index d0fd99a98f..0000000000 --- a/contrib/media/updf/android/local.properties +++ /dev/null @@ -1,2 +0,0 @@ -#sdk.dir=/Library/android-sdk-mac_x86 -sdk.dir=C:\\Program Files\\android-sdk-windows diff --git a/contrib/media/updf/android/res/drawable-hdpi/icon.png b/contrib/media/updf/android/res/drawable-hdpi/icon.png deleted file mode 100644 index 1d47b23538..0000000000 Binary files a/contrib/media/updf/android/res/drawable-hdpi/icon.png and /dev/null differ diff --git a/contrib/media/updf/android/res/drawable-ldpi/icon.png b/contrib/media/updf/android/res/drawable-ldpi/icon.png deleted file mode 100644 index f9fe4d1c85..0000000000 Binary files a/contrib/media/updf/android/res/drawable-ldpi/icon.png and /dev/null differ diff --git a/contrib/media/updf/android/res/drawable-mdpi/icon.png b/contrib/media/updf/android/res/drawable-mdpi/icon.png deleted file mode 100644 index 4bb3e7cd96..0000000000 Binary files a/contrib/media/updf/android/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/contrib/media/updf/android/res/layout/main.xml b/contrib/media/updf/android/res/layout/main.xml deleted file mode 100644 index 0da95fc50a..0000000000 --- a/contrib/media/updf/android/res/layout/main.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/contrib/media/updf/android/res/values/strings.xml b/contrib/media/updf/android/res/values/strings.xml deleted file mode 100644 index ec3f9ae6f6..0000000000 --- a/contrib/media/updf/android/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - MuPDF - diff --git a/contrib/media/updf/android/res/values/theme.xml b/contrib/media/updf/android/res/values/theme.xml deleted file mode 100644 index 68c55644e9..0000000000 --- a/contrib/media/updf/android/res/values/theme.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/contrib/media/updf/android/src/com/artifex/mupdf/MuPDFActivity.java b/contrib/media/updf/android/src/com/artifex/mupdf/MuPDFActivity.java deleted file mode 100644 index d5ba3bd8a3..0000000000 --- a/contrib/media/updf/android/src/com/artifex/mupdf/MuPDFActivity.java +++ /dev/null @@ -1,162 +0,0 @@ -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); - } - } -} diff --git a/contrib/media/updf/android/src/com/artifex/mupdf/MuPDFCore.java b/contrib/media/updf/android/src/com/artifex/mupdf/MuPDFCore.java deleted file mode 100644 index 321b4a649c..0000000000 --- a/contrib/media/updf/android/src/com/artifex/mupdf/MuPDFCore.java +++ /dev/null @@ -1,54 +0,0 @@ -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(); - } -} diff --git a/contrib/media/updf/android/src/com/artifex/mupdf/PixmapView.java b/contrib/media/updf/android/src/com/artifex/mupdf/PixmapView.java deleted file mode 100644 index 73e73eda77..0000000000 --- a/contrib/media/updf/android/src/com/artifex/mupdf/PixmapView.java +++ /dev/null @@ -1,579 +0,0 @@ -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); - } - } -} diff --git a/contrib/media/updf/debian/changelog b/contrib/media/updf/debian/changelog deleted file mode 100644 index 891bfdceb0..0000000000 --- a/contrib/media/updf/debian/changelog +++ /dev/null @@ -1,14 +0,0 @@ -mupdf (0.8-1) unstable; urgency=low - - * MuPDF version 0.8 - -mupdf (0.7-1) unstable; urgency=low - - * MuPDF version 0.7 - - -- Tor Andersson Thu, 27 May 2010 17:11:13 +0100 -mupdf (0.6-1) unstable; urgency=low - - * First release of MuPDF with debian package. - - -- Tor Andersson Thu, 27 May 2010 17:11:13 +0100 diff --git a/contrib/media/updf/debian/compat b/contrib/media/updf/debian/compat deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/contrib/media/updf/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/contrib/media/updf/debian/control b/contrib/media/updf/debian/control deleted file mode 100644 index f374270319..0000000000 --- a/contrib/media/updf/debian/control +++ /dev/null @@ -1,39 +0,0 @@ -Source: mupdf -Section: text -Priority: optional -Maintainer: Tor Andersson -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. diff --git a/contrib/media/updf/debian/copyright b/contrib/media/updf/debian/copyright deleted file mode 100644 index 69d5116b84..0000000000 --- a/contrib/media/updf/debian/copyright +++ /dev/null @@ -1,63 +0,0 @@ -This package was debianized by Sebastian Rasmussen on -Mon, 15 Mar 2010 01:12:20 +0100. - -It was downloaded from http://mupdf.com/repos/mupdf - -Upstream Author: Tor Andersson - -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 and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. - diff --git a/contrib/media/updf/debian/dirs b/contrib/media/updf/debian/dirs deleted file mode 100644 index 84e4627dfd..0000000000 --- a/contrib/media/updf/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/include -usr/lib diff --git a/contrib/media/updf/debian/libmupdf-dev.install b/contrib/media/updf/debian/libmupdf-dev.install deleted file mode 100644 index dd3a2bda8e..0000000000 --- a/contrib/media/updf/debian/libmupdf-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -fitz/fitz.h usr/include -mupdf/mupdf.h usr/include -debian/mupdf.pc usr/lib/pkgconfig -debian/tmp/usr/lib/libmupdf.a diff --git a/contrib/media/updf/debian/mupdf-tools.docs b/contrib/media/updf/debian/mupdf-tools.docs deleted file mode 100644 index e845566c06..0000000000 --- a/contrib/media/updf/debian/mupdf-tools.docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/contrib/media/updf/debian/mupdf-tools.install b/contrib/media/updf/debian/mupdf-tools.install deleted file mode 100644 index 255de9dddd..0000000000 --- a/contrib/media/updf/debian/mupdf-tools.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/bin/pdfclean -debian/tmp/usr/bin/pdfdraw -debian/tmp/usr/bin/pdfshow diff --git a/contrib/media/updf/debian/mupdf-tools.manpages b/contrib/media/updf/debian/mupdf-tools.manpages deleted file mode 100644 index bc7fa25090..0000000000 --- a/contrib/media/updf/debian/mupdf-tools.manpages +++ /dev/null @@ -1,3 +0,0 @@ -debian/pdfclean.1 -debian/pdfdraw.1 -debian/pdfshow.1 diff --git a/contrib/media/updf/debian/mupdf.applications b/contrib/media/updf/debian/mupdf.applications deleted file mode 100644 index ca536c8b60..0000000000 --- a/contrib/media/updf/debian/mupdf.applications +++ /dev/null @@ -1,7 +0,0 @@ -mupdf - command=mupdf - name=MuPDF - expect_uris=false - requires_terminal=false - mime_types=application/x-pdf - can_open_multiple_files=false diff --git a/contrib/media/updf/debian/mupdf.desktop b/contrib/media/updf/debian/mupdf.desktop deleted file mode 100644 index 4c9aff5c4c..0000000000 --- a/contrib/media/updf/debian/mupdf.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[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 diff --git a/contrib/media/updf/debian/mupdf.docs b/contrib/media/updf/debian/mupdf.docs deleted file mode 100644 index e845566c06..0000000000 --- a/contrib/media/updf/debian/mupdf.docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/contrib/media/updf/debian/mupdf.install b/contrib/media/updf/debian/mupdf.install deleted file mode 100644 index 024f9f6ad8..0000000000 --- a/contrib/media/updf/debian/mupdf.install +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/contrib/media/updf/debian/mupdf.manpages b/contrib/media/updf/debian/mupdf.manpages deleted file mode 100644 index e74b13e7bb..0000000000 --- a/contrib/media/updf/debian/mupdf.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/mupdf.1 diff --git a/contrib/media/updf/debian/mupdf.menu b/contrib/media/updf/debian/mupdf.menu deleted file mode 100644 index 138938cc86..0000000000 --- a/contrib/media/updf/debian/mupdf.menu +++ /dev/null @@ -1,8 +0,0 @@ -?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" diff --git a/contrib/media/updf/debian/mupdf.mime b/contrib/media/updf/debian/mupdf.mime deleted file mode 100644 index 65bc0fbcc8..0000000000 --- a/contrib/media/updf/debian/mupdf.mime +++ /dev/null @@ -1,2 +0,0 @@ -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 diff --git a/contrib/media/updf/debian/mupdf.pc b/contrib/media/updf/debian/mupdf.pc deleted file mode 100644 index 7196cd5cbd..0000000000 --- a/contrib/media/updf/debian/mupdf.pc +++ /dev/null @@ -1,12 +0,0 @@ -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} diff --git a/contrib/media/updf/debian/mupdf.png b/contrib/media/updf/debian/mupdf.png deleted file mode 100644 index a46cec9938..0000000000 Binary files a/contrib/media/updf/debian/mupdf.png and /dev/null differ diff --git a/contrib/media/updf/debian/mupdf.xpm b/contrib/media/updf/debian/mupdf.xpm deleted file mode 100644 index 899a644b4d..0000000000 --- a/contrib/media/updf/debian/mupdf.xpm +++ /dev/null @@ -1,39 +0,0 @@ -/* XPM */ -static char * mupdf_icon_bitmap_32_xpm[] = { -"32 32 4 1", -" c None", -". c #FFFFFF", -"+ c #000000", -"@ c #2572AC", -" ", -" ...... ", -" ..++++++.. ", -" .++++++++++. ", -" .++++@@@@++++. ", -" .+++@@@@@@@@+++. ", -" .++@@@......@++. ", -" ..... .+++@@@.....@@+++.", -" .++++. .++@@@.....@@@@++.", -" .++++. .++@@@.....@@@@++.", -" .+++++. .++@@......@@@@++.", -" .+++++. .++@@......@@@@++.", -" .++++++. .+++...@...@@@+++.", -" .++++++. .++...@...@@@++. ", -" .+++++++. .+++.@@...@@+++. ", -" .+++++++. .++++@...++++. ", -" .++++++++. ..++++++++++. ", -" .++++++++. .+..++++++.. ", -" .++++.++++. .+++....... ", -" .++++.++++. .++++.++++. ", -" .++++..++++. .++++..+.++. ", -" .++++..++++. .++++....... ", -" .++++. .++++.++++. .+.++. ", -" .++++. .++++.++++. .+.++. ", -" .++++. .+++++++. .+.++. ", -" .++++. .+++++++. .+.++. ", -" .++++. .+++++. .+.++. ", -" .++++. .+++++. .+.++. ", -" .++++. .+++. .+.++. ", -" .++++. .+++. .++++. ", -" ...... ... ...... ", -" "}; diff --git a/contrib/media/updf/debian/rules b/contrib/media/updf/debian/rules deleted file mode 100755 index 6858577a35..0000000000 --- a/contrib/media/updf/debian/rules +++ /dev/null @@ -1,49 +0,0 @@ -#!/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 diff --git a/contrib/media/updf/win32/README.txt b/contrib/media/updf/win32/README.txt deleted file mode 100644 index 01915f8e11..0000000000 --- a/contrib/media/updf/win32/README.txt +++ /dev/null @@ -1 +0,0 @@ -This MSVC project needs the thirdparty sources to be in place. diff --git a/contrib/media/updf/win32/generate.bat b/contrib/media/updf/win32/generate.bat deleted file mode 100644 index 0a5d7f49a3..0000000000 --- a/contrib/media/updf/win32/generate.bat +++ /dev/null @@ -1,35 +0,0 @@ -@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 diff --git a/contrib/media/updf/win32/libmupdf.vcproj b/contrib/media/updf/win32/libmupdf.vcproj deleted file mode 100644 index 88af36eff2..0000000000 --- a/contrib/media/updf/win32/libmupdf.vcproj +++ /dev/null @@ -1,541 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/media/updf/win32/libthirdparty.vcproj b/contrib/media/updf/win32/libthirdparty.vcproj deleted file mode 100644 index 6b3cc70b7e..0000000000 --- a/contrib/media/updf/win32/libthirdparty.vcproj +++ /dev/null @@ -1,547 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/media/updf/win32/mupdf.sln b/contrib/media/updf/win32/mupdf.sln deleted file mode 100644 index 54793c5221..0000000000 --- a/contrib/media/updf/win32/mupdf.sln +++ /dev/null @@ -1,86 +0,0 @@ - -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 diff --git a/contrib/media/updf/win32/mupdf.vcproj b/contrib/media/updf/win32/mupdf.vcproj deleted file mode 100644 index b0e899e196..0000000000 --- a/contrib/media/updf/win32/mupdf.vcproj +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/media/updf/win32/pdfclean.vcproj b/contrib/media/updf/win32/pdfclean.vcproj deleted file mode 100644 index 2c6e5655ad..0000000000 --- a/contrib/media/updf/win32/pdfclean.vcproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/media/updf/win32/pdfdraw.vcproj b/contrib/media/updf/win32/pdfdraw.vcproj deleted file mode 100644 index 769c2b1942..0000000000 --- a/contrib/media/updf/win32/pdfdraw.vcproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/media/updf/win32/pdfextract.vcproj b/contrib/media/updf/win32/pdfextract.vcproj deleted file mode 100644 index 91e975f9b0..0000000000 --- a/contrib/media/updf/win32/pdfextract.vcproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/media/updf/win32/pdfshow.vcproj b/contrib/media/updf/win32/pdfshow.vcproj deleted file mode 100644 index a115fd2013..0000000000 --- a/contrib/media/updf/win32/pdfshow.vcproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/media/updf/win32/xpsdraw.vcproj b/contrib/media/updf/win32/xpsdraw.vcproj deleted file mode 100644 index 52357d31b2..0000000000 --- a/contrib/media/updf/win32/xpsdraw.vcproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -