xps: Rearrange files, part two.

17 files changed, 0 insertions, 367 deletions

diff --git a/xps/xpscommon.c b/xps/xps_common.c
index 7e489ef7..7e489ef7 100644
--- a/xps/xpscommon.c
+++ b/xps/xps_common.c
diff --git a/xps/xpsdoc.c b/xps/xps_doc.c
index 94fb32d7..94fb32d7 100644
--- a/xps/xpsdoc.c
+++ b/xps/xps_doc.c
diff --git a/xps/xpsglyphs.c b/xps/xps_glyphs.c
index 91c7dbcd..91c7dbcd 100644
--- a/xps/xpsglyphs.c
+++ b/xps/xps_glyphs.c
diff --git a/xps/xpsgradient.c b/xps/xps_gradient.c
index 8c877a0b..8c877a0b 100644
--- a/xps/xpsgradient.c
+++ b/xps/xps_gradient.c
diff --git a/xps/xpshash.c b/xps/xps_hash.c
index 71e97097..71e97097 100644
--- a/xps/xpshash.c
+++ b/xps/xps_hash.c
diff --git a/xps/xpsimage.c b/xps/xps_image.c
index ced58bb5..ced58bb5 100644
--- a/xps/xpsimage.c
+++ b/xps/xps_image.c
diff --git a/xps/xpsjpeg.c b/xps/xps_jpeg.c
index 4dc2a7e4..4dc2a7e4 100644
--- a/xps/xpsjpeg.c
+++ b/xps/xps_jpeg.c
diff --git a/xps/xpspage.c b/xps/xps_page.c
index 7659a1a7..7659a1a7 100644
--- a/xps/xpspage.c
+++ b/xps/xps_page.c
diff --git a/xps/xpspath.c b/xps/xps_path.c
index 00e57bee..00e57bee 100644
--- a/xps/xpspath.c
+++ b/xps/xps_path.c
diff --git a/xps/xpspng.c b/xps/xps_png.c
index f59be56d..f59be56d 100644
--- a/xps/xpspng.c
+++ b/xps/xps_png.c
diff --git a/xps/xpsresource.c b/xps/xps_resource.c
index 59dc3f9d..59dc3f9d 100644
--- a/xps/xpsresource.c
+++ b/xps/xps_resource.c
diff --git a/xps/xpstiff.c b/xps/xps_tiff.c
index 4c977ab1..4c977ab1 100644
--- a/xps/xpstiff.c
+++ b/xps/xps_tiff.c
diff --git a/xps/xpstile.c b/xps/xps_tile.c
index 82ec543f..82ec543f 100644
--- a/xps/xpstile.c
+++ b/xps/xps_tile.c
diff --git a/xps/xpsmem.c b/xps/xps_util.c
index 76175d68..76175d68 100644
--- a/xps/xpsmem.c
+++ b/xps/xps_util.c
diff --git a/xps/xpsxml.c b/xps/xps_xml.c
index 397b68ec..397b68ec 100644
--- a/xps/xpsxml.c
+++ b/xps/xps_xml.c
diff --git a/xps/xpszip.c b/xps/xps_zip.c
index ad708bcb..ad708bcb 100644
--- a/xps/xpszip.c
+++ b/xps/xps_zip.c
diff --git a/xps/xpstop.c b/xps/xpstop.c
deleted file mode 100644
index 921d677a..00000000
--- a/xps/xpstop.c
+++ /dev/null
@@ -1,367 +0,0 @@
-#include "fitz.h"
-#include "muxps.h"
-
-#ifdef _MSC_VER
-#include <winsock2.h>
-#else
-#include <sys/time.h>
-#endif
-
-char *output = NULL;
-float resolution = 72;
-
-int showxml = 0;
-int showtext = 0;
-int showtime = 0;
-int showmd5 = 0;
-int savealpha = 0;
-int uselist = 1;
-
-fz_colorspace *colorspace;
-fz_glyphcache *glyphcache;
-char *filename;
-
-struct {
-	int count, total;
-	int min, max;
-	int minpage, maxpage;
-} timing;
-
-static void die(fz_error error)
-{
-	fz_catch(error, "aborting");
-	exit(1);
-}
-
-static void usage(void)
-{
-	fprintf(stderr,
-		"usage: xpsdraw [options] input.xps [pages]\n"
-		"\t-o -\toutput filename (%%d for page number)\n"
-		"\t\tsupported formats: pgm, ppm, pam, png\n"
-		"\t-r -\tresolution in dpi (default: 72)\n"
-		"\t-a\tsave alpha channel (only pam and png)\n"
-		"\t-g\trender in grayscale\n"
-		"\t-m\tshow timing information\n"
-		"\t-t\tshow text (-tt for xml)\n"
-		"\t-x\tshow display list\n"
-		"\t-d\tdisable use of display list\n"
-		"\t-5\tshow md5 checksums\n"
-		"\tpages\tcomma separated list of ranges\n");
-	exit(1);
-}
-
-static int gettime(void)
-{
-	static struct timeval first;
-	static int once = 1;
-	struct timeval now;
-	if (once)
-	{
-		gettimeofday(&first, NULL);
-		once = 0;
-	}
-	gettimeofday(&now, NULL);
-	return (now.tv_sec - first.tv_sec) * 1000 + (now.tv_usec - first.tv_usec) / 1000;
-}
-
-static int isrange(char *s)
-{
-	while (*s)
-	{
-		if ((*s < '0' || *s > '9') && *s != '-' && *s != ',')
-			return 0;
-		s++;
-	}
-	return 1;
-}
-
-static void
-xps_run_page(xps_context *ctx, xps_page *page, fz_device *dev, fz_matrix ctm)
-{
-	ctx->dev = dev;
-	xps_parse_fixed_page(ctx, ctm, page);
-	ctx->dev = nil;
-}
-
-static void drawpage(xps_context *ctx, int pagenum)
-{
-	xps_page *page;
-	fz_displaylist *list;
-	fz_device *dev;
-	int start;
-
-	if (showtime)
-	{
-		start = gettime();
-	}
-
-	page = xps_load_page(ctx, pagenum - 1);
-	if (!page)
-		die(fz_throw("cannot load page %d in file '%s'", pagenum, filename));
-
-	list = nil;
-
-	if (uselist)
-	{
-		list = fz_newdisplaylist();
-		dev = fz_newlistdevice(list);
-		xps_run_page(ctx, page, dev, fz_identity);
-		fz_freedevice(dev);
-	}
-
-	if (showxml)
-	{
-		dev = fz_newtracedevice();
-		printf("<page number=\"%d\">\n", pagenum);
-		if (list)
-			fz_executedisplaylist(list, dev, fz_identity);
-		else
-			xps_run_page(ctx, page, dev, fz_identity);
-		printf("</page>\n");
-		fz_freedevice(dev);
-	}
-
-	if (showtext)
-	{
-		fz_textspan *text = fz_newtextspan();
-		dev = fz_newtextdevice(text);
-		if (list)
-			fz_executedisplaylist(list, dev, fz_identity);
-		else
-			xps_run_page(ctx, page, dev, fz_identity);
-		fz_freedevice(dev);
-		printf("[Page %d]\n", pagenum);
-		if (showtext > 1)
-			fz_debugtextspanxml(text);
-		else
-			fz_debugtextspan(text);
-		printf("\n");
-		fz_freetextspan(text);
-	}
-
-	if (showmd5 || showtime)
-		printf("page %s %d", filename, pagenum);
-
-	if (output || showmd5 || showtime)
-	{
-		float zoom;
-		fz_matrix ctm;
-		fz_rect rect;
-		fz_bbox bbox;
-		fz_pixmap *pix;
-
-		rect.x0 = rect.y0 = 0;
-		rect.x1 = page->width;
-		rect.y1 = page->height;
-
-		zoom = resolution / 72;
-		ctm = fz_translate(0, -page->height);
-		ctm = fz_concat(ctm, fz_scale(zoom, zoom));
-		bbox = fz_roundrect(fz_transformrect(ctm, rect));
-
-		/* TODO: banded rendering and multi-page ppm */
-
-		pix = fz_newpixmapwithrect(colorspace, bbox);
-
-		if (savealpha)
-			fz_clearpixmap(pix);
-		else
-			fz_clearpixmapwithcolor(pix, 255);
-
-		dev = fz_newdrawdevice(glyphcache, pix);
-		if (list)
-			fz_executedisplaylist(list, dev, ctm);
-		else
-			xps_run_page(ctx, page, dev, ctm);
-		fz_freedevice(dev);
-
-		if (output)
-		{
-			char buf[512];
-			sprintf(buf, output, pagenum);
-			if (strstr(output, ".pgm") || strstr(output, ".ppm") || strstr(output, ".pnm"))
-				fz_writepnm(pix, buf);
-			else if (strstr(output, ".pam"))
-				fz_writepam(pix, buf, savealpha);
-			else if (strstr(output, ".png"))
-				fz_writepng(pix, buf, savealpha);
-		}
-
-		if (showmd5)
-		{
-			fz_md5 md5;
-			unsigned char digest[16];
-			int i;
-
-			fz_md5init(&md5);
-			fz_md5update(&md5, pix->samples, pix->w * pix->h * pix->n);
-			fz_md5final(&md5, digest);
-
-			printf(" ");
-			for (i = 0; i < 16; i++)
-				printf("%02x", digest[i]);
-		}
-
-		fz_droppixmap(pix);
-	}
-
-	if (list)
-		fz_freedisplaylist(list);
-
-	if (showtime)
-	{
-		int end = gettime();
-		int diff = end - start;
-
-		if (diff < timing.min)
-		{
-			timing.min = diff;
-			timing.minpage = pagenum;
-		}
-		if (diff > timing.max)
-		{
-			timing.max = diff;
-			timing.maxpage = pagenum;
-		}
-		timing.total += diff;
-		timing.count ++;
-
-		printf(" %dms", diff);
-	}
-
-	if (showmd5 || showtime)
-		printf("\n");
-}
-
-
-static void drawrange(xps_context *ctx, char *range)
-{
-	int page, spage, epage;
-	char *spec, *dash;
-
-	spec = fz_strsep(&range, ",");
-	while (spec)
-	{
-		dash = strchr(spec, '-');
-
-		if (dash == spec)
-			spage = epage = xps_count_pages(ctx);
-		else
-			spage = epage = atoi(spec);
-
-		if (dash)
-		{
-			if (strlen(dash) > 1)
-				epage = atoi(dash + 1);
-			else
-				epage = xps_count_pages(ctx);
-		}
-
-		spage = CLAMP(spage, 1, xps_count_pages(ctx));
-		epage = CLAMP(epage, 1, xps_count_pages(ctx));
-
-		if (spage < epage)
-			for (page = spage; page <= epage; page++)
-				drawpage(ctx, page);
-		else
-			for (page = spage; page >= epage; page--)
-				drawpage(ctx, page);
-
-		spec = fz_strsep(&range, ",");
-	}
-}
-
-int main(int argc, char **argv)
-{
-	int grayscale = 0;
-	int accelerate = 1;
-	xps_context *ctx;
-	int code;
-	int c;
-
-	while ((c = fz_getopt(argc, argv, "o:p:r:Aadgmtx5")) != -1)
-	{
-		switch (c)
-		{
-		case 'o': output = fz_optarg; break;
-		case 'r': resolution = atof(fz_optarg); break;
-		case 'A': accelerate = 0; break;
-		case 'a': savealpha = 1; break;
-		case 'm': showtime++; break;
-		case 't': showtext++; break;
-		case 'x': showxml++; break;
-		case '5': showmd5++; break;
-		case 'g': grayscale++; break;
-		case 'd': uselist = 0; break;
-		default: usage(); break;
-		}
-	}
-
-	if (fz_optind == argc)
-		usage();
-
-	if (!showtext && !showxml && !showtime && !showmd5 && !output)
-	{
-		printf("nothing to do\n");
-		exit(0);
-	}
-
-	if (accelerate)
-		fz_accelerate();
-
-	glyphcache = fz_newglyphcache();
-
-	colorspace = fz_devicergb;
-	if (grayscale)
-		colorspace = fz_devicegray;
-	if (output && strstr(output, ".pgm"))
-		colorspace = fz_devicegray;
-	if (output && strstr(output, ".ppm"))
-		colorspace = fz_devicergb;
-
-	timing.count = 0;
-	timing.total = 0;
-	timing.min = 1 << 30;
-	timing.max = 0;
-	timing.minpage = 0;
-	timing.maxpage = 0;
-
-	if (showxml)
-		printf("<?xml version=\"1.0\"?>\n");
-
-	while (fz_optind < argc)
-	{
-		filename = argv[fz_optind++];
-
-		ctx = xps_new_context();
-		code = xps_open_file(ctx, filename);
-		if (code)
-			die(fz_rethrow(code, "cannot open document: %s", filename));
-
-		if (showxml)
-			printf("<document name=\"%s\">\n", filename);
-
-		if (fz_optind == argc || !isrange(argv[fz_optind]))
-			drawrange(ctx, "1-");
-		if (fz_optind < argc && isrange(argv[fz_optind]))
-			drawrange(ctx, argv[fz_optind++]);
-
-		if (showxml)
-			printf("</document>\n");
-
-		xps_free_context(ctx);
-	}
-
-	if (showtime)
-	{
-		printf("total %dms / %d pages for an average of %dms\n",
-			timing.total, timing.count, timing.total / timing.count);
-		printf("fastest page %d: %dms\n", timing.minpage, timing.min);
-		printf("slowest page %d: %dms\n", timing.maxpage, timing.max);
-	}
-
-	fz_freeglyphcache(glyphcache);
-
-	return 0;
-}