diff options
Diffstat (limited to 'fitz')
| -rw-r--r-- | fitz/dev_draw.c | 2 | ||||
| -rw-r--r-- | fitz/dev_null.c | 2 | ||||
| -rw-r--r-- | fitz/fitz.h | 8 | ||||
| -rw-r--r-- | fitz/res_shade.c | 12 |
4 files changed, 12 insertions, 12 deletions
diff --git a/fitz/dev_draw.c b/fitz/dev_draw.c index 4d3c94f2..d419c2af 100644 --- a/fitz/dev_draw.c +++ b/fitz/dev_draw.c @@ -499,7 +499,7 @@ fz_drawfillshade(void *user, fz_shade *shade, fz_matrix ctm, float alpha) { unsigned char *s; int x, y, n, i; - fz_convertcolor(shade->cs, shade->background, model, colorfv); + fz_convertcolor(shade->colorspace, shade->background, model, colorfv); for (i = 0; i < model->n; i++) colorbv[i] = colorfv[i] * 255; colorbv[i] = 255; diff --git a/fitz/dev_null.c b/fitz/dev_null.c index c48cc2aa..7c80b0ff 100644 --- a/fitz/dev_null.c +++ b/fitz/dev_null.c @@ -15,7 +15,7 @@ static void fz_nullfillshade(void *user, fz_shade *shade, fz_matrix ctm, float a static void fz_nullfillimage(void *user, fz_pixmap *image, fz_matrix ctm, float alpha) {} static void fz_nullfillimagemask(void *user, fz_pixmap *image, fz_matrix ctm, fz_colorspace *colorspace, float *color, float alpha) {} static void fz_nullclipimagemask(void *user, fz_pixmap *image, fz_matrix ctm) {} -static void fz_nullbeginmask(void *user, fz_rect r, int luminosity, fz_colorspace *cs, float *bc) {} +static void fz_nullbeginmask(void *user, fz_rect r, int luminosity, fz_colorspace *colorspace, float *bc) {} static void fz_nullendmask(void *user) {} static void fz_nullbegingroup(void *user, fz_rect r, int isolated, int knockout, fz_blendmode blendmode, float alpha) {} static void fz_nullendgroup(void *user) {} diff --git a/fitz/fitz.h b/fitz/fitz.h index 72af4532..6de8d9b7 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -718,8 +718,8 @@ struct fz_colorspace_s }; fz_colorspace *fz_newcolorspace(char *name, int n); -fz_colorspace *fz_keepcolorspace(fz_colorspace *cs); -void fz_dropcolorspace(fz_colorspace *cs); +fz_colorspace *fz_keepcolorspace(fz_colorspace *colorspace); +void fz_dropcolorspace(fz_colorspace *colorspace); void fz_convertcolor(fz_colorspace *srcs, float *srcv, fz_colorspace *dsts, float *dstv); void fz_convertpixmap(fz_pixmap *src, fz_pixmap *dst); @@ -890,7 +890,7 @@ struct fz_shade_s int refs; fz_rect bbox; /* can be fz_infiniterect */ - fz_colorspace *cs; + fz_colorspace *colorspace; fz_matrix matrix; /* matrix from pattern dict */ int usebackground; /* background color for fills but not 'sh' */ @@ -1015,7 +1015,7 @@ struct fz_device_s void (*popclip)(void *); - void (*beginmask)(void *, fz_rect, int luminosity, fz_colorspace *cs, float *bc); + void (*beginmask)(void *, fz_rect, int luminosity, fz_colorspace *, float *bc); void (*endmask)(void *); void (*begingroup)(void *, fz_rect, int isolated, int knockout, fz_blendmode blendmode, float alpha); void (*endgroup)(void *); diff --git a/fitz/res_shade.c b/fitz/res_shade.c index d6108236..e4afa14a 100644 --- a/fitz/res_shade.c +++ b/fitz/res_shade.c @@ -12,8 +12,8 @@ fz_dropshade(fz_shade *shade) { if (shade && --shade->refs == 0) { - if (shade->cs) - fz_dropcolorspace(shade->cs); + if (shade->colorspace) + fz_dropcolorspace(shade->colorspace); fz_free(shade->mesh); fz_free(shade); } @@ -28,7 +28,7 @@ fz_boundshade(fz_shade *shade, fz_matrix ctm) int i, ncomp, nvert; ctm = fz_concat(shade->matrix, ctm); - ncomp = shade->usefunction ? 3 : 2 + shade->cs->n; + ncomp = shade->usefunction ? 3 : 2 + shade->colorspace->n; nvert = shade->meshlen / ncomp; v = shade->mesh; @@ -82,7 +82,7 @@ fz_debugshade(fz_shade *shade) shade->bbox.x0, shade->bbox.y0, shade->bbox.x1, shade->bbox.y1); - printf("\tcolorspace %s\n", shade->cs->name); + printf("\tcolorspace %s\n", shade->colorspace->name); printf("\tmatrix [%g %g %g %g %g %g]\n", shade->matrix.a, shade->matrix.b, shade->matrix.c, @@ -91,7 +91,7 @@ fz_debugshade(fz_shade *shade) if (shade->usebackground) { printf("\tbackground ["); - for (i = 0; i < shade->cs->n; i++) + for (i = 0; i < shade->colorspace->n; i++) printf("%s%g", i == 0 ? "" : " ", shade->background[i]); printf("]\n"); } @@ -102,7 +102,7 @@ fz_debugshade(fz_shade *shade) n = 3; } else - n = 2 + shade->cs->n; + n = 2 + shade->colorspace->n; printf("\tvertices: %d\n", shade->meshlen); |