From 09bb1dc2a0cbea13b9ad27f626d2c9e16984ebf9 Mon Sep 17 00:00:00 2001
From: Robin Watts <robin.watts@artifex.com>
Date: Fri, 3 May 2013 13:02:10 +0100
Subject: Simple Image file format recogniser

Now can open jpeg/png/tiff files within mupdf.
---
 android/jni/Core.mk                                      |  4 +++-
 android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'android')

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;
 					}
 				});
-- 
cgit v1.2.3