Make naming of effective overprint argument consistent.

4 files changed, 7 insertions, 7 deletions

diff --git a/include/mupdf/fitz/shade.h b/include/mupdf/fitz/shade.h
index 98f7ad22..a03b6f1c 100644
--- a/include/mupdf/fitz/shade.h
+++ b/include/mupdf/fitz/shade.h
@@ -136,7 +136,7 @@ fz_rect fz_bound_shade(fz_context *ctx, fz_shade *shade, fz_matrix ctm);
 
 	op: NULL, or pointer to overprint bitmap.
 */
-void fz_paint_shade(fz_context *ctx, fz_shade *shade, fz_colorspace *override_cs, fz_matrix ctm, fz_pixmap *dest, const fz_color_params *color_params, fz_irect bbox, const fz_overprint *op);
+void fz_paint_shade(fz_context *ctx, fz_shade *shade, fz_colorspace *override_cs, fz_matrix ctm, fz_pixmap *dest, const fz_color_params *color_params, fz_irect bbox, const fz_overprint *eop);
 
 /*
  *	Handy routine for processing mesh based shades
diff --git a/source/fitz/draw-imp.h b/source/fitz/draw-imp.h
index 1d6e691a..df783609 100644
--- a/source/fitz/draw-imp.h
+++ b/source/fitz/draw-imp.h
@@ -463,7 +463,7 @@ void fz_paint_pixmap(fz_pixmap *dst, const fz_pixmap *src, int alpha);
 void fz_paint_pixmap_alpha(fz_pixmap *dst, const fz_pixmap *src, int alpha);
 void fz_paint_pixmap_with_mask(fz_pixmap *dst, const fz_pixmap *src, const fz_pixmap *msk);
 void fz_paint_pixmap_with_bbox(fz_pixmap *dst, const fz_pixmap *src, int alpha, fz_irect bbox);
-void fz_paint_pixmap_with_overprint(fz_pixmap *dst, const fz_pixmap *src, const fz_overprint *op);
+void fz_paint_pixmap_with_overprint(fz_pixmap *dst, const fz_pixmap *src, const fz_overprint *eop);
 
 void fz_blend_pixmap(fz_context *ctx, fz_pixmap *dst, fz_pixmap *src, int alpha, int blendmode, int isolated, const fz_pixmap *shape);
 void fz_blend_pixmap_knockout(fz_context *ctx, fz_pixmap *dst, fz_pixmap *src, const fz_pixmap *shape);
diff --git a/source/fitz/draw-mesh.c b/source/fitz/draw-mesh.c
index adc9aa1f..039009d2 100644
--- a/source/fitz/draw-mesh.c
+++ b/source/fitz/draw-mesh.c
@@ -211,7 +211,7 @@ do_paint_tri(fz_context *ctx, void *arg, fz_vertex *av, fz_vertex *bv, fz_vertex
 }
 
 void
-fz_paint_shade(fz_context *ctx, fz_shade *shade, fz_colorspace *colorspace, fz_matrix ctm, fz_pixmap *dest, const fz_color_params *color_params, fz_irect bbox, const fz_overprint *op)
+fz_paint_shade(fz_context *ctx, fz_shade *shade, fz_colorspace *colorspace, fz_matrix ctm, fz_pixmap *dest, const fz_color_params *color_params, fz_irect bbox, const fz_overprint *eop)
 {
 	unsigned char clut[256][FZ_MAX_COLORS];
 	fz_pixmap *temp = NULL;
@@ -342,7 +342,7 @@ fz_paint_shade(fz_context *ctx, fz_shade *shade, fz_colorspace *colorspace, fz_m
 					s += temp->stride - temp->w * temp->n;
 				}
 			}
-			fz_paint_pixmap_with_overprint(dest, conv, op);
+			fz_paint_pixmap_with_overprint(dest, conv, eop);
 		}
 	}
 	fz_always(ctx)
diff --git a/source/fitz/draw-paint.c b/source/fitz/draw-paint.c
index 72ac2de0..c437fa52 100644
--- a/source/fitz/draw-paint.c
+++ b/source/fitz/draw-paint.c
@@ -2333,7 +2333,7 @@ fz_paint_pixmap_alpha(fz_pixmap * FZ_RESTRICT dst, const fz_pixmap * FZ_RESTRICT
 }
 
 void
-fz_paint_pixmap_with_overprint(fz_pixmap * FZ_RESTRICT dst, const fz_pixmap * FZ_RESTRICT src, const fz_overprint *op)
+fz_paint_pixmap_with_overprint(fz_pixmap * FZ_RESTRICT dst, const fz_pixmap * FZ_RESTRICT src, const fz_overprint *eop)
 {
 	const unsigned char *sp;
 	unsigned char *dp;
@@ -2363,14 +2363,14 @@ fz_paint_pixmap_with_overprint(fz_pixmap * FZ_RESTRICT dst, const fz_pixmap * FZ
 	da = dst->alpha;
 
 	n -= sa;
-	fn = fz_get_span_painter(da, sa, n, 255, op);
+	fn = fz_get_span_painter(da, sa, n, 255, eop);
 	assert(fn);
 	if (fn == NULL)
 		return;
 
 	while (h--)
 	{
-		(*fn)(dp, da, sp, sa, n, w, 255, op);
+		(*fn)(dp, da, sp, sa, n, w, 255, eop);
 		sp += src->stride;
 		dp += dst->stride;
 	}