summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2013-05-03 13:02:10 +0100
committerRobin Watts <robin.watts@artifex.com>2013-05-03 16:39:02 +0100
commit09bb1dc2a0cbea13b9ad27f626d2c9e16984ebf9 (patch)
tree25e7a25b122b1c67805b6982e7f583bd4a34e009 /android
parentf499ef89525fd596753f1a4e93e8a8c56953e21a (diff)
downloadmupdf-09bb1dc2a0cbea13b9ad27f626d2c9e16984ebf9.tar.xz
Simple Image file format recogniser
Now can open jpeg/png/tiff files within mupdf.
Diffstat (limited to 'android')
-rw-r--r--android/jni/Core.mk4
-rw-r--r--android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java16
2 files changed, 19 insertions, 1 deletions
diff --git a/android/jni/Core.mk b/android/jni/Core.mk
index 0d7754e1..aed148fc 100644
--- a/android/jni/Core.mk
+++ b/android/jni/Core.mk
@@ -32,6 +32,7 @@ LOCAL_C_INCLUDES := \
../pdf \
../xps \
../cbz \
+ ../image \
../scripts \
..
ifdef V8_BUILD
@@ -145,7 +146,8 @@ LOCAL_SRC_FILES := \
$(MY_ROOT)/xps/xps_tile.c \
$(MY_ROOT)/xps/xps_util.c \
$(MY_ROOT)/xps/xps_zip.c \
- $(MY_ROOT)/cbz/mucbz.c
+ $(MY_ROOT)/cbz/mucbz.c \
+ $(MY_ROOT)/image/muimage.c
ifdef MEMENTO
LOCAL_SRC_FILES += $(MY_ROOT)/fitz/memento.c
endif
diff --git a/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java b/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java
index 8b8bde8e..c1c9142c 100644
--- a/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java
+++ b/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java
@@ -94,6 +94,22 @@ public class ChoosePDFActivity extends ListActivity {
return true;
if (fname.endsWith(".cbz"))
return true;
+ if (fname.endsWith(".png"))
+ return true;
+ if (fname.endsWith(".jpe"))
+ return true;
+ if (fname.endsWith(".jpeg"))
+ return true;
+ if (fname.endsWith(".jpg"))
+ return true;
+ if (fname.endsWith(".jfif"))
+ return true;
+ if (fname.endsWith(".jfif-tbnl"))
+ return true;
+ if (fname.endsWith(".tif"))
+ return true;
+ if (fname.endsWith(".tiff"))
+ return true;
return false;
}
});