From e173e02141bc77563e94db4523c78c31471af4be Mon Sep 17 00:00:00 2001
From: Robin Watts <Robin.Watts@artifex.com>
Date: Wed, 28 Sep 2016 21:12:55 +0100
Subject: Rename fz_process_mesh to fz_process_shade.
Better name as not all shadings are meshes.
---
source/fitz/draw-mesh.c | 2 +-
source/fitz/shade.c | 36 ++++++++++++++++++------------------
source/fitz/test-device.c | 2 +-
3 files changed, 20 insertions(+), 20 deletions(-)
(limited to 'source')
diff --git a/source/fitz/draw-mesh.c b/source/fitz/draw-mesh.c
index 4f90c461..233a2108 100644
--- a/source/fitz/draw-mesh.c
+++ b/source/fitz/draw-mesh.c
@@ -248,7 +248,7 @@ fz_paint_shade(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_pixmap
ptd.bbox = bbox;
fz_init_cached_color_converter(ctx, &ptd.cc, temp->colorspace, shade->colorspace);
- fz_process_mesh(ctx, shade, &local_ctm, &prepare_mesh_vertex, &do_paint_tri, &ptd);
+ fz_process_shade(ctx, shade, &local_ctm, &prepare_mesh_vertex, &do_paint_tri, &ptd);
if (shade->use_function)
{
diff --git a/source/fitz/shade.c b/source/fitz/shade.c
index 8f82eb72..b4f4b0c7 100644
--- a/source/fitz/shade.c
+++ b/source/fitz/shade.c
@@ -4,8 +4,8 @@ typedef struct fz_mesh_processor_s fz_mesh_processor;
struct fz_mesh_processor_s {
fz_shade *shade;
- fz_mesh_prepare_fn *prepare;
- fz_mesh_process_fn *process;
+ fz_shade_prepare_fn *prepare;
+ fz_shade_process_fn *process;
void *process_arg;
int ncomp;
};
@@ -70,7 +70,7 @@ fz_prepare_vertex(fz_context *ctx, fz_mesh_processor *painter, fz_vertex *v, con
}
static void
-fz_process_mesh_type1(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
+fz_process_shade_type1(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
{
float *p = shade->u.f.fn_vals;
int xdivs = shade->u.f.xdivs;
@@ -127,7 +127,7 @@ fz_point_on_circle(fz_point p, float r, float theta)
}
static void
-fz_process_mesh_type2(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
+fz_process_shade_type2(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
{
fz_point p0, p1, dir;
fz_vertex v0, v1, v2, v3;
@@ -240,7 +240,7 @@ fz_paint_annulus(fz_context *ctx, const fz_matrix *ctm,
}
static void
-fz_process_mesh_type3(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
+fz_process_shade_type3(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
{
fz_point p0, p1;
float r0, r1;
@@ -302,7 +302,7 @@ static inline float read_sample(fz_context *ctx, fz_stream *stream, int bits, fl
}
static void
-fz_process_mesh_type4(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
+fz_process_shade_type4(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
{
fz_stream *stream = fz_open_compressed_buffer(ctx, shade->buffer);
fz_vertex v[4];
@@ -381,7 +381,7 @@ fz_process_mesh_type4(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz
}
static void
-fz_process_mesh_type5(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
+fz_process_shade_type5(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
{
fz_stream *stream = fz_open_compressed_buffer(ctx, shade->buffer);
fz_vertex *buf = NULL;
@@ -696,7 +696,7 @@ make_tensor_patch(tensor_patch *p, int type, fz_point *pt)
#define SUBDIV 3 /* how many levels to subdivide patches */
static void
-fz_process_mesh_type6(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
+fz_process_shade_type6(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
{
fz_stream *stream = fz_open_compressed_buffer(ctx, shade->buffer);
float color_storage[2][4][FZ_MAX_COLORS];
@@ -809,7 +809,7 @@ fz_process_mesh_type6(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz
}
static void
-fz_process_mesh_type7(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
+fz_process_shade_type7(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_mesh_processor *painter)
{
fz_stream *stream = fz_open_compressed_buffer(ctx, shade->buffer);
int bpflag = shade->u.m.bpflag;
@@ -922,8 +922,8 @@ fz_process_mesh_type7(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz
}
void
-fz_process_mesh(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm,
- fz_mesh_prepare_fn *prepare, fz_mesh_process_fn *process, void *process_arg)
+fz_process_shade(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm,
+ fz_shade_prepare_fn *prepare, fz_shade_process_fn *process, void *process_arg)
{
fz_mesh_processor painter;
@@ -934,19 +934,19 @@ fz_process_mesh(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm,
painter.ncomp = (shade->use_function > 0 ? 1 : fz_colorspace_n(ctx, shade->colorspace));
if (shade->type == FZ_FUNCTION_BASED)
- fz_process_mesh_type1(ctx, shade, ctm, &painter);
+ fz_process_shade_type1(ctx, shade, ctm, &painter);
else if (shade->type == FZ_LINEAR)
- fz_process_mesh_type2(ctx, shade, ctm, &painter);
+ fz_process_shade_type2(ctx, shade, ctm, &painter);
else if (shade->type == FZ_RADIAL)
- fz_process_mesh_type3(ctx, shade, ctm, &painter);
+ fz_process_shade_type3(ctx, shade, ctm, &painter);
else if (shade->type == FZ_MESH_TYPE4)
- fz_process_mesh_type4(ctx, shade, ctm, &painter);
+ fz_process_shade_type4(ctx, shade, ctm, &painter);
else if (shade->type == FZ_MESH_TYPE5)
- fz_process_mesh_type5(ctx, shade, ctm, &painter);
+ fz_process_shade_type5(ctx, shade, ctm, &painter);
else if (shade->type == FZ_MESH_TYPE6)
- fz_process_mesh_type6(ctx, shade, ctm, &painter);
+ fz_process_shade_type6(ctx, shade, ctm, &painter);
else if (shade->type == FZ_MESH_TYPE7)
- fz_process_mesh_type7(ctx, shade, ctm, &painter);
+ fz_process_shade_type7(ctx, shade, ctm, &painter);
else
fz_throw(ctx, FZ_ERROR_GENERIC, "Unexpected mesh type %d\n", shade->type);
}
diff --git a/source/fitz/test-device.c b/source/fitz/test-device.c
index 1c1aa628..abe27dbb 100644
--- a/source/fitz/test-device.c
+++ b/source/fitz/test-device.c
@@ -169,7 +169,7 @@ fz_test_fill_shade(fz_context *ctx, fz_device *dev_, fz_shade *shade, const fz_m
struct shadearg arg;
arg.dev = dev;
arg.shade = shade;
- fz_process_mesh(ctx, shade, ctm, prepare_vertex, NULL, &arg);
+ fz_process_shade(ctx, shade, ctm, prepare_vertex, NULL, &arg);
}
}
}
--
cgit v1.2.3