Silence warnings.

5 files changed, 21 insertions, 18 deletions

diff --git a/xps/xps_glyphs.c b/xps/xps_glyphs.c
index 1b926dfc..76015fb7 100644
--- a/xps/xps_glyphs.c
+++ b/xps/xps_glyphs.c
@@ -380,7 +380,6 @@ xps_parse_glyphs(xps_document *doc, const fz_matrix *ctm,
 	char *opacity_mask_uri;
 
 	char *bidi_level_att;
-	char *caret_stops_att;
 	char *fill_att;
 	char *font_size_att;
 	char *font_uri_att;
@@ -425,7 +424,6 @@ xps_parse_glyphs(xps_document *doc, const fz_matrix *ctm,
 	 */
 
 	bidi_level_att = fz_xml_att(root, "BidiLevel");
-	caret_stops_att = fz_xml_att(root, "CaretStops");
 	fill_att = fz_xml_att(root, "Fill");
 	font_size_att = fz_xml_att(root, "FontRenderingEmSize");
 	font_uri_att = fz_xml_att(root, "FontUri");
diff --git a/xps/xps_gradient.c b/xps/xps_gradient.c
index 3b4a2b88..17178f84 100644
--- a/xps/xps_gradient.c
+++ b/xps/xps_gradient.c
@@ -444,9 +444,7 @@ xps_parse_gradient_brush(xps_document *doc, const fz_matrix *ctm, const fz_rect
 	fz_xml *node;
 
 	char *opacity_att;
-	char *interpolation_att;
 	char *spread_att;
-	char *mapping_att;
 	char *transform_att;
 
 	fz_xml *transform_tag = NULL;
@@ -458,9 +456,7 @@ xps_parse_gradient_brush(xps_document *doc, const fz_matrix *ctm, const fz_rect
 	int spread_method;
 
 	opacity_att = fz_xml_att(root, "Opacity");
-	interpolation_att = fz_xml_att(root, "ColorInterpolationMode");
 	spread_att = fz_xml_att(root, "SpreadMethod");
-	mapping_att = fz_xml_att(root, "MappingMode");
 	transform_att = fz_xml_att(root, "Transform");
 
 	for (node = fz_xml_down(root); node; node = fz_xml_next(node))
diff --git a/xps/xps_image.c b/xps/xps_image.c
index d0561bf7..f0406c5b 100644
--- a/xps/xps_image.c
+++ b/xps/xps_image.c
@@ -26,8 +26,8 @@ xps_paint_image_brush(xps_document *doc, const fz_matrix *ctm, const fz_rect *ar
 	fz_fill_image(doc->dev, image, &local_ctm, doc->opacity[doc->opacity_top]);
 }
 
-static xps_part *
-xps_find_image_brush_source_part(xps_document *doc, char *base_uri, fz_xml *root)
+static void
+xps_find_image_brush_source_part(xps_document *doc, char *base_uri, fz_xml *root, xps_part **image_part, xps_part **profile_part)
 {
 	char *image_source_att;
 	char buf[1024];
@@ -71,9 +71,22 @@ xps_find_image_brush_source_part(xps_document *doc, char *base_uri, fz_xml *root
 	if (!image_name)
 		fz_throw(doc->ctx, "cannot find image source");
 
-	xps_resolve_url(partname, base_uri, image_name, sizeof partname);
+	if (image_part)
+	{
+		xps_resolve_url(partname, base_uri, image_name, sizeof partname);
+		*image_part = xps_read_part(doc, partname);
+	}
 
-	return xps_read_part(doc, partname);
+	if (profile_part)
+	{
+		if (profile_name)
+		{
+			xps_resolve_url(partname, base_uri, profile_name, sizeof partname);
+			*profile_part = xps_read_part(doc, partname);
+		}
+		else
+			*profile_part = NULL;
+	}
 }
 
 void
@@ -85,7 +98,7 @@ xps_parse_image_brush(xps_document *doc, const fz_matrix *ctm, const fz_rect *ar
 
 	fz_try(doc->ctx)
 	{
-		part = xps_find_image_brush_source_part(doc, base_uri, root);
+		xps_find_image_brush_source_part(doc, base_uri, root, &part, NULL);
 	}
 	fz_catch(doc->ctx)
 	{
diff --git a/xps/xps_tile.c b/xps/xps_tile.c
index 15fad420..e508719d 100644
--- a/xps/xps_tile.c
+++ b/xps/xps_tile.c
@@ -75,8 +75,6 @@ xps_parse_tiling_brush(xps_document *doc, const fz_matrix *ctm, const fz_rect *a
 	char *viewbox_att;
 	char *viewport_att;
 	char *tile_mode_att;
-	char *viewbox_units_att;
-	char *viewport_units_att;
 
 	fz_xml *transform_tag = NULL;
 
@@ -92,8 +90,6 @@ xps_parse_tiling_brush(xps_document *doc, const fz_matrix *ctm, const fz_rect *a
 	viewbox_att = fz_xml_att(root, "Viewbox");
 	viewport_att = fz_xml_att(root, "Viewport");
 	tile_mode_att = fz_xml_att(root, "TileMode");
-	viewbox_units_att = fz_xml_att(root, "ViewboxUnits");
-	viewport_units_att = fz_xml_att(root, "ViewportUnits");
 
 	c.base_uri = base_uri;
 	c.dict = dict;
diff --git a/xps/xps_zip.c b/xps/xps_zip.c
index 0db4f042..8aa48662 100644
--- a/xps/xps_zip.c
+++ b/xps/xps_zip.c
@@ -103,7 +103,7 @@ xps_read_zip_entry(xps_document *doc, xps_entry *ent, unsigned char *outbuf)
 	z_stream stream;
 	unsigned char *inbuf;
 	int sig;
-	int version, general, method;
+	int method;
 	int namelength, extralength;
 	int code;
 	fz_context *ctx = doc->ctx;
@@ -116,8 +116,8 @@ xps_read_zip_entry(xps_document *doc, xps_entry *ent, unsigned char *outbuf)
 		fz_throw(doc->ctx, "wrong zip local file signature (0x%x)", sig);
 	}
 
-	version = getshort(doc->file);
-	general = getshort(doc->file);
+	(void) getshort(doc->file); /* version */
+	(void) getshort(doc->file); /* general */
 	method = getshort(doc->file);
 	(void) getshort(doc->file); /* file time */
 	(void) getshort(doc->file); /* file date */