Remove begin_page and end_page device calls.

To be moved into a new document writer interface later.

6 files changed, 0 insertions, 102 deletions

diff --git a/platform/java/TraceDevice.java b/platform/java/TraceDevice.java
index 6eb28cbf..36ed6cd3 100644
--- a/platform/java/TraceDevice.java
+++ b/platform/java/TraceDevice.java
@@ -42,14 +42,6 @@ public class TraceDevice extends Device implements PathWalker, TextWalker
 		text.walk(this);
 	}
 
-	public void beginPage(Rect r, Matrix m) {
-		System.out.println("beginPage " + r + " " + m);
-	}
-
-	public void endPage() {
-		System.out.println("endPage");
-	}
-
 	public void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float color[], float alpha) {
 		System.out.println("fillPath " + evenOdd + " " + ctm + " " + traceColor(cs, color, alpha));
 		tracePath(path);
diff --git a/platform/java/com/artifex/mupdf/fitz/Device.java b/platform/java/com/artifex/mupdf/fitz/Device.java
index 45dea62d..b4e87481 100644
--- a/platform/java/com/artifex/mupdf/fitz/Device.java
+++ b/platform/java/com/artifex/mupdf/fitz/Device.java
@@ -38,8 +38,6 @@ public class Device
 	 * };
 	 */
 
-	public void beginPage(Rect area, Matrix ctm) {}
-	public void endPage() {}
 	public void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float color[], float alpha) {}
 	public void strokePath(Path path, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha) {}
 	public void clipPath(Path path, boolean evenOdd, Matrix ctm) {}
diff --git a/platform/java/com/artifex/mupdf/fitz/NativeDevice.java b/platform/java/com/artifex/mupdf/fitz/NativeDevice.java
index e9e351a9..968c5f09 100644
--- a/platform/java/com/artifex/mupdf/fitz/NativeDevice.java
+++ b/platform/java/com/artifex/mupdf/fitz/NativeDevice.java
@@ -17,9 +17,6 @@ public class NativeDevice extends Device
 		super(p);
 	}
 
-	public native final void beginPage(Rect area, Matrix ctm);
-	public native final void endPage();
-
 	public native final void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float color[], float alpha);
 	public native final void strokePath(Path path, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha);
 	public native final void clipPath(Path path, boolean evenOdd, Matrix ctm);
diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c
index bf10ff9d..97052771 100644
--- a/platform/java/mupdf_native.c
+++ b/platform/java/mupdf_native.c
@@ -107,7 +107,6 @@ static jmethodID mid_ColorSpace_fromPointer;
 static jmethodID mid_ColorSpace_init;
 static jmethodID mid_Device_beginGroup;
 static jmethodID mid_Device_beginMask;
-static jmethodID mid_Device_beginPage;
 static jmethodID mid_Device_beginTile;
 static jmethodID mid_Device_clipImageMask;
 static jmethodID mid_Device_clipPath;
@@ -116,7 +115,6 @@ static jmethodID mid_Device_clipStrokeText;
 static jmethodID mid_Device_clipText;
 static jmethodID mid_Device_endGroup;
 static jmethodID mid_Device_endMask;
-static jmethodID mid_Device_endPage;
 static jmethodID mid_Device_endTile;
 static jmethodID mid_Device_fillImage;
 static jmethodID mid_Device_fillImageMask;
@@ -296,8 +294,6 @@ static int find_fids(JNIEnv *env)
 
 	cls_Device = get_class(&err, env, PKG"Device");
 	fid_Device_pointer = get_field(&err, env, "pointer", "J");
-	mid_Device_beginPage = get_method(&err, env, "beginPage", "(L"PKG"Rect;L"PKG"Matrix;)V");
-	mid_Device_endPage = get_method(&err, env, "endPage", "()V");
 	mid_Device_fillPath = get_method(&err, env, "fillPath", "(L"PKG"Path;ZL"PKG"Matrix;L"PKG"ColorSpace;[FF)V");
 	mid_Device_strokePath = get_method(&err, env, "strokePath", "(L"PKG"Path;L"PKG"StrokeState;L"PKG"Matrix;L"PKG"ColorSpace;[FF)V");
 	mid_Device_clipPath = get_method(&err, env, "clipPath", "(L"PKG"Path;ZL"PKG"Matrix;)V");
@@ -1018,30 +1014,6 @@ typedef struct
 fz_java_device;
 
 static void
-fz_java_device_begin_page(fz_context *ctx, fz_device *dev, const fz_rect *rect, const fz_matrix *ctm)
-{
-	fz_java_device *jdev = (fz_java_device *)dev;
-	JNIEnv *env = jdev->env;
-	jobject jrect = to_Rect(ctx, env, rect);
-	jobject jctm = to_Matrix(ctx, env, ctm);
-
-	(*env)->CallVoidMethod(env, jdev->self, mid_Device_beginPage, jrect, jctm);
-	if ((*env)->ExceptionCheck(env))
-		fz_throw_java(ctx, env);
-}
-
-static void
-fz_java_device_end_page(fz_context *ctx, fz_device *dev)
-{
-	fz_java_device *jdev = (fz_java_device *)dev;
-	JNIEnv *env = jdev->env;
-
-	(*env)->CallVoidMethod(env, jdev->self, mid_Device_endPage);
-	if ((*env)->ExceptionCheck(env))
-		fz_throw_java(ctx, env);
-}
-
-static void
 fz_java_device_fill_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha)
 {
 	fz_java_device *jdev = (fz_java_device *)dev;
@@ -1333,9 +1305,6 @@ static fz_device *fz_new_java_device(fz_context *ctx, JNIEnv *env, jobject self)
 
 		dev->super.drop_imp = fz_java_device_drop_imp;
 
-		dev->super.begin_page = fz_java_device_begin_page;
-		dev->super.end_page = fz_java_device_end_page;
-
 		dev->super.fill_path = fz_java_device_fill_path;
 		dev->super.stroke_path = fz_java_device_stroke_path;
 		dev->super.clip_path = fz_java_device_clip_path;
@@ -1477,46 +1446,6 @@ FUN(NativeDevice_finalize)(JNIEnv *env, jobject self)
 }
 
 JNIEXPORT void JNICALL
-FUN(NativeDevice_beginPage)(JNIEnv *env, jobject self, jobject jrect, jobject jctm)
-{
-	fz_context *ctx = get_context(env);
-	fz_device *dev = from_Device(env, self, ctx);
-	fz_rect rect = from_Rect(env, jrect);
-	fz_matrix ctm = from_Matrix(env, jctm);
-	NativeDeviceInfo *info;
-
-	if (ctx == NULL || dev == NULL)
-		return;
-
-	info = lockNativeDevice(env, self);
-	fz_try(ctx)
-		fz_begin_page(ctx, dev, &rect, &ctm);
-	fz_always(ctx)
-		unlockNativeDevice(env, info);
-	fz_catch(ctx)
-		jni_rethrow(env, ctx);
-}
-
-JNIEXPORT void JNICALL
-FUN(NativeDevice_endPage)(JNIEnv *env, jobject self)
-{
-	fz_context *ctx = get_context(env);
-	fz_device *dev = from_Device(env, self, ctx);
-	NativeDeviceInfo *info;
-
-	if (ctx == NULL || dev == NULL)
-		return;
-
-	info = lockNativeDevice(env, self);
-	fz_try(ctx)
-		fz_end_page(ctx, dev);
-	fz_always(ctx)
-		unlockNativeDevice(env, info);
-	fz_catch(ctx)
-		jni_rethrow(env, ctx);
-}
-
-JNIEXPORT void JNICALL
 FUN(NativeDevice_fillPath)(JNIEnv *env, jobject self, jobject jpath, jboolean even_odd, jobject jctm, jobject jcs, jfloatArray jcolor, float alpha)
 {
 	fz_context *ctx = get_context(env);
diff --git a/platform/java/mupdf_native.h b/platform/java/mupdf_native.h
index 6a9c3a0c..95f17084 100644
--- a/platform/java/mupdf_native.h
+++ b/platform/java/mupdf_native.h
@@ -840,22 +840,6 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_finalize
 
 /*
  * Class:     com_artifex_mupdf_fitz_NativeDevice
- * Method:    beginPage
- * Signature: (Lcom/artifex/mupdf/fitz/Rect;Lcom/artifex/mupdf/fitz/Matrix;)V
- */
-JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_beginPage
-  (JNIEnv *, jobject, jobject, jobject);
-
-/*
- * Class:     com_artifex_mupdf_fitz_NativeDevice
- * Method:    endPage
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_endPage
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_artifex_mupdf_fitz_NativeDevice
  * Method:    fillPath
  * Signature: (Lcom/artifex/mupdf/fitz/Path;ZLcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FF)V
  */
diff --git a/platform/x11/pdfapp.c b/platform/x11/pdfapp.c
index d764a152..37ef2181 100644
--- a/platform/x11/pdfapp.c
+++ b/platform/x11/pdfapp.c
@@ -771,12 +771,10 @@ static void pdfapp_recreate_annotationslist(pdfapp_t *app)
 
 static void pdfapp_runpage(pdfapp_t *app, fz_device *dev, const fz_matrix *ctm, const fz_rect *rect, fz_cookie *cookie)
 {
-	fz_begin_page(app->ctx, dev, rect, ctm);
 	if (app->page_list)
 		fz_run_display_list(app->ctx, app->page_list, dev, ctm, rect, cookie);
 	if (app->annotations_list)
 		fz_run_display_list(app->ctx, app->annotations_list, dev, ctm, rect, cookie);
-	fz_end_page(app->ctx, dev);
 }
 
 #define MAX_TITLE 256