rename fz_colornode to fz_solidnode

7 files changed, 29 insertions, 29 deletions

diff --git a/include/fitz/tree.h b/include/fitz/tree.h
index 69143b1f..324b8098 100644
--- a/include/fitz/tree.h
+++ b/include/fitz/tree.h
@@ -36,7 +36,7 @@ typedef struct fz_masknode_s fz_masknode;
 typedef struct fz_blendnode_s fz_blendnode;
 typedef struct fz_pathnode_s fz_pathnode;
 typedef struct fz_textnode_s fz_textnode;
-typedef struct fz_colornode_s fz_colornode;
+typedef struct fz_solidnode_s fz_solidnode;
 typedef struct fz_imagenode_s fz_imagenode;
 typedef struct fz_shadenode_s fz_shadenode;
 typedef struct fz_linknode_s fz_linknode;
@@ -117,7 +117,7 @@ struct fz_blendnode_s
 	int knockout;
 };
 
-struct fz_colornode_s
+struct fz_solidnode_s
 {
 	fz_node super;
 	fz_colorspace *cs;
@@ -170,12 +170,12 @@ int fz_ismetanode(fz_node *node);
 
 /* leaf nodes */
 fz_error *fz_newlinknode(fz_node **nodep, fz_tree *subtree);
-fz_error *fz_newcolornode(fz_node **nodep, fz_colorspace *cs, int n, float *v);
+fz_error *fz_newsolidnode(fz_node **nodep, fz_colorspace *cs, int n, float *v);
 fz_error *fz_newimagenode(fz_node **nodep, fz_image *image);
 fz_error *fz_newshadenode(fz_node **nodep, fz_shade *shade);
 
 int fz_islinknode(fz_node *node);
-int fz_iscolornode(fz_node *node);
+int fz_issolidnode(fz_node *node);
 int fz_ispathnode(fz_node *node);
 int fz_istextnode(fz_node *node);
 int fz_isimagenode(fz_node *node);
diff --git a/mupdf/pdf_build.c b/mupdf/pdf_build.c
index 40f71d0f..4fc2b48c 100644
--- a/mupdf/pdf_build.c
+++ b/mupdf/pdf_build.c
@@ -221,7 +221,7 @@ addcolorshape(pdf_gstate *gs, fz_node *shape, fz_colorspace *cs, float *v)
 	error = fz_newmasknode(&mask);
 	if (error) return error;
 
-	error = fz_newcolornode(&solid, cs, cs->n, v);
+	error = fz_newsolidnode(&solid, cs, cs->n, v);
 	if (error) return error;
 
 	fz_insertnodelast(mask, shape);
@@ -393,7 +393,7 @@ addshadeshape(pdf_gstate *gs, fz_node *shape, fz_shade *shade)
 		error = fz_newovernode(&over);
 		if (error) return error;
 
-		error = fz_newcolornode(&bgnd, shade->cs, shade->cs->n, shade->background);
+		error = fz_newsolidnode(&bgnd, shade->cs, shade->cs->n, shade->background);
 		if (error) return error;
 
 		fz_insertnodelast(mask, shape);
diff --git a/raster/render.c b/raster/render.c
index 36a9ed97..690ba227 100644
--- a/raster/render.c
+++ b/raster/render.c
@@ -101,7 +101,7 @@ DEBUG("}\n");
  */
 
 static fz_error *
-rendercolor(fz_renderer *gc, fz_colornode *color, fz_matrix ctm)
+rendersolid(fz_renderer *gc, fz_solidnode *solid, fz_matrix ctm)
 {
 	fz_error *error;
 	float rgb[3];
@@ -113,12 +113,12 @@ rendercolor(fz_renderer *gc, fz_colornode *color, fz_matrix ctm)
 	if (gc->model->n != 3)
 		return fz_throw("assert: non-rgb renderer");
 
-	fz_convertcolor(color->cs, color->samples, gc->model, rgb);
+	fz_convertcolor(solid->cs, solid->samples, gc->model, rgb);
 	gc->rgb[0] = rgb[0] * 255;
 	gc->rgb[1] = rgb[1] * 255;
 	gc->rgb[2] = rgb[2] * 255;
 
-DEBUG("color %s [%d %d %d];\n", color->cs->name, gc->rgb[0], gc->rgb[1], gc->rgb[2]);
+DEBUG("solid %s [%d %d %d];\n", solid->cs->name, gc->rgb[0], gc->rgb[1], gc->rgb[2]);
 
 	if (gc->flag == FOVER)
 	{
@@ -661,11 +661,11 @@ rendermask(fz_renderer *gc, fz_masknode *mask, fz_matrix ctm)
 	/* special case black voodo */
 	if (gc->flag & FOVER)
 	{
-		if (fz_iscolornode(color))
+		if (fz_issolidnode(color))
 		{
-			fz_colornode *colorn = (fz_colornode*)color;
+			fz_solidnode *solid = (fz_solidnode*)color;
 
-			fz_convertcolor(colorn->cs, colorn->samples, gc->model, rgb);
+			fz_convertcolor(solid->cs, solid->samples, gc->model, rgb);
 			gc->rgb[0] = rgb[0] * 255;
 			gc->rgb[1] = rgb[1] * 255;
 			gc->rgb[2] = rgb[2] * 255;
@@ -779,7 +779,7 @@ rendernode(fz_renderer *gc, fz_node *node, fz_matrix ctm)
 	case FZ_NTRANSFORM:
 		return rendertransform(gc, (fz_transformnode*)node, ctm);
 	case FZ_NCOLOR:
-		return rendercolor(gc, (fz_colornode*)node, ctm);
+		return rendersolid(gc, (fz_solidnode*)node, ctm);
 	case FZ_NPATH:
 		return renderpath(gc, (fz_pathnode*)node, ctm);
 	case FZ_NTEXT:
diff --git a/world/node_misc1.c b/world/node_misc1.c
index 7ddd9167..53dfd873 100644
--- a/world/node_misc1.c
+++ b/world/node_misc1.c
@@ -12,7 +12,7 @@ fz_rect fz_boundtransformnode(fz_transformnode* node, fz_matrix ctm);
 fz_rect fz_boundovernode(fz_overnode* node, fz_matrix ctm);
 fz_rect fz_boundmasknode(fz_masknode* node, fz_matrix ctm);
 fz_rect fz_boundblendnode(fz_blendnode* node, fz_matrix ctm);
-fz_rect fz_boundcolornode(fz_colornode* node, fz_matrix ctm);
+fz_rect fz_boundsolidnode(fz_solidnode* node, fz_matrix ctm);
 fz_rect fz_boundpathnode(fz_pathnode* node, fz_matrix ctm);
 fz_rect fz_boundtextnode(fz_textnode* node, fz_matrix ctm);
 fz_rect fz_boundimagenode(fz_imagenode* node, fz_matrix ctm);
@@ -83,7 +83,7 @@ fz_boundnode(fz_node *node, fz_matrix ctm)
 	case FZ_NBLEND:
 		return fz_boundblendnode((fz_blendnode *) node, ctm);
 	case FZ_NCOLOR:
-		return fz_boundcolornode((fz_colornode *) node, ctm);
+		return fz_boundsolidnode((fz_solidnode *) node, ctm);
 	case FZ_NPATH:
 		return fz_boundpathnode((fz_pathnode *) node, ctm);
 	case FZ_NTEXT:
@@ -125,7 +125,7 @@ fz_isblendnode(fz_node *node)
 }
 
 int
-fz_iscolornode(fz_node *node)
+fz_issolidnode(fz_node *node)
 {
 	return node ? node->kind == FZ_NCOLOR : 0;
 }
diff --git a/world/node_misc2.c b/world/node_misc2.c
index 6446d52f..5234cbc8 100644
--- a/world/node_misc2.c
+++ b/world/node_misc2.c
@@ -230,12 +230,12 @@ fz_boundlinknode(fz_linknode *node, fz_matrix ctm)
  */
 
 fz_error *
-fz_newcolornode(fz_node **nodep, fz_colorspace *cs, int n, float *v)
+fz_newsolidnode(fz_node **nodep, fz_colorspace *cs, int n, float *v)
 {
-	fz_colornode *node;
+	fz_solidnode *node;
 	int i;
 
-	node = fz_malloc(sizeof(fz_colornode) + sizeof(float) * n);
+	node = fz_malloc(sizeof(fz_solidnode) + sizeof(float) * n);
 	if (!node)
 		return fz_outofmem;
 	*nodep = (fz_node*)node;
@@ -250,13 +250,13 @@ fz_newcolornode(fz_node **nodep, fz_colorspace *cs, int n, float *v)
 }
 
 fz_rect
-fz_boundcolornode(fz_colornode *node, fz_matrix ctm)
+fz_boundsolidnode(fz_solidnode *node, fz_matrix ctm)
 {
 	return fz_infiniterect;
 }
 
 void
-fz_dropcolornode(fz_colornode *node)
+fz_dropsolidnode(fz_solidnode *node)
 {
 	fz_dropcolorspace(node->cs);
 }
diff --git a/world/node_optimize.c b/world/node_optimize.c
index 49893aeb..ffb2c646 100644
--- a/world/node_optimize.c
+++ b/world/node_optimize.c
@@ -5,7 +5,7 @@
  * Remove (mask ... white) until we get something not white
  */
 
-static int iswhitenode(fz_colornode *node)
+static int iswhitenode(fz_solidnode *node)
 {
 	if (!strcmp(node->cs->name, "DeviceGray"))
 		return fabs(node->samples[0] - 1.0) < FLT_EPSILON;
@@ -38,9 +38,9 @@ static int cleanwhite(fz_node *node)
 			return 1;
 		else if (fz_isshadenode(current))
 			return 1;
-		else if (fz_iscolornode(current))
+		else if (fz_issolidnode(current))
 		{
-			if (!iswhitenode((fz_colornode*)current))
+			if (!iswhitenode((fz_solidnode*)current))
 				return 1;
 		}
 
@@ -48,9 +48,9 @@ static int cleanwhite(fz_node *node)
 		{
 			shape = current->first;
 			color = shape->next;
-			if (fz_iscolornode(color))
+			if (fz_issolidnode(color))
 			{
-				if (iswhitenode((fz_colornode*)color))
+				if (iswhitenode((fz_solidnode*)color))
 					fz_removenode(current);
 				else
 					return 1;
@@ -264,7 +264,7 @@ static fz_error *clean1x1(fz_node *node)
 
 					fz_droppixmap(pix);
 
-					error = fz_newcolornode(&color, image->cs, image->n, v);
+					error = fz_newsolidnode(&color, image->cs, image->n, v);
 					if (error)
 						return error;
 					error = fz_newmasknode(&mask);
diff --git a/world/node_toxml.c b/world/node_toxml.c
index b7cd6c15..42ef6f9c 100644
--- a/world/node_toxml.c
+++ b/world/node_toxml.c
@@ -68,7 +68,7 @@ static void xmltransform(fz_transformnode *node, int level)
 	printf("</transform>\n");
 }
 
-static void xmlcolor(fz_colornode *node, int level)
+static void xmlsolid(fz_solidnode *node, int level)
 {
 	int i;
 	indent(level);
@@ -175,7 +175,7 @@ static void xmlnode(fz_node *node, int level)
 	case FZ_NMASK: xmlmask((fz_masknode*)node, level); break;
 	case FZ_NBLEND: xmlblend((fz_blendnode*)node, level); break;
 	case FZ_NTRANSFORM: xmltransform((fz_transformnode*)node, level); break;
-	case FZ_NCOLOR: xmlcolor((fz_colornode*)node, level); break;
+	case FZ_NCOLOR: xmlsolid((fz_solidnode*)node, level); break;
 	case FZ_NPATH: xmlpath((fz_pathnode*)node, level); break;
 	case FZ_NTEXT: xmltext((fz_textnode*)node, level); break;
 	case FZ_NIMAGE: xmlimage((fz_imagenode*)node, level); break;