summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--draw/meshdraw.c8
-rw-r--r--fitz/dev_draw.c2
-rw-r--r--fitz/dev_null.c2
-rw-r--r--fitz/fitz.h8
-rw-r--r--fitz/res_shade.c12
-rw-r--r--mupdf/mupdf.h2
-rw-r--r--mupdf/pdf_build.c24
-rw-r--r--mupdf/pdf_interpret.c22
-rw-r--r--mupdf/pdf_shade.c24
9 files changed, 52 insertions, 52 deletions
diff --git a/draw/meshdraw.c b/draw/meshdraw.c
index 80b80378..f40af8c3 100644
--- a/draw/meshdraw.c
+++ b/draw/meshdraw.c
@@ -498,7 +498,7 @@ fz_paintmesh(fz_shade *shade, fz_matrix ctm, fz_pixmap *dest, fz_bbox bbox)
if (shade->usefunction)
ntris = shade->meshlen / 9;
else
- ntris = shade->meshlen / ((2 + shade->cs->n) * 3);
+ ntris = shade->meshlen / ((2 + shade->colorspace->n) * 3);
while (ntris--)
{
@@ -513,10 +513,10 @@ fz_paintmesh(fz_shade *shade, fz_matrix ctm, fz_pixmap *dest, fz_bbox bbox)
tri[k][2] = *mesh++ * 255;
else
{
- fz_convertcolor(shade->cs, mesh, dest->colorspace, tri[k] + 2);
+ fz_convertcolor(shade->colorspace, mesh, dest->colorspace, tri[k] + 2);
for (i = 0; i < dest->colorspace->n; i++)
tri[k][i + 2] *= 255;
- mesh += shade->cs->n;
+ mesh += shade->colorspace->n;
}
}
fz_painttriangle(dest, tri[0], tri[1], tri[2], 2 + dest->colorspace->n, bbox);
@@ -537,7 +537,7 @@ fz_paintshade(fz_shade *shade, fz_matrix ctm, fz_pixmap *dest, fz_bbox bbox)
{
for (i = 0; i < 256; i++)
{
- fz_convertcolor(shade->cs, shade->function[i], dest->colorspace, color);
+ fz_convertcolor(shade->colorspace, shade->function[i], dest->colorspace, color);
for (k = 0; k < dest->colorspace->n; k++)
clut[i][k] = color[k] * 255;
}
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);
diff --git a/mupdf/mupdf.h b/mupdf/mupdf.h
index ba6d9960..cbfeb651 100644
--- a/mupdf/mupdf.h
+++ b/mupdf/mupdf.h
@@ -557,7 +557,7 @@ enum
struct pdf_material_s
{
int kind;
- fz_colorspace *cs;
+ fz_colorspace *colorspace;
pdf_pattern *pattern;
fz_shade *shade;
float alpha;
diff --git a/mupdf/pdf_build.c b/mupdf/pdf_build.c
index 3c9f21d1..4e19db92 100644
--- a/mupdf/pdf_build.c
+++ b/mupdf/pdf_build.c
@@ -16,14 +16,14 @@ pdf_initgstate(pdf_gstate *gs, fz_matrix ctm)
memset(gs->strokestate.dashlist, 0, sizeof(gs->strokestate.dashlist));
gs->stroke.kind = PDF_MCOLOR;
- gs->stroke.cs = fz_keepcolorspace(fz_devicegray);
+ gs->stroke.colorspace = fz_keepcolorspace(fz_devicegray);
gs->stroke.v[0] = 0;
gs->stroke.pattern = nil;
gs->stroke.shade = nil;
gs->stroke.alpha = 1;
gs->fill.kind = PDF_MCOLOR;
- gs->fill.cs = fz_keepcolorspace(fz_devicegray);
+ gs->fill.colorspace = fz_keepcolorspace(fz_devicegray);
gs->fill.v[0] = 0;
gs->fill.pattern = nil;
gs->fill.shade = nil;
@@ -45,7 +45,7 @@ pdf_initgstate(pdf_gstate *gs, fz_matrix ctm)
}
void
-pdf_setcolorspace(pdf_csi *csi, int what, fz_colorspace *cs)
+pdf_setcolorspace(pdf_csi *csi, int what, fz_colorspace *colorspace)
{
pdf_gstate *gs = csi->gstate + csi->gtop;
pdf_material *mat;
@@ -54,10 +54,10 @@ pdf_setcolorspace(pdf_csi *csi, int what, fz_colorspace *cs)
mat = what == PDF_MFILL ? &gs->fill : &gs->stroke;
- fz_dropcolorspace(mat->cs);
+ fz_dropcolorspace(mat->colorspace);
mat->kind = PDF_MCOLOR;
- mat->cs = fz_keepcolorspace(cs);
+ mat->colorspace = fz_keepcolorspace(colorspace);
mat->v[0] = 0;
mat->v[1] = 0;
@@ -80,13 +80,13 @@ pdf_setcolor(pdf_csi *csi, int what, float *v)
{
case PDF_MPATTERN:
case PDF_MCOLOR:
- if (!strcmp(mat->cs->name, "Lab"))
+ if (!strcmp(mat->colorspace->name, "Lab"))
{
mat->v[0] = v[0] / 100;
mat->v[1] = (v[1] + 100) / 200;
mat->v[2] = (v[2] + 100) / 200;
}
- for (i = 0; i < mat->cs->n; i++)
+ for (i = 0; i < mat->colorspace->n; i++)
mat->v[i] = v[i];
break;
default:
@@ -310,7 +310,7 @@ pdf_showimage(pdf_csi *csi, fz_pixmap *image)
break;
case PDF_MCOLOR:
csi->dev->fillimagemask(csi->dev->user, image, gstate->ctm,
- gstate->fill.cs, gstate->fill.v, gstate->fill.alpha);
+ gstate->fill.colorspace, gstate->fill.v, gstate->fill.alpha);
break;
case PDF_MPATTERN:
if (gstate->fill.pattern)
@@ -380,7 +380,7 @@ pdf_showpath(pdf_csi *csi, int doclose, int dofill, int dostroke, int evenodd)
break;
case PDF_MCOLOR:
csi->dev->fillpath(csi->dev->user, path, evenodd, gstate->ctm,
- gstate->fill.cs, gstate->fill.v, gstate->fill.alpha);
+ gstate->fill.colorspace, gstate->fill.v, gstate->fill.alpha);
break;
case PDF_MPATTERN:
if (gstate->fill.pattern)
@@ -409,7 +409,7 @@ pdf_showpath(pdf_csi *csi, int doclose, int dofill, int dostroke, int evenodd)
break;
case PDF_MCOLOR:
csi->dev->strokepath(csi->dev->user, path, &gstate->strokestate, gstate->ctm,
- gstate->stroke.cs, gstate->stroke.v, gstate->stroke.alpha);
+ gstate->stroke.colorspace, gstate->stroke.v, gstate->stroke.alpha);
break;
case PDF_MPATTERN:
if (gstate->stroke.pattern)
@@ -487,7 +487,7 @@ pdf_flushtext(pdf_csi *csi)
break;
case PDF_MCOLOR:
csi->dev->filltext(csi->dev->user, text, gstate->ctm,
- gstate->fill.cs, gstate->fill.v, gstate->fill.alpha);
+ gstate->fill.colorspace, gstate->fill.v, gstate->fill.alpha);
break;
case PDF_MPATTERN:
if (gstate->fill.pattern)
@@ -516,7 +516,7 @@ pdf_flushtext(pdf_csi *csi)
break;
case PDF_MCOLOR:
csi->dev->stroketext(csi->dev->user, text, &gstate->strokestate, gstate->ctm,
- gstate->stroke.cs, gstate->stroke.v, gstate->stroke.alpha);
+ gstate->stroke.colorspace, gstate->stroke.v, gstate->stroke.alpha);
break;
case PDF_MPATTERN:
if (gstate->stroke.pattern)
diff --git a/mupdf/pdf_interpret.c b/mupdf/pdf_interpret.c
index da11463f..570f92d1 100644
--- a/mupdf/pdf_interpret.c
+++ b/mupdf/pdf_interpret.c
@@ -57,8 +57,8 @@ pdf_clearstack(pdf_csi *csi)
pdf_material *
pdf_keepmaterial(pdf_material *mat)
{
- if (mat->cs)
- fz_keepcolorspace(mat->cs);
+ if (mat->colorspace)
+ fz_keepcolorspace(mat->colorspace);
if (mat->pattern)
pdf_keeppattern(mat->pattern);
if (mat->shade)
@@ -69,8 +69,8 @@ pdf_keepmaterial(pdf_material *mat)
pdf_material *
pdf_dropmaterial(pdf_material *mat)
{
- if (mat->cs)
- fz_dropcolorspace(mat->cs);
+ if (mat->colorspace)
+ fz_dropcolorspace(mat->colorspace);
if (mat->pattern)
pdf_droppattern(mat->pattern);
if (mat->shade)
@@ -472,7 +472,7 @@ static void pdf_run_Bstar(pdf_csi *csi)
static fz_error pdf_run_cs_imp(pdf_csi *csi, fz_obj *rdb, int what)
{
- fz_colorspace *cs;
+ fz_colorspace *colorspace;
fz_obj *obj, *dict;
fz_error error;
@@ -483,11 +483,11 @@ static fz_error pdf_run_cs_imp(pdf_csi *csi, fz_obj *rdb, int what)
else
{
if (!strcmp(csi->name, "DeviceGray"))
- cs = fz_keepcolorspace(fz_devicegray);
+ colorspace = fz_keepcolorspace(fz_devicegray);
else if (!strcmp(csi->name, "DeviceRGB"))
- cs = fz_keepcolorspace(fz_devicergb);
+ colorspace = fz_keepcolorspace(fz_devicergb);
else if (!strcmp(csi->name, "DeviceCMYK"))
- cs = fz_keepcolorspace(fz_devicecmyk);
+ colorspace = fz_keepcolorspace(fz_devicecmyk);
else
{
dict = fz_dictgets(rdb, "ColorSpace");
@@ -496,14 +496,14 @@ static fz_error pdf_run_cs_imp(pdf_csi *csi, fz_obj *rdb, int what)
obj = fz_dictgets(dict, csi->name);
if (!obj)
return fz_throw("cannot find colorspace resource '%s'", csi->name);
- error = pdf_loadcolorspace(&cs, csi->xref, obj);
+ error = pdf_loadcolorspace(&colorspace, csi->xref, obj);
if (error)
return fz_rethrow(error, "cannot load colorspace (%d 0 R)", fz_tonum(obj));
}
- pdf_setcolorspace(csi, what, cs);
+ pdf_setcolorspace(csi, what, colorspace);
- fz_dropcolorspace(cs);
+ fz_dropcolorspace(colorspace);
}
return fz_okay;
}
diff --git a/mupdf/pdf_shade.c b/mupdf/pdf_shade.c
index 1242c6c8..cf430583 100644
--- a/mupdf/pdf_shade.c
+++ b/mupdf/pdf_shade.c
@@ -30,7 +30,7 @@ pdf_growmesh(fz_shade *shade, int amount)
static void
pdf_addvertex(fz_shade *shade, struct vertex *v)
{
- int ncomp = shade->usefunction ? 1 : shade->cs->n;
+ int ncomp = shade->usefunction ? 1 : shade->colorspace->n;
int i;
pdf_growmesh(shade, 2 + ncomp);
shade->mesh[shade->meshlen++] = v->x;
@@ -331,7 +331,7 @@ pdf_samplecompositeshadefunction(fz_shade *shade, pdf_function *func, float t0,
for (i = 0; i < 256; i++)
{
t = t0 + (i / 255.0f) * (t1 - t0);
- pdf_evalfunction(func, &t, 1, shade->function[i], shade->cs->n);
+ pdf_evalfunction(func, &t, 1, shade->function[i], shade->colorspace->n);
}
}
@@ -413,7 +413,7 @@ pdf_loadfunctionbasedshading(fz_shade *shade, pdf_xref *xref, fz_obj *dict, pdf_
fv[0] = v[i].x;
fv[1] = v[i].y;
- pdf_evalfunction(func, fv, 2, v[i].c, shade->cs->n);
+ pdf_evalfunction(func, fv, 2, v[i].c, shade->colorspace->n);
pt.x = v[i].x;
pt.y = v[i].y;
@@ -625,7 +625,7 @@ pdf_loadtype4shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
pdf_sampleshadefunction(shade, funcs, func, p.c0[0], p.c1[0]);
}
else
- ncomp = shade->cs->n;
+ ncomp = shade->colorspace->n;
while (!fz_iseofbits(stream))
{
@@ -691,7 +691,7 @@ pdf_loadtype5shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
pdf_sampleshadefunction(shade, funcs, func, p.c0[0], p.c1[0]);
}
else
- ncomp = shade->cs->n;
+ ncomp = shade->colorspace->n;
ref = fz_calloc(p.vprow, sizeof(struct vertex));
buf = fz_calloc(p.vprow, sizeof(struct vertex));
@@ -743,7 +743,7 @@ pdf_loadtype6shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
pdf_sampleshadefunction(shade, funcs, func, p.c0[0], p.c1[0]);
}
else
- ncomp = shade->cs->n;
+ ncomp = shade->colorspace->n;
hasprevpatch = 0;
@@ -863,7 +863,7 @@ pdf_loadtype7shade(fz_shade *shade, pdf_xref *xref, fz_obj *dict,
pdf_sampleshadefunction(shade, funcs, func, p.c0[0], p.c1[0]);
}
else
- ncomp = shade->cs->n;
+ ncomp = shade->colorspace->n;
hasprevpatch = 0;
@@ -992,7 +992,7 @@ pdf_loadshadingdict(fz_shade **shadep, pdf_xref *xref, fz_obj *dict, fz_matrix t
shade->meshcap = 0;
shade->mesh = nil;
- shade->cs = nil;
+ shade->colorspace = nil;
funcs = 0;
@@ -1005,20 +1005,20 @@ pdf_loadshadingdict(fz_shade **shadep, pdf_xref *xref, fz_obj *dict, fz_matrix t
fz_dropshade(shade);
return fz_throw("shading colorspace is missing");
}
- error = pdf_loadcolorspace(&shade->cs, xref, obj);
+ error = pdf_loadcolorspace(&shade->colorspace, xref, obj);
if (error)
{
fz_dropshade(shade);
return fz_rethrow(error, "cannot load colorspace (%d %d R)", fz_tonum(obj), fz_togen(obj));
}
- pdf_logshade("colorspace %s\n", shade->cs->name);
+ pdf_logshade("colorspace %s\n", shade->colorspace->name);
obj = fz_dictgets(dict, "Background");
if (obj)
{
pdf_logshade("background\n");
shade->usebackground = 1;
- for (i = 0; i < shade->cs->n; i++)
+ for (i = 0; i < shade->colorspace->n; i++)
shade->background[i] = fz_toreal(fz_arrayget(obj, i));
}
@@ -1043,7 +1043,7 @@ pdf_loadshadingdict(fz_shade **shadep, pdf_xref *xref, fz_obj *dict, fz_matrix t
else if (fz_isarray(obj))
{
funcs = fz_arraylen(obj);
- if (funcs != 1 && funcs != shade->cs->n)
+ if (funcs != 1 && funcs != shade->colorspace->n)
{
error = fz_throw("incorrect number of shading functions");
goto cleanup;
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 03:44:45 +0000