Split PWG code into a separate file.

2 files changed, 201 insertions, 200 deletions

diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c
index 711b33d3..9c346c01 100644
--- a/fitz/res_pixmap.c
+++ b/fitz/res_pixmap.c
@@ -726,206 +726,6 @@ fz_pixmap_size(fz_context *ctx, fz_pixmap * pix)
 	return sizeof(*pix) + pix->n * pix->w * pix->h;
 }
 
-void
-fz_output_pwg_file_header(fz_output *out)
-{
-	static const unsigned char pwgsig[4] = { 'R', 'a', 'S', '2' };
-
-	/* Sync word */
-	fz_write(out, pwgsig, 4);
-}
-
-void
-fz_output_pwg_page(fz_output *out, const fz_pixmap *pixmap, const fz_pwg_options *pwg)
-{
-	static const unsigned char zero[64] = { 0 };
-	unsigned char *sp;
-	int y, x, i, sn, dn, ss;
-	fz_context *ctx;
-
-	if (!out || !pixmap)
-		return;
-
-	ctx = out->ctx;
-
-	if (pixmap->n != 1 && pixmap->n != 2 && pixmap->n != 4)
-		fz_throw(ctx, "pixmap must be grayscale or rgb to write as pwg");
-
-	sn = pixmap->n;
-	dn = pixmap->n;
-	if (dn == 2 || dn == 4)
-		dn--;
-
-	/* Page Header: */
-	fz_write(out, pwg ? pwg->media_class : zero, 64);
-	fz_write(out, pwg ? pwg->media_color : zero, 64);
-	fz_write(out, pwg ? pwg->media_type : zero, 64);
-	fz_write(out, pwg ? pwg->output_type : zero, 64);
-	fz_write_int32be(out, pwg ? pwg->advance_distance : 0);
-	fz_write_int32be(out, pwg ? pwg->advance_media : 0);
-	fz_write_int32be(out, pwg ? pwg->collate : 0);
-	fz_write_int32be(out, pwg ? pwg->cut_media : 0);
-	fz_write_int32be(out, pwg ? pwg->duplex : 0);
-	fz_write_int32be(out, pixmap->xres);
-	fz_write_int32be(out, pixmap->yres);
-	/* CUPS format says that 284->300 are supposed to be the bbox of the
-	 * page in points. PWG says 'Reserved'. */
-	for (i=284; i < 300; i += 4)
-		fz_write(out, zero, 4);
-	fz_write_int32be(out, pwg ? pwg->insert_sheet : 0);
-	fz_write_int32be(out, pwg ? pwg->jog : 0);
-	fz_write_int32be(out, pwg ? pwg->leading_edge : 0);
-	/* CUPS format says that 312->320 are supposed to be the margins of
-	 * the lower left hand edge of page in points. PWG says 'Reserved'. */
-	for (i=312; i < 320; i += 4)
-		fz_write(out, zero, 4);
-	fz_write_int32be(out, pwg ? pwg->manual_feed : 0);
-	fz_write_int32be(out, pwg ? pwg->media_position : 0);
-	fz_write_int32be(out, pwg ? pwg->media_weight : 0);
-	fz_write_int32be(out, pwg ? pwg->mirror_print : 0);
-	fz_write_int32be(out, pwg ? pwg->negative_print : 0);
-	fz_write_int32be(out, pwg ? pwg->num_copies : 0);
-	fz_write_int32be(out, pwg ? pwg->orientation : 0);
-	fz_write_int32be(out, pwg ? pwg->output_face_up : 0);
-	fz_write_int32be(out, pixmap->w * 72/ pixmap->xres);	/* Page size in points */
-	fz_write_int32be(out, pixmap->h * 72/ pixmap->yres);
-	fz_write_int32be(out, pwg ? pwg->separations : 0);
-	fz_write_int32be(out, pwg ? pwg->tray_switch : 0);
-	fz_write_int32be(out, pwg ? pwg->tumble : 0);
-	fz_write_int32be(out, pixmap->w); /* Page image in pixels */
-	fz_write_int32be(out, pixmap->h);
-	fz_write_int32be(out, pwg ? pwg->media_type_num : 0);
-	fz_write_int32be(out, 8); /* Bits per color */
-	fz_write_int32be(out, 8*dn); /* Bits per pixel */
-	fz_write_int32be(out, pixmap->w * dn); /* Bytes per line */
-	fz_write_int32be(out, 0); /* Chunky pixels */
-	fz_write_int32be(out, dn == 1 ? 18 /* Sgray */ : 19 /* Srgb */); /* Colorspace */
-	fz_write_int32be(out, pwg ? pwg->compression : 0);
-	fz_write_int32be(out, pwg ? pwg->row_count : 0);
-	fz_write_int32be(out, pwg ? pwg->row_feed : 0);
-	fz_write_int32be(out, pwg ? pwg->row_step : 0);
-	fz_write_int32be(out, dn); /* Num Colors */
-	for (i=424; i < 452; i += 4)
-		fz_write(out, zero, 4);
-	fz_write_int32be(out, 1); /* TotalPageCount */
-	fz_write_int32be(out, 1); /* CrossFeedTransform */
-	fz_write_int32be(out, 1); /* FeedTransform */
-	fz_write_int32be(out, 0); /* ImageBoxLeft */
-	fz_write_int32be(out, 0); /* ImageBoxTop */
-	fz_write_int32be(out, pixmap->w); /* ImageBoxRight */
-	fz_write_int32be(out, pixmap->h); /* ImageBoxBottom */
-	for (i=480; i < 1668; i += 4)
-		fz_write(out, zero, 4);
-	fz_write(out, pwg ? pwg->rendering_intent : zero, 64);
-	fz_write(out, pwg ? pwg->page_size_name : zero, 64);
-
-	/* Now output the actual bitmap, using a packbits like compression */
-	sp = pixmap->samples;
-	ss = pixmap->w * sn;
-	y = 0;
-	while (y < pixmap->h)
-	{
-		int yrep;
-
-		assert(sp == pixmap->samples + y * ss);
-
-		/* Count the number of times this line is repeated */
-		for (yrep = 1; yrep < 256 && y+yrep < pixmap->h; yrep++)
-		{
-			if (memcmp(sp, sp + yrep * ss, ss) != 0)
-				break;
-		}
-		fz_write_byte(out, yrep-1);
-
-		/* Encode the line */
-		x = 0;
-		while (x < pixmap->w)
-		{
-			int d;
-
-			assert(sp == pixmap->samples + y * ss + x * sn);
-
-			/* How far do we have to look to find a repeated value? */
-			for (d = 1; d < 128 && x+d < pixmap->w; d++)
-			{
-				if (memcmp(sp + (d-1)*sn, sp + d*sn, sn) == 0)
-					break;
-			}
-			if (d == 1)
-			{
-				int xrep;
-
-				/* We immediately have a repeat (or we've hit
-				 * the end of the line). Count the number of
-				 * times this value is repeated. */
-				for (xrep = 1; xrep < 128 && x+xrep < pixmap->w; xrep++)
-				{
-					if (memcmp(sp, sp + xrep*sn, sn) != 0)
-						break;
-				}
-				fz_write_byte(out, xrep-1);
-				fz_write(out, sp, dn);
-				sp += sn*xrep;
-				x += xrep;
-			}
-			else
-			{
-				fz_write_byte(out, 257-d);
-				x += d;
-				while (d > 0)
-				{
-					fz_write(out, sp, dn);
-					sp += sn;
-					d--;
-				}
-			}
-		}
-
-		/* Move to the next line */
-		sp += ss*(yrep-1);
-		y += yrep;
-	}
-}
-
-void
-fz_output_pwg(fz_output *out, const fz_pixmap *pixmap, const fz_pwg_options *pwg)
-{
-	fz_output_pwg_file_header(out);
-	fz_output_pwg_page(out, pixmap, pwg);
-}
-
-void
-fz_write_pwg(fz_context *ctx, fz_pixmap *pixmap, char *filename, int append, const fz_pwg_options *pwg)
-{
-	FILE *fp;
-	fz_output *out = NULL;
-
-	fp = fopen(filename, append ? "ab" : "wb");
-	if (!fp)
-	{
-		fz_throw(ctx, "cannot open file '%s': %s", filename, strerror(errno));
-	}
-
-	fz_var(out);
-
-	fz_try(ctx)
-	{
-		out = fz_new_output_with_file(ctx, fp);
-		if (!append)
-			fz_output_pwg_file_header(out);
-		fz_output_pwg_page(out, pixmap, pwg);
-	}
-	fz_always(ctx)
-	{
-		fz_close_output(out);
-		fclose(fp);
-	}
-	fz_catch(ctx)
-	{
-		fz_rethrow(ctx);
-	}
-}
-
 #ifdef ARCH_ARM
 static void
 fz_subsample_pixmap_ARM(unsigned char *ptr, int w, int h, int f, int factor,
diff --git a/fitz/res_pwg.c b/fitz/res_pwg.c
new file mode 100644
index 00000000..620be86e
--- /dev/null
+++ b/fitz/res_pwg.c
@@ -0,0 +1,201 @@
+#include "fitz-internal.h"
+
+void
+fz_output_pwg_file_header(fz_output *out)
+{
+	static const unsigned char pwgsig[4] = { 'R', 'a', 'S', '2' };
+
+	/* Sync word */
+	fz_write(out, pwgsig, 4);
+}
+
+void
+fz_output_pwg_page(fz_output *out, const fz_pixmap *pixmap, const fz_pwg_options *pwg)
+{
+	static const char zero[64] = { 0 };
+	unsigned char *sp;
+	int y, x, i, sn, dn, ss;
+	fz_context *ctx;
+
+	if (!out || !pixmap)
+		return;
+
+	ctx = out->ctx;
+
+	if (pixmap->n != 1 && pixmap->n != 2 && pixmap->n != 4)
+		fz_throw(ctx, "pixmap must be grayscale or rgb to write as pwg");
+
+	sn = pixmap->n;
+	dn = pixmap->n;
+	if (dn == 2 || dn == 4)
+		dn--;
+
+	/* Page Header: */
+	fz_write(out, pwg ? pwg->media_class : zero, 64);
+	fz_write(out, pwg ? pwg->media_color : zero, 64);
+	fz_write(out, pwg ? pwg->media_type : zero, 64);
+	fz_write(out, pwg ? pwg->output_type : zero, 64);
+	fz_write_int32be(out, pwg ? pwg->advance_distance : 0);
+	fz_write_int32be(out, pwg ? pwg->advance_media : 0);
+	fz_write_int32be(out, pwg ? pwg->collate : 0);
+	fz_write_int32be(out, pwg ? pwg->cut_media : 0);
+	fz_write_int32be(out, pwg ? pwg->duplex : 0);
+	fz_write_int32be(out, pixmap->xres);
+	fz_write_int32be(out, pixmap->yres);
+	/* CUPS format says that 284->300 are supposed to be the bbox of the
+	 * page in points. PWG says 'Reserved'. */
+	for (i=284; i < 300; i += 4)
+		fz_write(out, zero, 4);
+	fz_write_int32be(out, pwg ? pwg->insert_sheet : 0);
+	fz_write_int32be(out, pwg ? pwg->jog : 0);
+	fz_write_int32be(out, pwg ? pwg->leading_edge : 0);
+	/* CUPS format says that 312->320 are supposed to be the margins of
+	 * the lower left hand edge of page in points. PWG says 'Reserved'. */
+	for (i=312; i < 320; i += 4)
+		fz_write(out, zero, 4);
+	fz_write_int32be(out, pwg ? pwg->manual_feed : 0);
+	fz_write_int32be(out, pwg ? pwg->media_position : 0);
+	fz_write_int32be(out, pwg ? pwg->media_weight : 0);
+	fz_write_int32be(out, pwg ? pwg->mirror_print : 0);
+	fz_write_int32be(out, pwg ? pwg->negative_print : 0);
+	fz_write_int32be(out, pwg ? pwg->num_copies : 0);
+	fz_write_int32be(out, pwg ? pwg->orientation : 0);
+	fz_write_int32be(out, pwg ? pwg->output_face_up : 0);
+	fz_write_int32be(out, pixmap->w * 72/ pixmap->xres);	/* Page size in points */
+	fz_write_int32be(out, pixmap->h * 72/ pixmap->yres);
+	fz_write_int32be(out, pwg ? pwg->separations : 0);
+	fz_write_int32be(out, pwg ? pwg->tray_switch : 0);
+	fz_write_int32be(out, pwg ? pwg->tumble : 0);
+	fz_write_int32be(out, pixmap->w); /* Page image in pixels */
+	fz_write_int32be(out, pixmap->h);
+	fz_write_int32be(out, pwg ? pwg->media_type_num : 0);
+	fz_write_int32be(out, 8); /* Bits per color */
+	fz_write_int32be(out, 8*dn); /* Bits per pixel */
+	fz_write_int32be(out, pixmap->w * dn); /* Bytes per line */
+	fz_write_int32be(out, 0); /* Chunky pixels */
+	fz_write_int32be(out, dn == 1 ? 18 /* Sgray */ : 19 /* Srgb */); /* Colorspace */
+	fz_write_int32be(out, pwg ? pwg->compression : 0);
+	fz_write_int32be(out, pwg ? pwg->row_count : 0);
+	fz_write_int32be(out, pwg ? pwg->row_feed : 0);
+	fz_write_int32be(out, pwg ? pwg->row_step : 0);
+	fz_write_int32be(out, dn); /* Num Colors */
+	for (i=424; i < 452; i += 4)
+		fz_write(out, zero, 4);
+	fz_write_int32be(out, 1); /* TotalPageCount */
+	fz_write_int32be(out, 1); /* CrossFeedTransform */
+	fz_write_int32be(out, 1); /* FeedTransform */
+	fz_write_int32be(out, 0); /* ImageBoxLeft */
+	fz_write_int32be(out, 0); /* ImageBoxTop */
+	fz_write_int32be(out, pixmap->w); /* ImageBoxRight */
+	fz_write_int32be(out, pixmap->h); /* ImageBoxBottom */
+	for (i=480; i < 1668; i += 4)
+		fz_write(out, zero, 4);
+	fz_write(out, pwg ? pwg->rendering_intent : zero, 64);
+	fz_write(out, pwg ? pwg->page_size_name : zero, 64);
+
+	/* Now output the actual bitmap, using a packbits like compression */
+	sp = pixmap->samples;
+	ss = pixmap->w * sn;
+	y = 0;
+	while (y < pixmap->h)
+	{
+		int yrep;
+
+		assert(sp == pixmap->samples + y * ss);
+
+		/* Count the number of times this line is repeated */
+		for (yrep = 1; yrep < 256 && y+yrep < pixmap->h; yrep++)
+		{
+			if (memcmp(sp, sp + yrep * ss, ss) != 0)
+				break;
+		}
+		fz_write_byte(out, yrep-1);
+
+		/* Encode the line */
+		x = 0;
+		while (x < pixmap->w)
+		{
+			int d;
+
+			assert(sp == pixmap->samples + y * ss + x * sn);
+
+			/* How far do we have to look to find a repeated value? */
+			for (d = 1; d < 128 && x+d < pixmap->w; d++)
+			{
+				if (memcmp(sp + (d-1)*sn, sp + d*sn, sn) == 0)
+					break;
+			}
+			if (d == 1)
+			{
+				int xrep;
+
+				/* We immediately have a repeat (or we've hit
+				 * the end of the line). Count the number of
+				 * times this value is repeated. */
+				for (xrep = 1; xrep < 128 && x+xrep < pixmap->w; xrep++)
+				{
+					if (memcmp(sp, sp + xrep*sn, sn) != 0)
+						break;
+				}
+				fz_write_byte(out, xrep-1);
+				fz_write(out, sp, dn);
+				sp += sn*xrep;
+				x += xrep;
+			}
+			else
+			{
+				fz_write_byte(out, 257-d);
+				x += d;
+				while (d > 0)
+				{
+					fz_write(out, sp, dn);
+					sp += sn;
+					d--;
+				}
+			}
+		}
+
+		/* Move to the next line */
+		sp += ss*(yrep-1);
+		y += yrep;
+	}
+}
+
+void
+fz_output_pwg(fz_output *out, const fz_pixmap *pixmap, const fz_pwg_options *pwg)
+{
+	fz_output_pwg_file_header(out);
+	fz_output_pwg_page(out, pixmap, pwg);
+}
+
+void
+fz_write_pwg(fz_context *ctx, fz_pixmap *pixmap, char *filename, int append, const fz_pwg_options *pwg)
+{
+	FILE *fp;
+	fz_output *out = NULL;
+
+	fp = fopen(filename, append ? "ab" : "wb");
+	if (!fp)
+	{
+		fz_throw(ctx, "cannot open file '%s': %s", filename, strerror(errno));
+	}
+
+	fz_var(out);
+
+	fz_try(ctx)
+	{
+		out = fz_new_output_with_file(ctx, fp);
+		if (!append)
+			fz_output_pwg_file_header(out);
+		fz_output_pwg_page(out, pixmap, pwg);
+	}
+	fz_always(ctx)
+	{
+		fz_close_output(out);
+		fclose(fp);
+	}
+	fz_catch(ctx)
+	{
+		fz_rethrow(ctx);
+	}
+}