summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
Diffstat (limited to 'platform')
-rw-r--r--platform/gl/gl-annotate.c20
-rw-r--r--platform/java/mupdf_native.c48
-rw-r--r--platform/x11/pdfapp.c18
-rw-r--r--platform/x11/pdfapp.h2
-rw-r--r--platform/x11/x11_main.c4
5 files changed, 45 insertions, 47 deletions
diff --git a/platform/gl/gl-annotate.c b/platform/gl/gl-annotate.c
index dca7519a..40e36a31 100644
--- a/platform/gl/gl-annotate.c
+++ b/platform/gl/gl-annotate.c
@@ -68,19 +68,19 @@ static void save_pdf_dialog(void)
}
}
-static int rects_differ(const fz_rect *a, const fz_rect *b, float threshold)
+static int rects_differ(fz_rect a, fz_rect b, float threshold)
{
- if (fz_abs(a->x0 - b->x0) > threshold) return 1;
- if (fz_abs(a->y0 - b->y0) > threshold) return 1;
- if (fz_abs(a->x1 - b->x1) > threshold) return 1;
- if (fz_abs(a->y1 - b->y1) > threshold) return 1;
+ if (fz_abs(a.x0 - b.x0) > threshold) return 1;
+ if (fz_abs(a.y0 - b.y0) > threshold) return 1;
+ if (fz_abs(a.x1 - b.x1) > threshold) return 1;
+ if (fz_abs(a.y1 - b.y1) > threshold) return 1;
return 0;
}
-static int points_differ(const fz_point *a, const fz_point *b, float threshold)
+static int points_differ(fz_point a, fz_point b, float threshold)
{
- if (fz_abs(a->x - b->x) > threshold) return 1;
- if (fz_abs(a->y - b->y) > threshold) return 1;
+ if (fz_abs(a.x - b.x) > threshold) return 1;
+ if (fz_abs(a.y - b.y) > threshold) return 1;
return 0;
}
@@ -836,7 +836,7 @@ static void do_edit_rect(fz_irect canvas_area, fz_irect area, fz_rect *rect)
if (!ui.down)
{
state = ER_NONE;
- if (rects_differ(&start_rect, rect, 1))
+ if (rects_differ(start_rect, *rect, 1))
{
fz_rect trect = fz_transform_rect(*rect, view_page_inv_ctm);
pdf_set_annot_rect(ctx, selected_annot, trect);
@@ -903,7 +903,7 @@ static void do_edit_line(fz_irect canvas_area, fz_irect area, fz_rect *rect)
if (!ui.down)
{
state = EL_NONE;
- if (points_differ(&start_a, &a, 1) || points_differ(&start_b, &b, 1))
+ if (points_differ(start_a, a, 1) || points_differ(start_b, b, 1))
{
a = fz_transform_point(a, view_page_inv_ctm);
b = fz_transform_point(b, view_page_inv_ctm);
diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c
index 51c305ed..07331db4 100644
--- a/platform/java/mupdf_native.c
+++ b/platform/java/mupdf_native.c
@@ -1217,13 +1217,13 @@ static inline jobject to_Path(fz_context *ctx, JNIEnv *env, const fz_path *path)
return jpath;
}
-static inline jobject to_Rect(fz_context *ctx, JNIEnv *env, const fz_rect *rect)
+static inline jobject to_Rect(fz_context *ctx, JNIEnv *env, fz_rect rect)
{
jobject jrect;
if (!ctx) return NULL;
- jrect = (*env)->NewObject(env, cls_Rect, mid_Rect_init, rect->x0, rect->y0, rect->x1, rect->y1);
+ jrect = (*env)->NewObject(env, cls_Rect, mid_Rect_init, rect.x0, rect.y0, rect.x1, rect.y1);
if ((*env)->ExceptionCheck(env))
fz_throw_java(ctx, env);
@@ -2270,7 +2270,7 @@ fz_java_device_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path,
}
static void
-fz_java_device_clip_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, fz_matrix ctm, const fz_rect *scissor)
+fz_java_device_clip_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, fz_matrix ctm, fz_rect scissor)
{
fz_java_device *jdev = (fz_java_device *)dev;
JNIEnv *env = jdev->env;
@@ -2283,7 +2283,7 @@ fz_java_device_clip_path(fz_context *ctx, fz_device *dev, const fz_path *path, i
}
static void
-fz_java_device_clip_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_stroke_state *state, fz_matrix ctm, const fz_rect *scissor)
+fz_java_device_clip_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_stroke_state *state, fz_matrix ctm, fz_rect scissor)
{
fz_java_device *jdev = (fz_java_device *)dev;
JNIEnv *env = jdev->env;
@@ -2330,7 +2330,7 @@ fz_java_device_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text,
}
static void
-fz_java_device_clip_text(fz_context *ctx, fz_device *dev, const fz_text *text, fz_matrix ctm, const fz_rect *scissor)
+fz_java_device_clip_text(fz_context *ctx, fz_device *dev, const fz_text *text, fz_matrix ctm, fz_rect scissor)
{
fz_java_device *jdev = (fz_java_device *)dev;
JNIEnv *env = jdev->env;
@@ -2343,7 +2343,7 @@ fz_java_device_clip_text(fz_context *ctx, fz_device *dev, const fz_text *text, f
}
static void
-fz_java_device_clip_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *state, fz_matrix ctm, const fz_rect *scissor)
+fz_java_device_clip_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *state, fz_matrix ctm, fz_rect scissor)
{
fz_java_device *jdev = (fz_java_device *)dev;
JNIEnv *env = jdev->env;
@@ -2412,7 +2412,7 @@ fz_java_device_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *img, f
}
static void
-fz_java_device_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *img, fz_matrix ctm, const fz_rect *scissor)
+fz_java_device_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *img, fz_matrix ctm, fz_rect scissor)
{
fz_java_device *jdev = (fz_java_device *)dev;
JNIEnv *env = jdev->env;
@@ -2461,7 +2461,7 @@ fz_java_device_end_layer(fz_context *ctx, fz_device *dev)
}
static void
-fz_java_device_begin_mask(fz_context *ctx, fz_device *dev, const fz_rect *rect, int luminosity, fz_colorspace *cs, const float *bc, const fz_color_params *cs_params)
+fz_java_device_begin_mask(fz_context *ctx, fz_device *dev, fz_rect rect, int luminosity, fz_colorspace *cs, const float *bc, const fz_color_params *cs_params)
{
fz_java_device *jdev = (fz_java_device *)dev;
JNIEnv *env = jdev->env;
@@ -2487,7 +2487,7 @@ fz_java_device_end_mask(fz_context *ctx, fz_device *dev)
}
static void
-fz_java_device_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *rect, fz_colorspace *cs, int isolated, int knockout, int blendmode, float alpha)
+fz_java_device_begin_group(fz_context *ctx, fz_device *dev, fz_rect rect, fz_colorspace *cs, int isolated, int knockout, int blendmode, float alpha)
{
fz_java_device *jdev = (fz_java_device *)dev;
JNIEnv *env = jdev->env;
@@ -2511,7 +2511,7 @@ fz_java_device_end_group(fz_context *ctx, fz_device *dev)
}
static int
-fz_java_device_begin_tile(fz_context *ctx, fz_device *dev, const fz_rect *area, const fz_rect *view, float xstep, float ystep, fz_matrix ctm, int id)
+fz_java_device_begin_tile(fz_context *ctx, fz_device *dev, fz_rect area, fz_rect view, float xstep, float ystep, fz_matrix ctm, int id)
{
fz_java_device *jdev = (fz_java_device *)dev;
JNIEnv *env = jdev->env;
@@ -2808,7 +2808,7 @@ FUN(NativeDevice_clipPath)(JNIEnv *env, jobject self, jobject jpath, jboolean ev
if (err)
return;
fz_try(ctx)
- fz_clip_path(ctx, dev, path, even_odd, ctm, NULL);
+ fz_clip_path(ctx, dev, path, even_odd, ctm, fz_infinite_rect);
fz_always(ctx)
unlockNativeDevice(env, info);
fz_catch(ctx)
@@ -2834,7 +2834,7 @@ FUN(NativeDevice_clipStrokePath)(JNIEnv *env, jobject self, jobject jpath, jobje
if (err)
return;
fz_try(ctx)
- fz_clip_stroke_path(ctx, dev, path, stroke, ctm, NULL);
+ fz_clip_stroke_path(ctx, dev, path, stroke, ctm, fz_infinite_rect);
fz_always(ctx)
unlockNativeDevice(env, info);
fz_catch(ctx)
@@ -2916,7 +2916,7 @@ FUN(NativeDevice_clipText)(JNIEnv *env, jobject self, jobject jtext, jobject jct
if (err)
return;
fz_try(ctx)
- fz_clip_text(ctx, dev, text, ctm, NULL);
+ fz_clip_text(ctx, dev, text, ctm, fz_infinite_rect);
fz_always(ctx)
unlockNativeDevice(env, info);
fz_catch(ctx)
@@ -2942,7 +2942,7 @@ FUN(NativeDevice_clipStrokeText)(JNIEnv *env, jobject self, jobject jtext, jobje
if (err)
return;
fz_try(ctx)
- fz_clip_stroke_text(ctx, dev, text, stroke, ctm, NULL);
+ fz_clip_stroke_text(ctx, dev, text, stroke, ctm, fz_infinite_rect);
fz_always(ctx)
unlockNativeDevice(env, info);
fz_catch(ctx)
@@ -3068,7 +3068,7 @@ FUN(NativeDevice_clipImageMask)(JNIEnv *env, jobject self, jobject jimg, jobject
if (err)
return;
fz_try(ctx)
- fz_clip_image_mask(ctx, dev, img, ctm, NULL);
+ fz_clip_image_mask(ctx, dev, img, ctm, fz_infinite_rect);
fz_always(ctx)
unlockNativeDevice(env, info);
fz_catch(ctx)
@@ -3168,7 +3168,7 @@ FUN(NativeDevice_beginMask)(JNIEnv *env, jobject self, jobject jrect, jboolean l
if (err)
return;
fz_try(ctx)
- fz_begin_mask(ctx, dev, &rect, luminosity, cs, color, &cp);
+ fz_begin_mask(ctx, dev, rect, luminosity, cs, color, &cp);
fz_always(ctx)
unlockNativeDevice(env, info);
fz_catch(ctx)
@@ -3211,7 +3211,7 @@ FUN(NativeDevice_beginGroup)(JNIEnv *env, jobject self, jobject jrect, jboolean
if (err)
return;
fz_try(ctx)
- fz_begin_group(ctx, dev, &rect, NULL, isolated, knockout, blendmode, alpha);
+ fz_begin_group(ctx, dev, rect, NULL, isolated, knockout, blendmode, alpha);
fz_always(ctx)
unlockNativeDevice(env, info);
fz_catch(ctx)
@@ -3257,7 +3257,7 @@ FUN(NativeDevice_beginTile)(JNIEnv *env, jobject self, jobject jarea, jobject jv
if (err)
return 0;
fz_try(ctx)
- i = fz_begin_tile_id(ctx, dev, &area, &view, xstep, ystep, ctm, id);
+ i = fz_begin_tile_id(ctx, dev, area, view, xstep, ystep, ctm, id);
fz_always(ctx)
unlockNativeDevice(env, info);
fz_catch(ctx)
@@ -5805,8 +5805,7 @@ FUN(DisplayList_run)(JNIEnv *env, jobject self, jobject jdev, jobject jctm, jobj
fz_matrix ctm = from_Matrix(env, jctm);
fz_cookie *cookie = from_Cookie(env, jcookie);
NativeDeviceInfo *info;
- fz_rect local_rect;
- fz_rect *rect = NULL;
+ fz_rect rect;
int err;
if (!ctx || !list) return;
@@ -5814,10 +5813,9 @@ FUN(DisplayList_run)(JNIEnv *env, jobject self, jobject jdev, jobject jctm, jobj
/* Use a scissor rectangle if one is supplied */
if (jrect)
- {
- rect = &local_rect;
- local_rect = from_Rect(env, jrect);
- }
+ rect = from_Rect(env, jrect);
+ else
+ rect = fz_infinite_rect;
info = lockNativeDevice(env, jdev, &err);
if (err)
@@ -6335,7 +6333,7 @@ FUN(DocumentWriter_beginPage)(JNIEnv *env, jobject self, jobject jmediabox)
if (!ctx || !wri) return NULL;
fz_try(ctx)
- device = fz_begin_page(ctx, wri, &mediabox);
+ device = fz_begin_page(ctx, wri, mediabox);
fz_catch(ctx)
{
jni_rethrow(env, ctx);
diff --git a/platform/x11/pdfapp.c b/platform/x11/pdfapp.c
index 81e73051..a12cb4c1 100644
--- a/platform/x11/pdfapp.c
+++ b/platform/x11/pdfapp.c
@@ -146,9 +146,9 @@ void pdfapp_setresolution(pdfapp_t *app, int res)
app->resolution = res;
}
-void pdfapp_invert(pdfapp_t *app, const fz_rect *rect)
+void pdfapp_invert(pdfapp_t *app, fz_rect rect)
{
- fz_invert_pixmap_rect(app->ctx, app->image, fz_round_rect(*rect));
+ fz_invert_pixmap_rect(app->ctx, app->image, fz_round_rect(rect));
}
void pdfapp_reloadfile(pdfapp_t *app)
@@ -784,12 +784,12 @@ static void pdfapp_recreate_annotationslist(pdfapp_t *app)
app->errored = errored;
}
-static void pdfapp_runpage(pdfapp_t *app, fz_device *dev, const fz_matrix ctm, const fz_rect *rect, fz_cookie *cookie)
+static void pdfapp_runpage(pdfapp_t *app, fz_device *dev, const fz_matrix ctm, fz_rect scissor, fz_cookie *cookie)
{
if (app->page_list)
- fz_run_display_list(app->ctx, app->page_list, dev, ctm, rect, cookie);
+ fz_run_display_list(app->ctx, app->page_list, dev, ctm, scissor, cookie);
if (app->annotations_list)
- fz_run_display_list(app->ctx, app->annotations_list, dev, ctm, rect, cookie);
+ fz_run_display_list(app->ctx, app->annotations_list, dev, ctm, scissor, cookie);
}
#define MAX_TITLE 256
@@ -818,7 +818,7 @@ static void pdfapp_updatepage(pdfapp_t *app)
idev = fz_new_draw_device_with_bbox(app->ctx, fz_identity, app->image, &ibounds);
fz_try(app->ctx)
{
- pdfapp_runpage(app, idev, ctm, &bounds, NULL);
+ pdfapp_runpage(app, idev, ctm, bounds, NULL);
fz_close_device(app->ctx, idev);
}
fz_always(app->ctx)
@@ -885,7 +885,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repai
tdev = fz_new_stext_device(app->ctx, app->page_text, NULL);
fz_try(app->ctx)
{
- pdfapp_runpage(app, tdev, fz_identity, &fz_infinite_rect, &cookie);
+ pdfapp_runpage(app, tdev, fz_identity, fz_infinite_rect, &cookie);
fz_close_device(app->ctx, tdev);
}
fz_always(app->ctx)
@@ -936,7 +936,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repai
if (app->page_list || app->annotations_list)
{
idev = fz_new_draw_device(app->ctx, fz_identity, app->image);
- pdfapp_runpage(app, idev, ctm, &bounds, &cookie);
+ pdfapp_runpage(app, idev, ctm, bounds, &cookie);
fz_close_device(app->ctx, idev);
}
if (app->invert)
@@ -1052,7 +1052,7 @@ void pdfapp_inverthit(pdfapp_t *app)
{
bbox = fz_rect_from_quad(app->hit_bbox[i]);
bbox = fz_transform_rect(bbox, ctm);
- pdfapp_invert(app, &bbox);
+ pdfapp_invert(app, bbox);
}
}
diff --git a/platform/x11/pdfapp.h b/platform/x11/pdfapp.h
index 0315bfd0..318ebd89 100644
--- a/platform/x11/pdfapp.h
+++ b/platform/x11/pdfapp.h
@@ -164,7 +164,7 @@ void pdfapp_autozoom_horizontal(pdfapp_t *app);
void pdfapp_autozoom_vertical(pdfapp_t *app);
void pdfapp_autozoom(pdfapp_t *app);
-void pdfapp_invert(pdfapp_t *app, const fz_rect *rect);
+void pdfapp_invert(pdfapp_t *app, fz_rect rect);
void pdfapp_inverthit(pdfapp_t *app);
void pdfapp_postblit(pdfapp_t *app);
diff --git a/platform/x11/x11_main.c b/platform/x11/x11_main.c
index 7e5942bf..bdc13dfc 100644
--- a/platform/x11/x11_main.c
+++ b/platform/x11/x11_main.c
@@ -539,7 +539,7 @@ static void winblit(pdfapp_t *app)
if (gapp.iscopying || justcopied)
{
- pdfapp_invert(&gapp, &gapp.selr);
+ pdfapp_invert(&gapp, gapp.selr);
justcopied = 1;
}
@@ -582,7 +582,7 @@ static void winblit(pdfapp_t *app)
if (gapp.iscopying || justcopied)
{
- pdfapp_invert(&gapp, &gapp.selr);
+ pdfapp_invert(&gapp, gapp.selr);
justcopied = 1;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-26 04:18:24 +0000