xps: use fitz runtime and remove ghostscript specific code so it compiles.

1 files changed, 8 insertions, 21 deletions

diff --git a/xps/xpsvisual.c b/xps/xpsvisual.c
index f23ef991..0b6fb4da 100644
--- a/xps/xpsvisual.c
+++ b/xps/xpsvisual.c
@@ -1,19 +1,5 @@
-/* Copyright (C) 2006-2010 Artifex Software, Inc.
-   All Rights Reserved.
-
-   This software is provided AS-IS with no warranty, either express or
-   implied.
-
-   This software is distributed under license and may not be copied, modified
-   or distributed except as expressly authorized under the terms of that
-   license.  Refer to licensing information at http://www.artifex.com/
-   or contact Artifex Software, Inc.,  7 Mt. Lassen  Drive - Suite A-134,
-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
-*/
-
-/* XPS interpreter - visual brush functions */
-
-#include "ghostxps.h"
+#include "fitz.h"
+#include "muxps.h"
 
 enum { TILE_NONE, TILE_TILE, TILE_FLIP_X, TILE_FLIP_Y, TILE_FLIP_X_Y };
 
@@ -25,13 +11,14 @@ struct userdata
 };
 
 static int
-xps_paint_visual_brush(xps_context_t *ctx, char *base_uri, xps_resource_t *dict, xps_item_t *root, void *visual_tag)
+xps_paint_visual_brush(xps_context_t *ctx, fz_matrix ctm,
+	char *base_uri, xps_resource_t *dict, xps_item_t *root, void *visual_tag)
 {
-	return xps_parse_element(ctx, base_uri, dict, (xps_item_t *)visual_tag);
+	return xps_parse_element(ctx, ctm, base_uri, dict, (xps_item_t *)visual_tag);
 }
 
 int
-xps_parse_visual_brush(xps_context_t *ctx, char *base_uri, xps_resource_t *dict, xps_item_t *root)
+xps_parse_visual_brush(xps_context_t *ctx, fz_matrix ctm, char *base_uri, xps_resource_t *dict, xps_item_t *root)
 {
 	xps_item_t *node;
 	int code;
@@ -53,9 +40,9 @@ xps_parse_visual_brush(xps_context_t *ctx, char *base_uri, xps_resource_t *dict,
 
 	if (visual_tag)
 	{
-		code = xps_parse_tiling_brush(ctx, visual_uri, dict, root, xps_paint_visual_brush, visual_tag);
+		code = xps_parse_tiling_brush(ctx, ctm, visual_uri, dict, root, xps_paint_visual_brush, visual_tag);
 		if (code)
-			return gs_rethrow(code, "cannot parse tiling brush");
+			return fz_rethrow(code, "cannot parse tiling brush");
 	}
 
 	return 0;