This commit was generated by cvs2svn to compensate for changes in r274,

which included commits to RCS files with non-trunk default branches.

git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@275 06663e23-700e-0410-b217-a244a6096597

1 files changed, 63 insertions, 35 deletions

diff --git a/gs/src/gdevmrop.h b/gs/src/gdevmrop.h
index 0a0bd0697..dd4a7cb4c 100644
--- a/gs/src/gdevmrop.h
+++ b/gs/src/gdevmrop.h
@@ -1,30 +1,50 @@
-/* Copyright (C) 1995, 1996 Aladdin Enterprises.  All rights reserved.
-  
-  This file is part of Aladdin Ghostscript.
-  
-  Aladdin Ghostscript is distributed with NO WARRANTY OF ANY KIND.  No author
-  or distributor accepts any responsibility for the consequences of using it,
-  or for whether it serves any particular purpose or works at all, unless he
-  or she says so in writing.  Refer to the Aladdin Ghostscript Free Public
-  License (the "License") for full details.
-  
-  Every copy of Aladdin Ghostscript must include a copy of the License,
-  normally in a plain ASCII text file named PUBLIC.  The License grants you
-  the right to copy, modify and redistribute Aladdin Ghostscript, but only
-  under certain conditions described in the License.  Among other things, the
-  License requires that the copyright notice and this notice be preserved on
-  all copies.
-*/
-
-/* gdevmrop.h */
-/* Interfaces to RasterOp implementation */
+/* Copyright (C) 1995, 1996, 1998 Aladdin Enterprises.  All rights reserved.
+
+   This file is part of Aladdin Ghostscript.
+
+   Aladdin Ghostscript is distributed with NO WARRANTY OF ANY KIND.  No author
+   or distributor accepts any responsibility for the consequences of using it,
+   or for whether it serves any particular purpose or works at all, unless he
+   or she says so in writing.  Refer to the Aladdin Ghostscript Free Public
+   License (the "License") for full details.
+
+   Every copy of Aladdin Ghostscript must include a copy of the License,
+   normally in a plain ASCII text file named PUBLIC.  The License grants you
+   the right to copy, modify and redistribute Aladdin Ghostscript, but only
+   under certain conditions described in the License.  Among other things, the
+   License requires that the copyright notice and this notice be preserved on
+   all copies.
+ */
+
+/*Id: gdevmrop.h  */
+/* Definitions for device RasterOp implementations. */
 /* Requires gxdevmem.h, gsropt.h */
 
+#ifndef gdevmrop_INCLUDED
+#  define gdevmrop_INCLUDED
+
 /* Define the table of RasterOp implementation procedures. */
-extern const far_data rop_proc rop_proc_table[256];
+extern const rop_proc rop_proc_table[256];
 
 /* Define the table of RasterOp operand usage. */
-extern const far_data byte /*rop_usage_t*/ rop_usage_table[256];
+extern const byte /*rop_usage_t */ rop_usage_table[256];
+
+/*
+ * Compute the effective RasterOp for the 1-bit case,
+ * taking transparency into account.
+ */
+gs_rop3_t gs_transparent_rop(P1(gs_logical_operation_t lop));
+
+#ifdef DEBUG
+/* Trace a [strip_]copy_rop call. */
+void trace_copy_rop(P16(const char *cname, gx_device * dev,
+			const byte * sdata, int sourcex, uint sraster,
+			gx_bitmap_id id, const gx_color_index * scolors,
+			const gx_strip_bitmap * textures,
+			const gx_color_index * tcolors,
+			int x, int y, int width, int height,
+			int phase_x, int phase_y, gs_logical_operation_t lop));
+#endif
 
 /*
  * PostScript colors normally act as the texture for RasterOp, with a null
@@ -32,32 +52,40 @@ extern const far_data byte /*rop_usage_t*/ rop_usage_table[256];
  * a way to use the image data as the source.  We implement this with a
  * device that applies RasterOp with a specified texture to drawing
  * operations, treating the drawing color as source rather than texture.
- * The texture is a gx_device_color; it may be any type of PostScript color,
- * even a Pattern.
+ * The texture is a gx_device_color; it may be any type of color, even a
+ * pattern.
  */
 #ifndef gx_device_color_DEFINED
 #  define gx_device_color_DEFINED
 typedef struct gx_device_color_s gx_device_color;
+
 #endif
 
 #ifndef gx_device_rop_texture_DEFINED
 #  define gx_device_rop_texture_DEFINED
 typedef struct gx_device_rop_texture_s gx_device_rop_texture;
+
 #endif
 
 struct gx_device_rop_texture_s {
-	gx_device_forward_common;
-	gs_logical_operation_t log_op;
-	const gx_device_color *texture;
+    gx_device_forward_common;
+    gs_logical_operation_t log_op;
+    gx_device_color texture;
 };
-extern_st(st_device_rop_texture);
-#define public_st_device_rop_texture()\
-  gs_public_st_suffix_add1(st_device_rop_texture, gx_device_rop_texture,\
-    "gx_device_rop_texture", device_rop_texture_enum_ptrs, device_rop_texture_reloc_ptrs,\
-    st_device_forward, texture)
+
+#define private_st_device_rop_texture()	/* in gdevrops.c */\
+  gs_private_st_composite(st_device_rop_texture, gx_device_rop_texture,\
+    "gx_device_rop_texture", device_rop_texture_enum_ptrs, device_rop_texture_reloc_ptrs)
+
+/* Create a RasterOp source device. */
+int gx_alloc_rop_texture_device(P3(gx_device_rop_texture ** prsdev,
+				   gs_memory_t * mem,
+				   client_name_t cname));
 
 /* Initialize a RasterOp source device. */
-void gx_make_rop_texture_device(P4(gx_device_rop_texture *rsdev,
-				   gx_device *target,
+void gx_make_rop_texture_device(P4(gx_device_rop_texture * rsdev,
+				   gx_device * target,
 				   gs_logical_operation_t lop,
-				   const gx_device_color *texture));
+				   const gx_device_color * texture));
+
+#endif /* gdevmrop_INCLUDED */