36 files changed, 34 insertions, 9 deletions
diff --git a/platform/java/Makefile b/platform/java/Makefile
index 32d08dd7..1762c512 100644
--- a/platform/java/Makefile
+++ b/platform/java/Makefile
@@ -29,9 +29,9 @@ $(MUPDF_CORE) :
 	$(MAKE) -C ../.. OUT=build/java XCFLAGS=-fPIC build=release libs
 endif
 
-LIBRARY_JAVA_SOURCES := $(sort $(wildcard com/artifex/mupdf/fitz/*.java))
+LIBRARY_JAVA_SOURCES := $(sort $(wildcard src/com/artifex/mupdf/fitz/*.java))
 LIBRARY_JAVA_OBJECTS := $(LIBRARY_JAVA_SOURCES:%.java=%.class)
-LIBRARY_JAVA_CLASSES := $(subst com/artifex/mupdf/fitz/,com.artifex.mupdf.fitz.,$(LIBRARY_JAVA_SOURCES:%.java=%))
+LIBRARY_JAVA_CLASSES := $(subst src/com/artifex/mupdf/fitz/,com.artifex.mupdf.fitz.,$(LIBRARY_JAVA_SOURCES:%.java=%))
 
 $(LIBRARY_JAVA_OBJECTS) : $(LIBRARY_JAVA_SOURCES)
 	javac -source 1.7 -target 1.7 $^
@@ -40,7 +40,7 @@ EXAMPLE_JAVA_SOURCES := $(sort $(wildcard example/*.java))
 EXAMPLE_JAVA_OBJECTS := $(EXAMPLE_JAVA_SOURCES:%.java=%.class)
 
 $(EXAMPLE_JAVA_OBJECTS) : $(EXAMPLE_JAVA_SOURCES)
-	javac -source 1.7 -target 1.7 $^
+	javac -source 1.7 -target 1.7  -classpath .:src $^
 
 libmupdf.jar : $(LIBRARY_JAVA_OBJECTS)
 	rm -f $@
@@ -48,7 +48,7 @@ libmupdf.jar : $(LIBRARY_JAVA_OBJECTS)
 
 mupdf_native.h : $(LIBRARY_JAVA_OBJECTS)
 	rm -f $@
-	javah -o $@ $(LIBRARY_JAVA_CLASSES)
+	javah -classpath .:src -o $@ $(LIBRARY_JAVA_CLASSES)
 
 mupdf_native.o : mupdf_native.c mupdf_native.h
 	$(CC) -g -o $@ -c $< -fPIC -Wall -Wextra -Wno-unused-parameter -I ../../include \
@@ -58,10 +58,10 @@ $(MUPDF_JAVA) : mupdf_native.o $(MUPDF_CORE)
 	$(CC) -shared -o $(MUPDF_JAVA) $^ $(JAVA_LIBS)
 
 viewer: $(MUPDF_JAVA) $(EXAMPLE_JAVA_OBJECTS)
-	LD_LIBRARY_PATH=. java example.Viewer
+	LD_LIBRARY_PATH=. java -classpath .:src example.Viewer
 
 clean:
-	rm -f com/artifex/mupdf/fitz/*.class
+	rm -f src/com/artifex/mupdf/fitz/*.class
 	rm -f example/*.class
 	rm -f mupdf_native.o
 	rm -f $(MUPDF_JAVA)
diff --git a/platform/java/Makejar b/platform/java/Makejar
index 3f98127a..74d7503c 100644
--- a/platform/java/Makejar
+++ b/platform/java/Makejar
@@ -1,3 +1,3 @@
 default:
-	javac -source 1.7 -target 1.7 com/artifex/mupdf/fitz/*.java
-	jar cf libmupdf.jar com/artifex/mupdf/fitz/*.class
+	javac -source 1.7 -target 1.7 src/com/artifex/mupdf/fitz/*.java
+	jar cf libmupdf.jar src/com/artifex/mupdf/fitz/*.class
diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c
index ef9a04b8..e960cb5c 100644
--- a/platform/java/mupdf_native.c
+++ b/platform/java/mupdf_native.c
@@ -2245,7 +2245,7 @@ static void androidDrawDevice_unlock(JNIEnv *env, NativeDeviceInfo *info)
 }
 
 JNIEXPORT jlong JNICALL
-FUN(AndroidDrawDevice_newNative)(JNIEnv *env, jclass self, jobject jbitmap, jint pageX0, jint pageY0, jint pageX1, jint pageY1, jint patchX0, jint patchY0, jint patchX1, jint patchY1)
+FUN(android_AndroidDrawDevice_newNative)(JNIEnv *env, jclass self, jobject jbitmap, jint pageX0, jint pageY0, jint pageX1, jint pageY1, jint patchX0, jint patchY0, jint patchX1, jint patchY1)
 {
 	fz_context *ctx = get_context(env);
 	AndroidBitmapInfo info;
diff --git a/platform/java/com/artifex/mupdf/fitz/Annotation.java b/platform/java/src/com/artifex/mupdf/fitz/Annotation.java
index 855ff5a1..855ff5a1 100644
--- a/platform/java/com/artifex/mupdf/fitz/Annotation.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Annotation.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Buffer.java b/platform/java/src/com/artifex/mupdf/fitz/Buffer.java
index 7f23b062..7f23b062 100644
--- a/platform/java/com/artifex/mupdf/fitz/Buffer.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Buffer.java
diff --git a/platform/java/com/artifex/mupdf/fitz/ColorSpace.java b/platform/java/src/com/artifex/mupdf/fitz/ColorSpace.java
index b7822161..b7822161 100644
--- a/platform/java/com/artifex/mupdf/fitz/ColorSpace.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/ColorSpace.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Context.java b/platform/java/src/com/artifex/mupdf/fitz/Context.java
index 3614e65f..3614e65f 100644
--- a/platform/java/com/artifex/mupdf/fitz/Context.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Context.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Cookie.java b/platform/java/src/com/artifex/mupdf/fitz/Cookie.java
index f866f99e..f866f99e 100644
--- a/platform/java/com/artifex/mupdf/fitz/Cookie.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Cookie.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Device.java b/platform/java/src/com/artifex/mupdf/fitz/Device.java
index 295226fe..295226fe 100644
--- a/platform/java/com/artifex/mupdf/fitz/Device.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Device.java
diff --git a/platform/java/com/artifex/mupdf/fitz/DisplayList.java b/platform/java/src/com/artifex/mupdf/fitz/DisplayList.java
index 3e822eea..3e822eea 100644
--- a/platform/java/com/artifex/mupdf/fitz/DisplayList.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/DisplayList.java
diff --git a/platform/java/com/artifex/mupdf/fitz/DisplayListDevice.java b/platform/java/src/com/artifex/mupdf/fitz/DisplayListDevice.java
index c7f7c935..c7f7c935 100644
--- a/platform/java/com/artifex/mupdf/fitz/DisplayListDevice.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/DisplayListDevice.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Document.java b/platform/java/src/com/artifex/mupdf/fitz/Document.java
index 89e3013b..89e3013b 100644
--- a/platform/java/com/artifex/mupdf/fitz/Document.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Document.java
diff --git a/platform/java/com/artifex/mupdf/fitz/DocumentWriter.java b/platform/java/src/com/artifex/mupdf/fitz/DocumentWriter.java
index dce9d73d..dce9d73d 100644
--- a/platform/java/com/artifex/mupdf/fitz/DocumentWriter.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/DocumentWriter.java
diff --git a/platform/java/com/artifex/mupdf/fitz/DrawDevice.java b/platform/java/src/com/artifex/mupdf/fitz/DrawDevice.java
index e022be10..e022be10 100644
--- a/platform/java/com/artifex/mupdf/fitz/DrawDevice.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/DrawDevice.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Font.java b/platform/java/src/com/artifex/mupdf/fitz/Font.java
index 5101a6ac..5101a6ac 100644
--- a/platform/java/com/artifex/mupdf/fitz/Font.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Font.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Image.java b/platform/java/src/com/artifex/mupdf/fitz/Image.java
index 4d2f7eb5..4d2f7eb5 100644
--- a/platform/java/com/artifex/mupdf/fitz/Image.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Image.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Link.java b/platform/java/src/com/artifex/mupdf/fitz/Link.java
index 0ecd8307..0ecd8307 100644
--- a/platform/java/com/artifex/mupdf/fitz/Link.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Link.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Matrix.java b/platform/java/src/com/artifex/mupdf/fitz/Matrix.java
index 80da84fc..80da84fc 100644
--- a/platform/java/com/artifex/mupdf/fitz/Matrix.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Matrix.java
diff --git a/platform/java/com/artifex/mupdf/fitz/NativeDevice.java b/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java
index 0d2b9159..0d2b9159 100644
--- a/platform/java/com/artifex/mupdf/fitz/NativeDevice.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Outline.java b/platform/java/src/com/artifex/mupdf/fitz/Outline.java
index 98a11b79..98a11b79 100644
--- a/platform/java/com/artifex/mupdf/fitz/Outline.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Outline.java
diff --git a/platform/java/com/artifex/mupdf/fitz/PDFDocument.java b/platform/java/src/com/artifex/mupdf/fitz/PDFDocument.java
index 58a3e3a6..58a3e3a6 100644
--- a/platform/java/com/artifex/mupdf/fitz/PDFDocument.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/PDFDocument.java
diff --git a/platform/java/com/artifex/mupdf/fitz/PDFObject.java b/platform/java/src/com/artifex/mupdf/fitz/PDFObject.java
index f2e926f2..f2e926f2 100644
--- a/platform/java/com/artifex/mupdf/fitz/PDFObject.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/PDFObject.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Page.java b/platform/java/src/com/artifex/mupdf/fitz/Page.java
index 64fe4030..64fe4030 100644
--- a/platform/java/com/artifex/mupdf/fitz/Page.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Page.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Path.java b/platform/java/src/com/artifex/mupdf/fitz/Path.java
index 455dce69..455dce69 100644
--- a/platform/java/com/artifex/mupdf/fitz/Path.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Path.java
diff --git a/platform/java/com/artifex/mupdf/fitz/PathWalker.java b/platform/java/src/com/artifex/mupdf/fitz/PathWalker.java
index 66d1b49b..66d1b49b 100644
--- a/platform/java/com/artifex/mupdf/fitz/PathWalker.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/PathWalker.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Pixmap.java b/platform/java/src/com/artifex/mupdf/fitz/Pixmap.java
index 52432fea..52432fea 100644
--- a/platform/java/com/artifex/mupdf/fitz/Pixmap.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Pixmap.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Point.java b/platform/java/src/com/artifex/mupdf/fitz/Point.java
index b32198bc..b32198bc 100644
--- a/platform/java/com/artifex/mupdf/fitz/Point.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Point.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Rect.java b/platform/java/src/com/artifex/mupdf/fitz/Rect.java
index 819646e8..819646e8 100644
--- a/platform/java/com/artifex/mupdf/fitz/Rect.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Rect.java
diff --git a/platform/java/com/artifex/mupdf/fitz/RectI.java b/platform/java/src/com/artifex/mupdf/fitz/RectI.java
index 8e46a3f2..8e46a3f2 100644
--- a/platform/java/com/artifex/mupdf/fitz/RectI.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/RectI.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Shade.java b/platform/java/src/com/artifex/mupdf/fitz/Shade.java
index 35182cb8..35182cb8 100644
--- a/platform/java/com/artifex/mupdf/fitz/Shade.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Shade.java
diff --git a/platform/java/com/artifex/mupdf/fitz/StrokeState.java b/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java
index 7f333f76..7f333f76 100644
--- a/platform/java/com/artifex/mupdf/fitz/StrokeState.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java
diff --git a/platform/java/com/artifex/mupdf/fitz/StructuredText.java b/platform/java/src/com/artifex/mupdf/fitz/StructuredText.java
index 0f3549d5..0f3549d5 100644
--- a/platform/java/com/artifex/mupdf/fitz/StructuredText.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/StructuredText.java
diff --git a/platform/java/com/artifex/mupdf/fitz/Text.java b/platform/java/src/com/artifex/mupdf/fitz/Text.java
index 5bbe8abe..5bbe8abe 100644
--- a/platform/java/com/artifex/mupdf/fitz/Text.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Text.java
diff --git a/platform/java/com/artifex/mupdf/fitz/TextWalker.java b/platform/java/src/com/artifex/mupdf/fitz/TextWalker.java
index 911c19bc..911c19bc 100644
--- a/platform/java/com/artifex/mupdf/fitz/TextWalker.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/TextWalker.java
diff --git a/platform/java/com/artifex/mupdf/fitz/TryLaterException.java b/platform/java/src/com/artifex/mupdf/fitz/TryLaterException.java
index e2d1b88e..e2d1b88e 100644
--- a/platform/java/com/artifex/mupdf/fitz/TryLaterException.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/TryLaterException.java
diff --git a/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java b/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java
new file mode 100644
index 00000000..2be2ae59
--- /dev/null
+++ b/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java
@@ -0,0 +1,25 @@
+package com.artifex.mupdf.fitz.android;
+
+import android.graphics.Bitmap;
+
+import com.artifex.mupdf.fitz.NativeDevice;
+import com.artifex.mupdf.fitz.RectI;
+
+public final class AndroidDrawDevice extends NativeDevice
+{
+	// NOT static.
+	private native long newNative(Bitmap bitmap, int pageX0, int pageY0, int pageX1, int pageY1, int patchX0, int patchY0, int patchX1, int patchY1);
+
+	// Construction
+	public AndroidDrawDevice(Bitmap bitmap, int pageX0, int pageY0, int pageX1, int pageY1, int patchX0, int patchY0, int patchX1, int patchY1)
+	{
+		super(0);
+		pointer = newNative(bitmap, pageX0, pageY0, pageX1, pageY1, patchX0, patchY0, patchX1, patchY1);
+	}
+
+	public AndroidDrawDevice(Bitmap bitmap, RectI page, RectI patch)
+	{
+		super(0);
+		pointer = newNative(bitmap, page.x0, page.y0, page.x1, page.y1, patch.x0, patch.y0, patch.x1, patch.y1);
+	}
+}