[gs-cvs] gs/src
L. Peter Deutsch
lpd at casper.ghostscript.com
Sun Jun 16 00:25:28 PDT 2002
Update of /cvs/ghostscript/gs/src
In directory casper:/tmp/cvs-serv4294/src
Modified Files:
gdev8bcm.h gdevbbox.h gdevbjcl.h gdevbmp.h gdevcgml.h
gdevcmap.h gdevdcrd.h gdevdljm.h gdevfax.h gdevmeds.h
gdevmem.h gdevmpla.h gdevmrop.h gdevmrun.h gdevmswn.h
gdevpccm.h gdevpcfb.h gdevpcl.h gdevpdff.h gdevpdfg.h
gdevpdfo.h gdevpdfx.h gdevplnx.h gdevppla.h gdevprn.h
gdevprna.h gdevpsdf.h gdevpsds.h gdevpsf.h gdevpsu.h
gdevpxut.h gdevstc.h gdevsvga.h gdevtfax.h gdevtifs.h
gdevvec.h gdevx.h
Log Message:
Removes all uses of the now-deprecated Pn macros from driver-related headers
(gdev*.h).
Index: gdev8bcm.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdev8bcm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdev8bcm.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdev8bcm.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -52,12 +52,12 @@
} gx_8bit_color_map;
/* Initialize an 8-bit color map. */
-void gx_8bit_map_init(P2(gx_8bit_color_map *, int));
+void gx_8bit_map_init(gx_8bit_color_map *, int);
/* Look up a color in an 8-bit color map. */
/* Return -1 if not found. */
-int gx_8bit_map_rgb_color(P4(const gx_8bit_color_map *, gx_color_value,
- gx_color_value, gx_color_value));
+int gx_8bit_map_rgb_color(const gx_8bit_color_map *, gx_color_value,
+ gx_color_value, gx_color_value);
/* Test whether an 8-bit color map has room for more entries. */
#define gx_8bit_map_is_full(pcm)\
@@ -65,7 +65,7 @@
/* Add a color to an 8-bit color map. */
/* Return -1 if the map is full. */
-int gx_8bit_add_rgb_color(P4(gx_8bit_color_map *, gx_color_value,
- gx_color_value, gx_color_value));
+int gx_8bit_add_rgb_color(gx_8bit_color_map *, gx_color_value,
+ gx_color_value, gx_color_value);
#endif /* gdev8bcm_INCLUDED */
Index: gdevbbox.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevbbox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevbbox.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevbbox.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -76,19 +76,19 @@
typedef struct gx_device_bbox_procs_s {
#define dev_bbox_proc_init_box(proc)\
- bool proc(P1(void *proc_data))
+ bool proc(void *proc_data)
dev_bbox_proc_init_box((*init_box));
#define dev_bbox_proc_get_box(proc)\
- void proc(P2(const void *proc_data, gs_fixed_rect *pbox))
+ void proc(const void *proc_data, gs_fixed_rect *pbox)
dev_bbox_proc_get_box((*get_box));
#define dev_bbox_proc_add_rect(proc)\
- void proc(P5(void *proc_data, fixed x0, fixed y0, fixed x1, fixed y1))
+ void proc(void *proc_data, fixed x0, fixed y0, fixed x1, fixed y1)
dev_bbox_proc_add_rect((*add_rect));
#define dev_bbox_proc_in_rect(proc)\
- bool proc(P2(const void *proc_data, const gs_fixed_rect *pbox))
+ bool proc(const void *proc_data, const gs_fixed_rect *pbox)
dev_bbox_proc_in_rect((*in_rect));
} gx_device_bbox_procs_t;
@@ -125,20 +125,20 @@
gx_device_finalize, st_device_forward, box_proc_data)
/* Initialize a bounding box device. */
-void gx_device_bbox_init(P2(gx_device_bbox * dev, gx_device * target));
+void gx_device_bbox_init(gx_device_bbox * dev, gx_device * target);
/* Set whether a bounding box device propagates open/close to its target. */
-void gx_device_bbox_fwd_open_close(P2(gx_device_bbox * dev,
- bool forward_open_close));
+void gx_device_bbox_fwd_open_close(gx_device_bbox * dev,
+ bool forward_open_close);
/* Set whether a bounding box device considers white to be opaque. */
-void gx_device_bbox_set_white_opaque(P2(gx_device_bbox *dev,
- bool white_is_opaque));
+void gx_device_bbox_set_white_opaque(gx_device_bbox *dev,
+ bool white_is_opaque);
/* Read back the bounding box in 1/72" units. */
-void gx_device_bbox_bbox(P2(gx_device_bbox * dev, gs_rect * pbbox));
+void gx_device_bbox_bbox(gx_device_bbox * dev, gs_rect * pbbox);
/* Release a bounding box device. */
-void gx_device_bbox_release(P1(gx_device_bbox *dev));
+void gx_device_bbox_release(gx_device_bbox *dev);
#endif /* gdevbbox_INCLUDED */
Index: gdevbjcl.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevbjcl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gdevbjcl.h 21 Feb 2002 22:24:51 -0000 1.5
+++ gdevbjcl.h 16 Jun 2002 07:25:26 -0000 1.6
@@ -195,23 +195,23 @@
*/
/* Carriage return (^M) */
-void bjc_put_CR(P1(stream *s));
+void bjc_put_CR(stream *s);
/* Form feed (^L) */
-void bjc_put_FF(P1(stream *s));
+void bjc_put_FF(stream *s);
/* Line feed (^J) */
-void bjc_put_LF(P1(stream *s));
+void bjc_put_LF(stream *s);
/*
* Session commands.
*/
/* Set initial condition */
-void bjc_put_initial_condition(P1(stream *s));
+void bjc_put_initial_condition(stream *s);
/* Return to initial condition */
-void bjc_put_initialize(P1(stream *s));
+void bjc_put_initialize(stream *s);
/* Select print method */
/****** DIFFERENT FOR 7000 ******/
@@ -241,10 +241,10 @@
BJC_BLACK_DENSITY_NORMAL = 0x0,
BJC_BLACK_DENSITY_HIGH = 0x1
} bjc_black_density_t;
-void bjc_put_print_method(P5(stream *s, bjc_print_color_t color,
- bjc_print_media_t media,
- bjc_print_quality_t quality,
- bjc_black_density_t density));
+void bjc_put_print_method(stream *s, bjc_print_color_t color,
+ bjc_print_media_t media,
+ bjc_print_quality_t quality,
+ bjc_black_density_t density);
typedef enum {
/* 70, 4000, 4550, 4650 */
BJC_70_PRINT_COLOR_SHORT_FINE = 0x0, /* also 0x1, 0x2 */
@@ -267,7 +267,7 @@
BJC_5500_PRINT_COLOR_SHORT_HQ_NON_BLEED = 0x3,
BJC_5500_PRINT_COLOR_SHORT_HIGH_SPEED = 0x4
} bjc_print_color_short_t;
-void bjc_put_print_method_short(P2(stream *s, bjc_print_color_short_t color));
+void bjc_put_print_method_short(stream *s, bjc_print_color_short_t color);
/* Set media supply method */
/****** DIFFERENT FOR 7000 ******/
@@ -303,16 +303,16 @@
BJC_MEDIA_TYPE_FULL_BLEED = 0xc,
BJC_MEDIA_TYPE_BANNER = 0xd
} bjc_media_type_t;
-void bjc_put_media_supply(P3(stream *s, bjc_media_supply_t supply,
- bjc_media_type_t type));
+void bjc_put_media_supply(stream *s, bjc_media_supply_t supply,
+ bjc_media_type_t type);
/* Identify ink cartridge */
typedef enum {
BJC_IDENTIFY_CARTRIDGE_PREPARE = 0x0,
BJC_IDENTIFY_CARTRIDGE_REQUEST = 0x1
} bjc_identify_cartridge_command_t;
-void bjc_put_identify_cartridge(P2(stream *s,
- bjc_identify_cartridge_command_t command));
+void bjc_put_identify_cartridge(stream *s,
+ bjc_identify_cartridge_command_t command);
/*
* Page commands.
@@ -320,17 +320,17 @@
/* Set page margins */
/* Left margin is 1-origin; margins are both from left edge; indent <= 8 */
-void bjc_put_page_margins(P5(stream *s, int length10ths, int lm10ths,
- int rm10ths, int indent60ths));
+void bjc_put_page_margins(stream *s, int length10ths, int lm10ths,
+ int rm10ths, int indent60ths);
/* Set extended margins */
/* All values are 0-origin; margins are both from left edge; indent <= 8 */
-void bjc_put_extended_margins(P5(stream *s, int length60ths, int lm60ths,
- int rm60ths, int indent60ths));
+void bjc_put_extended_margins(stream *s, int length60ths, int lm60ths,
+ int rm60ths, int indent60ths);
/* Page ID */
/* 0 <= id <= 127 */
-void bjc_put_page_id(P2(stream *s, int id));
+void bjc_put_page_id(stream *s, int id);
/*
* Image commands.
@@ -341,15 +341,14 @@
BJC_RASTER_COMPRESSION_NONE = 0x0,
BJC_RASTER_COMPRESSION_PACKBITS = 0x1
} bjc_raster_compression_t;
-void bjc_put_compression(P2(stream *s, bjc_raster_compression_t compression));
+void bjc_put_compression(stream *s, bjc_raster_compression_t compression);
/* Set raster resolution */
-void bjc_put_raster_resolution(P3(stream *s, int x_resolution,
- int y_resolution));
+void bjc_put_raster_resolution(stream *s, int x_resolution, int y_resolution);
/* Raster skip */
/* Maximum skip on 6x0 and 4000 is 0x17ff */
-void bjc_put_raster_skip(P2(stream *s, int skip));
+void bjc_put_raster_skip(stream *s, int skip);
/* CMYK raster image */
typedef enum {
@@ -358,17 +357,17 @@
BJC_CMYK_IMAGE_YELLOW = 'Y',
BJC_CMYK_IMAGE_BLACK = 'K',
} bjc_cmyk_image_component_t;
-void bjc_put_cmyk_image(P4(stream *s, bjc_cmyk_image_component_t component,
- const byte *data, int count));
+void bjc_put_cmyk_image(stream *s, bjc_cmyk_image_component_t component,
+ const byte *data, int count);
/* Move by raster lines */
/* Distance must be a multiple of the raster resolution */
-void bjc_put_move_lines(P2(stream *s, int lines));
+void bjc_put_move_lines(stream *s, int lines);
/* Set unit for movement by raster lines */
/* unit = 360 for printers other than 7000 */
/* unit = 300 or 600 for 7000 */
-void bjc_put_move_lines_unit(P2(stream *s, int unit));
+void bjc_put_move_lines_unit(stream *s, int unit);
/* Set image format */
/* depth is 1 or 2 */
@@ -383,17 +382,16 @@
BJC_INK_SYSTEM_REGULAR_DVM = 0x09, /* drop volume modulation */
BJC_INK_SYSTEM_PHOTO_DVM = 0x0a /* drop volume modulation */
} bjc_ink_system_t;
-void bjc_put_image_format(P4(stream *s, int depth,
- bjc_image_format_t format,
- bjc_ink_system_t ink));
+void bjc_put_image_format(stream *s, int depth,
+ bjc_image_format_t format,
+ bjc_ink_system_t ink);
/* 4550 only */
-void bjc_put_photo_image(P2(stream *s, bool photo));
+void bjc_put_photo_image(stream *s, bool photo);
/* Continue raster image */
-void bjc_put_continue_image(P3(stream *s, const byte *data, int count));
+void bjc_put_continue_image(stream *s, const byte *data, int count);
/* BJ indexed image */
-void bjc_put_indexed_image(P4(stream *s, int dot_rows, int dot_cols,
- int layers));
+void bjc_put_indexed_image(stream *s, int dot_rows, int dot_cols, int layers);
#endif /* gdevbjcl_INCLUDED */
Index: gdevbmp.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevbmp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevbmp.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevbmp.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -25,10 +25,10 @@
#define Y_DPI 72
/* Write the BMP file header. This procedure is used for all formats. */
-int write_bmp_header(P2(gx_device_printer *pdev, FILE *file));
+int write_bmp_header(gx_device_printer *pdev, FILE *file);
/* Write a BMP header for separated CMYK output. */
-int write_bmp_separated_header(P2(gx_device_printer *pdev, FILE *file));
+int write_bmp_separated_header(gx_device_printer *pdev, FILE *file);
/* 24-bit color mappers */
dev_proc_map_rgb_color(bmp_map_16m_rgb_color);
Index: gdevcgml.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevcgml.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevcgml.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevcgml.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -32,8 +32,8 @@
/* Define the type for the allocator used by the CGM writer. */
typedef struct cgm_allocator_s {
void *private_data;
- void *(*alloc) (P2(void *, uint));
- void (*free) (P2(void *, void *));
+ void *(*alloc) (void *, uint);
+ void (*free) (void *, void *);
} cgm_allocator;
/* Define types for CGM coordinates. */
@@ -235,8 +235,8 @@
/* ---------------- Initialize/terminate ---------------- */
-cgm_state *cgm_initialize(P2(FILE *, const cgm_allocator *));
-cgm_result cgm_terminate(P1(cgm_state *));
+cgm_state *cgm_initialize(FILE *, const cgm_allocator *);
+cgm_result cgm_terminate(cgm_state *);
/* ---------------- Metafile elements ---------------- */
@@ -275,9 +275,10 @@
#define cgm_set_CHARACTER_CODING_ANNOUNCER (1L<<13)
cgm_result
-cgm_BEGIN_METAFILE(P3(cgm_state *, const char *, uint)), cgm_set_metafile_elements(P3(cgm_state *,
- const cgm_metafile_elements *, long)),
- cgm_END_METAFILE(P1(cgm_state *));
+ cgm_BEGIN_METAFILE(cgm_state *, const char *, uint),
+ cgm_set_metafile_elements(cgm_state *,
+ const cgm_metafile_elements *, long),
+ cgm_END_METAFILE(cgm_state *);
/* ---------------- Picture elements ---------------- */
@@ -301,82 +302,107 @@
#define cgm_set_BACKGROUND_COLOR (1L<<6)
cgm_result
-cgm_BEGIN_PICTURE(P3(cgm_state *, const char *, uint)), cgm_set_picture_elements(P3(cgm_state *,
- const cgm_picture_elements *, long)),
- cgm_BEGIN_PICTURE_BODY(P1(cgm_state *)), cgm_END_PICTURE(P1(cgm_state *));
+ cgm_BEGIN_PICTURE(cgm_state *, const char *, uint),
+ cgm_set_picture_elements(cgm_state *,
+ const cgm_picture_elements *, long),
+ cgm_BEGIN_PICTURE_BODY(cgm_state *),
+ cgm_END_PICTURE(cgm_state *);
/* ---------------- Control elements ---------------- */
cgm_result
-cgm_VDC_INTEGER_PRECISION(P2(cgm_state *, int)), cgm_VDC_REAL_PRECISION(P2(cgm_state *, const cgm_precision *)),
- cgm_AUXILIARY_COLOR(P2(cgm_state *, const cgm_color *)), cgm_TRANSPARENCY(P2(cgm_state *, cgm_transparency)),
- cgm_CLIP_RECTANGLE(P2(cgm_state *, const cgm_point[2])), cgm_CLIP_INDICATOR(P2(cgm_state *, cgm_clip_indicator));
+ cgm_VDC_INTEGER_PRECISION(cgm_state *, int),
+ cgm_VDC_REAL_PRECISION(cgm_state *, const cgm_precision *),
+ cgm_AUXILIARY_COLOR(cgm_state *, const cgm_color *),
+ cgm_TRANSPARENCY(cgm_state *, cgm_transparency),
+ cgm_CLIP_RECTANGLE(cgm_state *, const cgm_point[2]),
+ cgm_CLIP_INDICATOR(cgm_state *, cgm_clip_indicator);
/* ---------------- Graphical primitive elements ---------------- */
cgm_result
-cgm_POLYLINE(P3(cgm_state *, const cgm_point *, int)), cgm_DISJOINT_POLYLINE(P3(cgm_state *, const cgm_point *, int)),
- cgm_POLYMARKER(P3(cgm_state *, const cgm_point *, int)), cgm_TEXT(P5(cgm_state *, const cgm_point *, bool, const char *, uint)),
- cgm_RESTRICTED_TEXT(P7(cgm_state *, const cgm_vdc *, const cgm_vdc *,
- const cgm_point *, bool, const char *, uint)),
- cgm_APPEND_TEXT(P4(cgm_state *, bool, const char *, uint)), cgm_POLYGON(P3(cgm_state *, const cgm_point *, int)),
- cgm_POLYGON_SET(P3(cgm_state *, const cgm_polygon_edge *, int)), cgm_CELL_ARRAY(P9(cgm_state *, const cgm_point * /*[3] */ , cgm_int,
- cgm_int, cgm_int, cgm_cell_representation_mode,
- const byte *, uint, uint)),
- cgm_RECTANGLE(P3(cgm_state *, const cgm_point *, const cgm_point *)),
- cgm_CIRCLE(P3(cgm_state *, const cgm_point *, const cgm_vdc *)),
- cgm_CIRCULAR_ARC_3_POINT(P4(cgm_state *, const cgm_point *,
- const cgm_point *, const cgm_point *)),
- cgm_CIRCULAR_ARC_3_POINT_CLOSE(P5(cgm_state *, const cgm_point *,
- const cgm_point *,
- const cgm_point *, cgm_arc_closure)),
- cgm_CIRCULAR_ARC_CENTER(P7(cgm_state *, const cgm_point *,
- const cgm_vdc *, const cgm_vdc *,
- const cgm_vdc *, const cgm_vdc *,
- const cgm_vdc *)), cgm_CIRCULAR_ARC_CENTER_CLOSE(P8(cgm_state *, const cgm_point *,
- const cgm_vdc *, const cgm_vdc *,
- const cgm_vdc *, const cgm_vdc *,
- const cgm_vdc *, cgm_arc_closure)),
- cgm_ELLIPSE(P4(cgm_state *, const cgm_point *, const cgm_point *,
- const cgm_point *)), cgm_ELLIPTICAL_ARC(P8(cgm_state *, const cgm_point *,
- const cgm_point *, const cgm_point *,
- const cgm_vdc *, const cgm_vdc *,
- const cgm_vdc *, const cgm_vdc *)),
- cgm_ELLIPTICAL_ARC_CLOSE(P9(cgm_state *, const cgm_point *,
- const cgm_point *, const cgm_point *,
+ cgm_POLYLINE(cgm_state *, const cgm_point *, int),
+ cgm_DISJOINT_POLYLINE(cgm_state *, const cgm_point *, int),
+ cgm_POLYMARKER(cgm_state *, const cgm_point *, int),
+ cgm_TEXT(cgm_state *, const cgm_point *, bool, const char *, uint),
+ cgm_RESTRICTED_TEXT(cgm_state *, const cgm_vdc *, const cgm_vdc *,
+ const cgm_point *, bool, const char *, uint),
+ cgm_APPEND_TEXT(cgm_state *, bool, const char *, uint),
+ cgm_POLYGON(cgm_state *, const cgm_point *, int),
+ cgm_POLYGON_SET(cgm_state *, const cgm_polygon_edge *, int),
+ cgm_CELL_ARRAY(cgm_state *, const cgm_point * /*[3] */ , cgm_int,
+ cgm_int, cgm_int, cgm_cell_representation_mode,
+ const byte *, uint, uint),
+ cgm_RECTANGLE(cgm_state *, const cgm_point *, const cgm_point *),
+ cgm_CIRCLE(cgm_state *, const cgm_point *, const cgm_vdc *),
+ cgm_CIRCULAR_ARC_3_POINT(cgm_state *, const cgm_point *,
+ const cgm_point *, const cgm_point *),
+ cgm_CIRCULAR_ARC_3_POINT_CLOSE(cgm_state *, const cgm_point *,
+ const cgm_point *,
+ const cgm_point *, cgm_arc_closure),
+ cgm_CIRCULAR_ARC_CENTER(cgm_state *, const cgm_point *,
+ const cgm_vdc *, const cgm_vdc *,
+ const cgm_vdc *, const cgm_vdc *,
+ const cgm_vdc *),
+ cgm_CIRCULAR_ARC_CENTER_CLOSE(cgm_state *, const cgm_point *,
const cgm_vdc *, const cgm_vdc *,
const cgm_vdc *, const cgm_vdc *,
- cgm_arc_closure));
+ const cgm_vdc *, cgm_arc_closure),
+ cgm_ELLIPSE(cgm_state *, const cgm_point *, const cgm_point *,
+ const cgm_point *),
+ cgm_ELLIPTICAL_ARC(cgm_state *, const cgm_point *,
+ const cgm_point *, const cgm_point *,
+ const cgm_vdc *, const cgm_vdc *,
+ const cgm_vdc *, const cgm_vdc *),
+ cgm_ELLIPTICAL_ARC_CLOSE(cgm_state *, const cgm_point *,
+ const cgm_point *, const cgm_point *,
+ const cgm_vdc *, const cgm_vdc *,
+ const cgm_vdc *, const cgm_vdc *,
+ cgm_arc_closure);
/* ---------------- Attribute elements ---------------- */
cgm_result
-cgm_LINE_BUNDLE_INDEX(P2(cgm_state *, cgm_int)),
-cgm_LINE_TYPE(P2(cgm_state *, cgm_line_type)),
-cgm_LINE_WIDTH(P2(cgm_state *, const cgm_line_width *)), cgm_LINE_COLOR(P2(cgm_state *, const cgm_color *)),
- cgm_MARKER_BUNDLE_INDEX(P2(cgm_state *, cgm_int)), cgm_MARKER_TYPE(P2(cgm_state *, cgm_marker_type)),
- cgm_MARKER_SIZE(P2(cgm_state *, const cgm_marker_size *)), cgm_MARKER_COLOR(P2(cgm_state *, const cgm_color *)),
- cgm_TEXT_BUNDLE_INDEX(P2(cgm_state *, cgm_int)), cgm_TEXT_FONT_INDEX(P2(cgm_state *, cgm_int)),
- cgm_TEXT_PRECISION(P2(cgm_state *, cgm_text_precision)), cgm_CHARACTER_EXPANSION_FACTOR(P2(cgm_state *, cgm_real)),
- cgm_CHARACTER_SPACING(P2(cgm_state *, cgm_real)), cgm_TEXT_COLOR(P2(cgm_state *, const cgm_color *)),
- cgm_CHARACTER_HEIGHT(P2(cgm_state *, const cgm_vdc *)), cgm_CHARACTER_ORIENTATION(P5(cgm_state *, const cgm_vdc *,
- const cgm_vdc *, const cgm_vdc *,
- const cgm_vdc *)),
- cgm_TEXT_PATH(P2(cgm_state *, cgm_text_path)), cgm_TEXT_ALIGNMENT(P5(cgm_state *, cgm_text_alignment_horizontal,
- cgm_text_alignment_vertical,
- cgm_real, cgm_real)),
- cgm_CHARACTER_SET_INDEX(P2(cgm_state *, cgm_int)), /* The following should be cgm_ALTERNATE_..., but the VAX DEC C */
- /* compiler gives an error for names longer than 31 characters. */
- cgm_ALT_CHARACTER_SET_INDEX(P2(cgm_state *, cgm_int)), cgm_FILL_BUNDLE_INDEX(P2(cgm_state *, cgm_int)),
- cgm_INTERIOR_STYLE(P2(cgm_state *, cgm_interior_style)), cgm_FILL_COLOR(P2(cgm_state *, const cgm_color *)),
- cgm_HATCH_INDEX(P2(cgm_state *, cgm_hatch_index)), cgm_PATTERN_INDEX(P2(cgm_state *, cgm_int)),
- cgm_EDGE_BUNDLE_INDEX(P2(cgm_state *, cgm_int)), cgm_EDGE_TYPE(P2(cgm_state *, cgm_edge_type)),
- cgm_EDGE_WIDTH(P2(cgm_state *, const cgm_edge_width *)), cgm_EDGE_COLOR(P2(cgm_state *, const cgm_color *)),
- cgm_EDGE_VISIBILITY(P2(cgm_state *, bool)), cgm_FILL_REFERENCE_POINT(P2(cgm_state *, const cgm_point *)),
-/* PATTERN_TABLE */
- cgm_PATTERN_SIZE(P5(cgm_state *, const cgm_vdc *, const cgm_vdc *,
- const cgm_vdc *, const cgm_vdc *)), cgm_COLOR_TABLE(P4(cgm_state *, cgm_int, const cgm_color *, int)),
- cgm_ASPECT_SOURCE_FLAGS(P3(cgm_state *,
- const cgm_aspect_source_flag *, int));
+ cgm_LINE_BUNDLE_INDEX(cgm_state *, cgm_int),
+ cgm_LINE_TYPE(cgm_state *, cgm_line_type),
+ cgm_LINE_WIDTH(cgm_state *, const cgm_line_width *),
+ cgm_LINE_COLOR(cgm_state *, const cgm_color *),
+ cgm_MARKER_BUNDLE_INDEX(cgm_state *, cgm_int),
+ cgm_MARKER_TYPE(cgm_state *, cgm_marker_type),
+ cgm_MARKER_SIZE(cgm_state *, const cgm_marker_size *),
+ cgm_MARKER_COLOR(cgm_state *, const cgm_color *),
+ cgm_TEXT_BUNDLE_INDEX(cgm_state *, cgm_int),
+ cgm_TEXT_FONT_INDEX(cgm_state *, cgm_int),
+ cgm_TEXT_PRECISION(cgm_state *, cgm_text_precision),
+ cgm_CHARACTER_EXPANSION_FACTOR(cgm_state *, cgm_real),
+ cgm_CHARACTER_SPACING(cgm_state *, cgm_real),
+ cgm_TEXT_COLOR(cgm_state *, const cgm_color *),
+ cgm_CHARACTER_HEIGHT(cgm_state *, const cgm_vdc *),
+ cgm_CHARACTER_ORIENTATION(cgm_state *, const cgm_vdc *,
+ const cgm_vdc *, const cgm_vdc *,
+ const cgm_vdc *),
+ cgm_TEXT_PATH(cgm_state *, cgm_text_path),
+ cgm_TEXT_ALIGNMENT(cgm_state *, cgm_text_alignment_horizontal,
+ cgm_text_alignment_vertical, cgm_real, cgm_real),
+ cgm_CHARACTER_SET_INDEX(cgm_state *, cgm_int),
+ /* The following should be cgm_ALTERNATE_..., but the VAX DEC C */
+ /* compiler gives an error for names longer than 31 characters. */
+ cgm_ALT_CHARACTER_SET_INDEX(cgm_state *, cgm_int),
+ cgm_FILL_BUNDLE_INDEX(cgm_state *, cgm_int),
+ cgm_INTERIOR_STYLE(cgm_state *, cgm_interior_style),
+ cgm_FILL_COLOR(cgm_state *, const cgm_color *),
+ cgm_HATCH_INDEX(cgm_state *, cgm_hatch_index),
+ cgm_PATTERN_INDEX(cgm_state *, cgm_int),
+ cgm_EDGE_BUNDLE_INDEX(cgm_state *, cgm_int),
+ cgm_EDGE_TYPE(cgm_state *, cgm_edge_type),
+ cgm_EDGE_WIDTH(cgm_state *, const cgm_edge_width *),
+ cgm_EDGE_COLOR(cgm_state *, const cgm_color *),
+ cgm_EDGE_VISIBILITY(cgm_state *, bool),
+ cgm_FILL_REFERENCE_POINT(cgm_state *, const cgm_point *),
+ /* PATTERN_TABLE */
+ cgm_PATTERN_SIZE(cgm_state *, const cgm_vdc *, const cgm_vdc *,
+ const cgm_vdc *, const cgm_vdc *),
+ cgm_COLOR_TABLE(cgm_state *, cgm_int, const cgm_color *, int),
+ cgm_ASPECT_SOURCE_FLAGS(cgm_state *, const cgm_aspect_source_flag *, int);
#endif /* gdevcgml_INCLUDED */
Index: gdevcmap.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevcmap.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevcmap.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevcmap.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -56,8 +56,8 @@
gx_device_finalize, st_device_forward)
/* Initialize a color mapping device. Do this just once after allocation. */
-int gdev_cmap_init(P3(gx_device_cmap * dev, gx_device * target,
- gx_device_color_mapping_method_t mapping_method));
+int gdev_cmap_init(gx_device_cmap * dev, gx_device * target,
+ gx_device_color_mapping_method_t mapping_method);
/*
* Clients can change the color mapping method at any time by setting
Index: gdevdcrd.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevdcrd.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevdcrd.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevdcrd.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -21,7 +21,7 @@
#define gdevdcrd_INCLUDED
/* Implement get_params for a sample device CRD. */
-int sample_device_crd_get_params(P3(gx_device *pdev, gs_param_list *plist,
- const char *crd_param_name));
+int sample_device_crd_get_params(gx_device *pdev, gs_param_list *plist,
+ const char *crd_param_name);
#endif /* gdevdcrd_INCLUDED */
Index: gdevdljm.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevdljm.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gdevdljm.h 21 Feb 2002 22:24:51 -0000 1.6
+++ gdevdljm.h 16 Jun 2002 07:25:26 -0000 1.7
@@ -143,20 +143,20 @@
/* ---------------- Procedures ---------------- */
/* Send a page to the printer. */
-int dljet_mono_print_page(P5(
+int dljet_mono_print_page(
gx_device_printer * pdev, /* from device-specific _print_page */
FILE * prn_stream, /* ibid. */
int dots_per_inch, /* may be a multiple of y resolution */
int features, /* as defined above */
const char *page_init /* page initialization string */
- ));
-int dljet_mono_print_page_copies(P6(
+ );
+int dljet_mono_print_page_copies(
gx_device_printer * pdev,
FILE * prn_stream,
int num_copies,
int dots_per_inch,
int features,
const char *page_init
- ));
+ );
#endif /* gdevdljm_INCLUDED */
Index: gdevfax.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevfax.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevfax.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevfax.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -51,14 +51,14 @@
extern const gx_device_procs gdev_fax_std_procs;
/* Other procedures */
-void gdev_fax_init_state(P2(stream_CFE_state *ss, const gx_device_fax *fdev));
-void gdev_fax_init_fax_state(P2(stream_CFE_state *ss,
- const gx_device_fax *fdev));
-int gdev_fax_print_strip(P7(gx_device_printer * pdev, FILE * prn_stream,
- const stream_template * temp, stream_state * ss,
- int width, int row_first,
- int row_end /* last + 1 */));
-int gdev_fax_print_page(P3(gx_device_printer *pdev, FILE *prn_stream,
- stream_CFE_state *ss));
+void gdev_fax_init_state(stream_CFE_state *ss, const gx_device_fax *fdev);
+void gdev_fax_init_fax_state(stream_CFE_state *ss,
+ const gx_device_fax *fdev);
+int gdev_fax_print_strip(gx_device_printer * pdev, FILE * prn_stream,
+ const stream_template * temp, stream_state * ss,
+ int width, int row_first,
+ int row_end /* last + 1 */);
+int gdev_fax_print_page(gx_device_printer *pdev, FILE *prn_stream,
+ stream_CFE_state *ss);
#endif /* gdevfax_INCLUDED */
Index: gdevmeds.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevmeds.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevmeds.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevmeds.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -22,7 +22,7 @@
#include "gdevprn.h"
-int select_medium(P3(gx_device_printer *pdev, const char **available,
- int default_index));
+int select_medium(gx_device_printer *pdev, const char **available,
+ int default_index);
#endif /* gdevmeds_INCLUDED */
Index: gdevmem.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevmem.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gdevmem.h 21 Feb 2002 22:24:51 -0000 1.5
+++ gdevmem.h 16 Jun 2002 07:25:26 -0000 1.6
@@ -191,7 +191,7 @@
/* Swap a rectangle of bytes, for converting between word- and */
/* byte-oriented representation. */
-void mem_swap_byte_rect(P6(byte *, uint, int, int, int, bool));
+void mem_swap_byte_rect(byte *, uint, int, int, int, bool);
/* Copy a rectangle of bytes from a source to a destination. */
#define mem_copy_byte_rect(mdev, base, sourcex, sraster, x, y, w, h)\
Index: gdevmpla.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevmpla.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevmpla.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevmpla.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -40,7 +40,7 @@
* > 0, plane_depths[0 .. num_planes - 1] > 0, sum of plane_depths <=
* mdev->color_info.depth.
*/
-int gdev_mem_set_planar(P3(gx_device_memory * mdev, int num_planes,
- const gx_render_plane_t *planes /*[num_planes]*/));
+int gdev_mem_set_planar(gx_device_memory * mdev, int num_planes,
+ const gx_render_plane_t *planes /*[num_planes]*/);
#endif /* gdevmpla_INCLUDED */
Index: gdevmrop.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevmrop.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gdevmrop.h 21 Feb 2002 22:24:51 -0000 1.5
+++ gdevmrop.h 16 Jun 2002 07:25:26 -0000 1.6
@@ -25,17 +25,17 @@
* 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));
+gs_rop3_t gs_transparent_rop(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));
+void trace_copy_rop(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
/*
@@ -70,14 +70,14 @@
gx_device_finalize)
/* 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));
+int gx_alloc_rop_texture_device(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,
- gs_logical_operation_t lop,
- const gx_device_color * texture));
+void gx_make_rop_texture_device(gx_device_rop_texture * rsdev,
+ gx_device * target,
+ gs_logical_operation_t lop,
+ const gx_device_color * texture);
#endif /* gdevmrop_INCLUDED */
Index: gdevmrun.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevmrun.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevmrun.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevmrun.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -55,6 +55,6 @@
* Convert a memory device to run-length form. The mdev argument should be
* const, but it isn't because we need to call gx_device_white.
*/
-int gdev_run_from_mem(P2(gx_device_run *rdev, gx_device_memory *mdev));
+int gdev_run_from_mem(gx_device_run *rdev, gx_device_memory *mdev);
#endif /* gdevmrun_INCLUDED */
Index: gdevmswn.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevmswn.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevmswn.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevmswn.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -35,9 +35,9 @@
typedef struct gx_device_win_s gx_device_win;
/* Utility routines in gdevmswn.c */
-LPLOGPALETTE win_makepalette(P1(gx_device_win *));
-int win_nomemory(P0());
-void win_update(P1(gx_device_win *));
+LPLOGPALETTE win_makepalette(gx_device_win *);
+int win_nomemory(void);
+void win_update(gx_device_win *);
/* Device procedures shared by all implementations. */
/* Implementations may wrap their own code around _open and _close. */
@@ -55,16 +55,16 @@
/* Common part of the device descriptor. */
#define win_proc_copy_to_clipboard(proc)\
- void proc(P1(gx_device_win *))
+ void proc(gx_device_win *)
#define win_proc_repaint(proc)\
- void proc(P8(gx_device_win *, HDC, int, int, int, int, int, int))
+ void proc(gx_device_win *, HDC, int, int, int, int, int, int)
#define win_proc_alloc_bitmap(proc)\
- int proc(P2(gx_device_win *, gx_device *))
+ int proc(gx_device_win *, gx_device *)
#define win_proc_free_bitmap(proc)\
- void proc(P1(gx_device_win *))
+ void proc(gx_device_win *)
#define win_gsview_sizeof 80
Index: gdevpccm.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpccm.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gdevpccm.h 21 Feb 2002 22:24:51 -0000 1.5
+++ gdevpccm.h 16 Jun 2002 07:25:26 -0000 1.6
@@ -32,6 +32,6 @@
#define dci_pc_8bit dci_values(3, 8, 6, 6, 7, 7)
/* Write the palette on a file. */
-int pc_write_palette(P3(gx_device *, uint, FILE *));
+int pc_write_palette(gx_device *, uint, FILE *);
#endif /* gdevpccm_INCLUDED */
Index: gdevpcfb.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpcfb.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevpcfb.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevpcfb.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -59,10 +59,10 @@
} pcfb_bios_state;
/* Procedures used by gdevpcfb.c */
-void pcfb_set_signals(P1(gx_device *));
-void pcfb_get_state(P1(pcfb_bios_state *));
-void pcfb_set_mode(P1(int));
-void pcfb_set_state(P1(const pcfb_bios_state *));
+void pcfb_set_signals(gx_device *);
+void pcfb_get_state(pcfb_bios_state *);
+void pcfb_set_mode(int);
+void pcfb_set_state(const pcfb_bios_state *);
/* Types for frame buffer pointers. */
typedef byte *fb_ptr;
@@ -170,8 +170,8 @@
"eax");
}
#else
-void outportb(P2(uint, byte));
-void outport2(P3(uint, byte, byte));
+void outportb(uint, byte);
+void outport2(uint, byte, byte);
#endif
Index: gdevpcl.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpcl.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gdevpcl.h 21 Feb 2002 22:24:51 -0000 1.7
+++ gdevpcl.h 16 Jun 2002 07:25:26 -0000 1.8
@@ -48,7 +48,7 @@
#define PAPER_SIZE_B5 100
/* Get the paper size code, based on width and height. */
-int gdev_pcl_paper_size(P1(gx_device *));
+int gdev_pcl_paper_size(gx_device *);
/* Color mapping procedures for 3-bit-per-pixel RGB printers */
dev_proc_map_rgb_color(gdev_pcl_3bit_map_rgb_color);
@@ -57,9 +57,9 @@
/* Row compression routines */
typedef ulong word;
int
- gdev_pcl_mode2compress(P3(const word * row, const word * end_row, byte * compressed)),
- gdev_pcl_mode2compress_padded(P4(const word * row, const word * end_row, byte * compressed, bool pad)),
- gdev_pcl_mode3compress(P4(int bytecount, const byte * current, byte * previous, byte * compressed)),
- gdev_pcl_mode9compress(P4(int bytecount, const byte * current, const byte * previous, byte * compressed));
+ gdev_pcl_mode2compress(const word * row, const word * end_row, byte * compressed),
+ gdev_pcl_mode2compress_padded(const word * row, const word * end_row, byte * compressed, bool pad),
+ gdev_pcl_mode3compress(int bytecount, const byte * current, byte * previous, byte * compressed),
+ gdev_pcl_mode9compress(int bytecount, const byte * current, const byte * previous, byte * compressed);
#endif /* gdevpcl_INCLUDED */
Index: gdevpdff.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpdff.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gdevpdff.h 15 Jun 2002 21:11:53 -0000 1.19
+++ gdevpdff.h 16 Jun 2002 07:25:26 -0000 1.20
@@ -297,18 +297,18 @@
/*
* Set the current font and size, writing a Tf command if needed.
*/
-int pdf_set_font_and_size(P3(gx_device_pdf * pdev, pdf_font_t * font,
- floatp size));
+int pdf_set_font_and_size(gx_device_pdf * pdev, pdf_font_t * font,
+ floatp size);
/*
* Set the text matrix for writing text, writing a Tm, TL, or Tj command
* if needed.
*/
-int pdf_set_text_matrix(P2(gx_device_pdf * pdev, const gs_matrix * pmat));
+int pdf_set_text_matrix(gx_device_pdf * pdev, const gs_matrix * pmat);
/*
* Append characters to a string being accumulated.
*/
-int pdf_append_chars(P3(gx_device_pdf * pdev, const byte * str, uint size));
+int pdf_append_chars(gx_device_pdf * pdev, const byte * str, uint size);
/* ---------------- Exported by gdevpdfs.c for gdevpdft.c ---------------- */
@@ -333,33 +333,33 @@
extern const pdf_standard_font_t pdf_standard_fonts[];
/* Return the index of a standard font name, or -1 if missing. */
-int pdf_find_standard_font(P2(const byte *str, uint size));
+int pdf_find_standard_font(const byte *str, uint size);
/*
* Compute and return the orig_matrix of a font.
*/
-int pdf_font_orig_matrix(P2(const gs_font *font, gs_matrix *pmat));
+int pdf_font_orig_matrix(const gs_font *font, gs_matrix *pmat);
/*
* Find the original (unscaled) standard font corresponding to an
* arbitrary font, if any. Return its index in standard_fonts, or -1.
*/
-int pdf_find_orig_font(P3(gx_device_pdf *pdev, gs_font *font,
- gs_matrix *pfmat));
+int pdf_find_orig_font(gx_device_pdf *pdev, gs_font *font,
+ gs_matrix *pfmat);
/*
* Determine the embedding status of a font. If the font is in the base
* 14, store its index (0..13) in *pindex and its similarity to the base
* font (as determined by the font's same_font procedure) in *psame.
*/
-pdf_font_embed_t pdf_font_embed_status(P4(gx_device_pdf *pdev, gs_font *font,
- int *pindex, int *psame));
+pdf_font_embed_t pdf_font_embed_status(gx_device_pdf *pdev, gs_font *font,
+ int *pindex, int *psame);
/*
* Determine the resource type (resourceFont or resourceCIDFont) for
* a font.
*/
-pdf_resource_type_t pdf_font_resource_type(P1(const gs_font *font));
+pdf_resource_type_t pdf_font_resource_type(const gs_font *font);
/*
* Allocate a font resource. If pfd != 0, a FontDescriptor is allocated,
@@ -368,40 +368,39 @@
* is of type Font or of (pseudo-)type CIDFont; in this case, pfres->font
* and pfres->FontType are also set.
*/
-int pdf_alloc_font(P5(gx_device_pdf *pdev, gs_id rid, pdf_font_t **ppfres,
- const pdf_font_descriptor_t *pfd,
- gs_font *font));
+int pdf_alloc_font(gx_device_pdf *pdev, gs_id rid, pdf_font_t **ppfres,
+ const pdf_font_descriptor_t *pfd,
+ gs_font *font);
/*
* Create a new pdf_font for a gs_font. This procedure is only intended
* to be called from one place in gdevpdft.c.
*/
-int pdf_create_pdf_font(P4(gx_device_pdf *pdev, gs_font *font,
- const gs_matrix *pomat, pdf_font_t **pppf));
+int pdf_create_pdf_font(gx_device_pdf *pdev, gs_font *font,
+ const gs_matrix *pomat, pdf_font_t **pppf);
/*
* Determine whether a font is a subset font by examining the name.
*/
-bool pdf_has_subset_prefix(P2(const byte *str, uint size));
+bool pdf_has_subset_prefix(const byte *str, uint size);
/*
* Make the prefix for a subset font from the font's resource ID.
*/
-void pdf_make_subset_prefix(P3(const gx_device_pdf *pdev, byte *str,
- ulong id));
+void pdf_make_subset_prefix(const gx_device_pdf *pdev, byte *str, ulong id);
/*
* Adjust the FontName of a newly created FontDescriptor so that it is
* unique if necessary. If the name was changed, return 1.
*/
-int pdf_adjust_font_name(P3(const gx_device_pdf *pdev,
- pdf_font_descriptor_t *pfd,
- bool is_standard));
+int pdf_adjust_font_name(const gx_device_pdf *pdev,
+ pdf_font_descriptor_t *pfd,
+ bool is_standard);
/* Add an encoding difference to a font. */
-int pdf_add_encoding_difference(P5(gx_device_pdf *pdev, pdf_font_t *ppf,
- int chr, gs_font_base *bfont,
- gs_glyph glyph));
+int pdf_add_encoding_difference(gx_device_pdf *pdev, pdf_font_t *ppf,
+ int chr, gs_font_base *bfont,
+ gs_glyph glyph);
/*
* Get the widths (unmodified and possibly modified) of a given character
@@ -412,60 +411,60 @@
int Width; /* unmodified, for Widths */
int real_width; /* possibly modified, for rendering */
} pdf_glyph_widths_t;
-int pdf_char_widths(P4(pdf_font_t *ppf, int ch, gs_font *font,
- pdf_glyph_widths_t *pwidths /* may be NULL */));
+int pdf_char_widths(pdf_font_t *ppf, int ch, gs_font *font,
+ pdf_glyph_widths_t *pwidths /* may be NULL */);
/*
* Get the widths (unmodified and possibly modified) of a glyph in a (base)
* font. Return 1 if the width should not be cached.
*/
-int pdf_glyph_widths(P4(pdf_font_t *ppf, gs_glyph glyph, gs_font *font,
- pdf_glyph_widths_t *pwidths));
+int pdf_glyph_widths(pdf_font_t *ppf, gs_glyph glyph, gs_font *font,
+ pdf_glyph_widths_t *pwidths);
/*
* Find the range of character codes that includes all the defined
* characters in a font.
*/
-void pdf_find_char_range(P3(gs_font *font, int *pfirst, int *plast));
+void pdf_find_char_range(gs_font *font, int *pfirst, int *plast);
/* Compute the FontDescriptor for a font or a font subset. */
-int pdf_compute_font_descriptor(P4(gx_device_pdf *pdev,
- pdf_font_descriptor_t *pfd, gs_font *font,
- const byte *used /*[32]*/));
+int pdf_compute_font_descriptor(gx_device_pdf *pdev,
+ pdf_font_descriptor_t *pfd, gs_font *font,
+ const byte *used /*[32]*/);
/* Unregister the standard fonts when cleaning up. */
-void pdf_unregister_fonts(P1(gx_device_pdf *pdev));
+void pdf_unregister_fonts(gx_device_pdf *pdev);
/* ---------------- Exported by gdevpdfw.c ---------------- */
/* Register a font for eventual writing (embedded or not). */
-int pdf_register_font(P3(gx_device_pdf *pdev, gs_font *font, pdf_font_t *ppf));
+int pdf_register_font(gx_device_pdf *pdev, gs_font *font, pdf_font_t *ppf);
/*
* Close the text-related parts of a document, including writing out font
* and related resources.
*/
-int pdf_close_text_document(P1(gx_device_pdf *pdev));
+int pdf_close_text_document(gx_device_pdf *pdev);
/*
* Write a font descriptor.
* (Exported only for gdevpdfe.c.)
*/
-int pdf_write_FontDescriptor(P2(gx_device_pdf *pdev,
- const pdf_font_descriptor_t *pfd));
+int pdf_write_FontDescriptor(gx_device_pdf *pdev,
+ const pdf_font_descriptor_t *pfd);
/*
* Write CIDSystemInfo for a CIDFont or CMap.
* (Exported only for gdevpdff.c.)
*/
-int pdf_write_CIDFont_system_info(P2(gx_device_pdf *pdev,
- const gs_font *pcidfont));
+int pdf_write_CIDFont_system_info(gx_device_pdf *pdev,
+ const gs_font *pcidfont);
#ifndef gs_cmap_DEFINED
# define gs_cmap_DEFINED
typedef struct gs_cmap_s gs_cmap_t;
#endif
-int pdf_write_CMap_system_info(P2(gx_device_pdf *pdev,
- const gs_cmap_t *pcmap));
+int pdf_write_CMap_system_info(gx_device_pdf *pdev,
+ const gs_cmap_t *pcmap);
/* ---------------- Exported by gdevpdfe.c ---------------- */
@@ -474,7 +473,7 @@
* Return a rangecheck error if the font can't be embedded.
* (Exported only for gdevpdfw.c.)
*/
-int pdf_write_embedded_font(P2(gx_device_pdf *pdev,
- pdf_font_descriptor_t *pfd));
+int pdf_write_embedded_font(gx_device_pdf *pdev,
+ pdf_font_descriptor_t *pfd);
#endif /* gdevpdff_INCLUDED */
Index: gdevpdfg.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpdfg.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gdevpdfg.h 14 Jun 2002 05:53:39 -0000 1.14
+++ gdevpdfg.h 16 Jun 2002 07:25:26 -0000 1.15
@@ -69,7 +69,7 @@
* Create a local Device{Gray,RGB,CMYK} color space corresponding to the
* given number of components.
*/
-int pdf_cspace_init_Device(P2(gs_color_space *pcs, int num_components));
+int pdf_cspace_init_Device(gs_color_space *pcs, int num_components);
/*
* Create a PDF color space corresponding to a PostScript color space.
@@ -90,43 +90,43 @@
bool by_name);
/* Create colored and uncolored Pattern color spaces. */
-int pdf_cs_Pattern_colored(P2(gx_device_pdf *pdev, cos_value_t *pvalue));
-int pdf_cs_Pattern_uncolored(P2(gx_device_pdf *pdev, cos_value_t *pvalue));
+int pdf_cs_Pattern_colored(gx_device_pdf *pdev, cos_value_t *pvalue);
+int pdf_cs_Pattern_uncolored(gx_device_pdf *pdev, cos_value_t *pvalue);
/* Set the ProcSets bits corresponding to an image color space. */
-void pdf_color_space_procsets(P2(gx_device_pdf *pdev,
- const gs_color_space *pcs));
+void pdf_color_space_procsets(gx_device_pdf *pdev,
+ const gs_color_space *pcs);
/* ---------------- Exported by gdevpdfg.c ---------------- */
/* Reset the graphics state parameters to initial values. */
-void pdf_reset_graphics(P1(gx_device_pdf *pdev));
+void pdf_reset_graphics(gx_device_pdf *pdev);
/* Set the fill or stroke color. */
/* pdecolor is &pdev->fill_color or &pdev->stroke_color. */
-int pdf_set_pure_color(P4(gx_device_pdf *pdev, gx_color_index color,
+int pdf_set_pure_color(gx_device_pdf *pdev, gx_color_index color,
+ gx_drawing_color *pdcolor,
+ const psdf_set_color_commands_t *ppscc);
+int pdf_set_drawing_color(gx_device_pdf *pdev,
+ const gx_drawing_color *pdc,
gx_drawing_color *pdcolor,
- const psdf_set_color_commands_t *ppscc));
-int pdf_set_drawing_color(P4(gx_device_pdf *pdev,
- const gx_drawing_color *pdc,
- gx_drawing_color *pdcolor,
- const psdf_set_color_commands_t *ppscc));
+ const psdf_set_color_commands_t *ppscc);
/*
* Bring the graphics state up to date for a drawing operation.
* (Text uses either fill or stroke.)
*/
-int pdf_prepare_fill(P2(gx_device_pdf *pdev, const gs_imager_state *pis));
-int pdf_prepare_stroke(P2(gx_device_pdf *pdev, const gs_imager_state *pis));
-int pdf_prepare_image(P2(gx_device_pdf *pdev, const gs_imager_state *pis));
-int pdf_prepare_imagemask(P3(gx_device_pdf *pdev, const gs_imager_state *pis,
- const gx_drawing_color *pdcolor));
+int pdf_prepare_fill(gx_device_pdf *pdev, const gs_imager_state *pis);
+int pdf_prepare_stroke(gx_device_pdf *pdev, const gs_imager_state *pis);
+int pdf_prepare_image(gx_device_pdf *pdev, const gs_imager_state *pis);
+int pdf_prepare_imagemask(gx_device_pdf *pdev, const gs_imager_state *pis,
+ const gx_drawing_color *pdcolor);
/* Get the (string) name of a separation, */
/* returning a newly allocated string with a / prefixed. */
/****** BOGUS for all but standard separations ******/
-int pdf_separation_name(P3(gx_device_pdf *pdev, cos_value_t *pvalue,
- gs_separation_name sname));
+int pdf_separation_name(gx_device_pdf *pdev, cos_value_t *pvalue,
+ gs_separation_name sname);
/* ---------------- Exported by gdevpdfj.c ---------------- */
@@ -155,16 +155,16 @@
/* Store the values of image parameters other than filters. */
/* pdev is used only for updating procsets. */
/* pcsvalue is not used for masks. */
-int pdf_put_image_values(P5(cos_dict_t *pcd, gx_device_pdf *pdev,
- const gs_pixel_image_t *pic,
- const pdf_image_names_t *pin,
- const cos_value_t *pcsvalue));
+int pdf_put_image_values(cos_dict_t *pcd, gx_device_pdf *pdev,
+ const gs_pixel_image_t *pic,
+ const pdf_image_names_t *pin,
+ const cos_value_t *pcsvalue);
/* Store filters for an image. */
/* Currently this only saves parameters for CCITTFaxDecode. */
-int pdf_put_image_filters(P4(cos_dict_t *pcd, gx_device_pdf *pdev,
- const psdf_binary_writer * pbw,
- const pdf_image_names_t *pin));
+int pdf_put_image_filters(cos_dict_t *pcd, gx_device_pdf *pdev,
+ const psdf_binary_writer * pbw,
+ const pdf_image_names_t *pin);
/* ------ Image writing ------ */
@@ -176,16 +176,16 @@
* PDF images are always specified top-to-bottom.
* data_h is the actual number of data rows, which may be less than h.
*/
-void pdf_make_bitmap_matrix(P6(gs_matrix * pmat, int x, int y, int w, int h,
- int h_actual));
+void pdf_make_bitmap_matrix(gs_matrix * pmat, int x, int y, int w, int h,
+ int h_actual);
/* Put out the gsave and matrix for an image. */
-void pdf_put_image_matrix(P3(gx_device_pdf * pdev, const gs_matrix * pmat,
- floatp y_scale));
+void pdf_put_image_matrix(gx_device_pdf * pdev, const gs_matrix * pmat,
+ floatp y_scale);
/* Put out a reference to an image resource. */
-int pdf_do_image(P4(gx_device_pdf * pdev, const pdf_resource_t * pres,
- const gs_matrix * pimat, bool in_contents));
+int pdf_do_image(gx_device_pdf * pdev, const pdf_resource_t * pres,
+ const gs_matrix * pimat, bool in_contents);
/* Define the structure for writing an image. */
typedef struct pdf_image_writer_s {
@@ -210,49 +210,49 @@
* up the binary writer. If pnamed != 0, it is a dictionary object created
* by a NI pdfmark.
*/
-int pdf_begin_write_image(P8(gx_device_pdf * pdev, pdf_image_writer * piw,
- gx_bitmap_id id, int w, int h,
- cos_dict_t *pnamed, bool in_line,
- int alt_writer_count));
+int pdf_begin_write_image(gx_device_pdf * pdev, pdf_image_writer * piw,
+ gx_bitmap_id id, int w, int h,
+ cos_dict_t *pnamed, bool in_line,
+ int alt_writer_count);
/* Begin writing the image data, setting up the dictionary and filters. */
-int pdf_begin_image_data(P5(gx_device_pdf * pdev, pdf_image_writer * piw,
- const gs_pixel_image_t * pim,
- const cos_value_t *pcsvalue,
- int alt_writer_index));
+int pdf_begin_image_data(gx_device_pdf * pdev, pdf_image_writer * piw,
+ const gs_pixel_image_t * pim,
+ const cos_value_t *pcsvalue,
+ int alt_writer_index);
/* Copy the data for a mask or monobit bitmap. */
-int pdf_copy_mask_bits(P7(stream *s, const byte *base, int sourcex,
- int raster, int w, int h, byte invert));
+int pdf_copy_mask_bits(stream *s, const byte *base, int sourcex,
+ int raster, int w, int h, byte invert);
/* Copy the data for a colored image (device pixels). */
-int pdf_copy_color_bits(P7(stream *s, const byte *base, int sourcex,
- int raster, int w, int h, int bytes_per_pixel));
+int pdf_copy_color_bits(stream *s, const byte *base, int sourcex,
+ int raster, int w, int h, int bytes_per_pixel);
/* Finish writing the binary image data. */
-int pdf_end_image_binary(P3(gx_device_pdf *pdev, pdf_image_writer *piw,
- int data_h));
+int pdf_end_image_binary(gx_device_pdf *pdev, pdf_image_writer *piw,
+ int data_h);
/*
* Finish writing an image. If in-line, write the BI/dict/ID/data/EI and
* return 1; if a resource, write the resource definition and return 0.
*/
-int pdf_end_write_image(P2(gx_device_pdf * pdev, pdf_image_writer * piw));
+int pdf_end_write_image(gx_device_pdf * pdev, pdf_image_writer * piw);
/*
* Make alternative stream for image compression choice.
*/
-int pdf_make_alt_stream(P2(gx_device_pdf * pdev, psdf_binary_writer * piw));
+int pdf_make_alt_stream(gx_device_pdf * pdev, psdf_binary_writer * piw);
/*
* End binary with choosing image compression.
*/
-int pdf_choose_compression(P2(pdf_image_writer * piw, bool end_binary));
+int pdf_choose_compression(pdf_image_writer * piw, bool end_binary);
/* ---------------- Exported by gdevpdfv.c ---------------- */
/* Write a color value. */
-int pdf_put_drawing_color(P3(gx_device_pdf *pdev, const gx_drawing_color *pdc,
- const psdf_set_color_commands_t *ppscc));
+int pdf_put_drawing_color(gx_device_pdf *pdev, const gx_drawing_color *pdc,
+ const psdf_set_color_commands_t *ppscc);
#endif /* gdevpdfg_INCLUDED */
Index: gdevpdfo.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpdfo.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gdevpdfo.h 15 Jun 2002 17:31:19 -0000 1.13
+++ gdevpdfo.h 16 Jun 2002 07:25:26 -0000 1.14
@@ -69,11 +69,11 @@
/*typedef*/ struct cos_object_procs_s {
#define cos_proc_release(proc)\
- void proc(P2(cos_object_t *pco, client_name_t cname))
+ void proc(cos_object_t *pco, client_name_t cname)
cos_proc_release((*release));
#define cos_proc_write(proc)\
- int proc(P2(const cos_object_t *pco, gx_device_pdf *pdev))
+ int proc(const cos_object_t *pco, gx_device_pdf *pdev)
cos_proc_write((*write));
} /*cos_object_procs_t*/;
@@ -180,19 +180,19 @@
*/
/* Create a Cos object. */
-cos_object_t *cos_object_alloc(P2(gx_device_pdf *, client_name_t));
-cos_array_t *cos_array_alloc(P2(gx_device_pdf *, client_name_t));
-cos_array_t *cos_array_from_floats(P4(gx_device_pdf *, const float *, uint,
- client_name_t));
-cos_dict_t *cos_dict_alloc(P2(gx_device_pdf *, client_name_t));
-cos_stream_t *cos_stream_alloc(P2(gx_device_pdf *, client_name_t));
+cos_object_t *cos_object_alloc(gx_device_pdf *, client_name_t);
+cos_array_t *cos_array_alloc(gx_device_pdf *, client_name_t);
+cos_array_t *cos_array_from_floats(gx_device_pdf *, const float *, uint,
+ client_name_t);
+cos_dict_t *cos_dict_alloc(gx_device_pdf *, client_name_t);
+cos_stream_t *cos_stream_alloc(gx_device_pdf *, client_name_t);
/* Get the allocator for a Cos object. */
-gs_memory_t *cos_object_memory(P1(const cos_object_t *));
+gs_memory_t *cos_object_memory(const cos_object_t *);
#define COS_OBJECT_MEMORY(pc) cos_object_memory(CONST_COS_OBJECT(pc))
/* Set the type of a generic Cos object. */
-int cos_become(P2(cos_object_t *, cos_type_t));
+int cos_become(cos_object_t *, cos_type_t);
/* Define wrappers for calling the object procedures. */
cos_proc_release(cos_release);
@@ -201,12 +201,12 @@
#define COS_WRITE(pc, pdev) cos_write(CONST_COS_OBJECT(pc), pdev)
/* Make a value to store into a composite object. */
-const cos_value_t *cos_string_value(P3(cos_value_t *, const byte *, uint));
-const cos_value_t *cos_c_string_value(P2(cos_value_t *, const char *));
-const cos_value_t *cos_object_value(P2(cos_value_t *, cos_object_t *));
+const cos_value_t *cos_string_value(cos_value_t *, const byte *, uint);
+const cos_value_t *cos_c_string_value(cos_value_t *, const char *);
+const cos_value_t *cos_object_value(cos_value_t *, cos_object_t *);
#define COS_OBJECT_VALUE(pcv, pc) cos_object_value(pcv, COS_OBJECT(pc))
/* A resource value is an object value referenced as /R#, not # # R. */
-const cos_value_t *cos_resource_value(P2(cos_value_t *, cos_object_t *));
+const cos_value_t *cos_resource_value(cos_value_t *, cos_object_t *);
#define COS_RESOURCE_VALUE(pcv, pc) cos_resource_value(pcv, COS_OBJECT(pc))
/* Test whether a value is an object */
@@ -219,37 +219,35 @@
* itself, that should not be copied.
*/
/* array */
-int cos_array_put(P3(cos_array_t *, long, const cos_value_t *));
-int cos_array_put_no_copy(P3(cos_array_t *, long, const cos_value_t *));
-int cos_array_add(P2(cos_array_t *, const cos_value_t *));
-int cos_array_add_no_copy(P2(cos_array_t *, const cos_value_t *));
-int cos_array_add_c_string(P2(cos_array_t *, const char *));
-int cos_array_add_int(P2(cos_array_t *, int));
-int cos_array_add_real(P2(cos_array_t *, floatp));
-int cos_array_add_object(P2(cos_array_t *, cos_object_t *));
+int cos_array_put(cos_array_t *, long, const cos_value_t *);
+int cos_array_put_no_copy(cos_array_t *, long, const cos_value_t *);
+int cos_array_add(cos_array_t *, const cos_value_t *);
+int cos_array_add_no_copy(cos_array_t *, const cos_value_t *);
+int cos_array_add_c_string(cos_array_t *, const char *);
+int cos_array_add_int(cos_array_t *, int);
+int cos_array_add_real(cos_array_t *, floatp);
+int cos_array_add_object(cos_array_t *, cos_object_t *);
/* add adds at the end, unadd removes the last element */
-int cos_array_unadd(P2(cos_array_t *, cos_value_t *));
+int cos_array_unadd(cos_array_t *, cos_value_t *);
/* dict */
-int cos_dict_put(P4(cos_dict_t *, const byte *, uint, const cos_value_t *));
-int cos_dict_put_no_copy(P4(cos_dict_t *, const byte *, uint,
- const cos_value_t *));
-int cos_dict_put_c_key(P3(cos_dict_t *, const char *, const cos_value_t *));
-int cos_dict_put_c_key_string(P4(cos_dict_t *, const char *, const byte *,
- uint));
-int cos_dict_put_c_key_int(P3(cos_dict_t *, const char *, int));
-int cos_dict_put_c_key_real(P3(cos_dict_t *, const char *, floatp));
-int cos_dict_put_c_key_floats(P4(cos_dict_t *, const char *, const float *, uint));
-int cos_dict_put_c_key_object(P3(cos_dict_t *, const char *, cos_object_t *));
-int cos_dict_put_string(P5(cos_dict_t *, const byte *, uint, const byte *,
- uint));
-int cos_dict_put_c_strings(P3(cos_dict_t *, const char *, const char *));
+int cos_dict_put(cos_dict_t *, const byte *, uint, const cos_value_t *);
+int cos_dict_put_no_copy(cos_dict_t *, const byte *, uint,
+ const cos_value_t *);
+int cos_dict_put_c_key(cos_dict_t *, const char *, const cos_value_t *);
+int cos_dict_put_c_key_string(cos_dict_t *, const char *, const byte *, uint);
+int cos_dict_put_c_key_int(cos_dict_t *, const char *, int);
+int cos_dict_put_c_key_real(cos_dict_t *, const char *, floatp);
+int cos_dict_put_c_key_floats(cos_dict_t *, const char *, const float *, uint);
+int cos_dict_put_c_key_object(cos_dict_t *, const char *, cos_object_t *);
+int cos_dict_put_string(cos_dict_t *, const byte *, uint, const byte *, uint);
+int cos_dict_put_c_strings(cos_dict_t *, const char *, const char *);
/* move all the elements from one dict to another */
-int cos_dict_move_all(P2(cos_dict_t *, cos_dict_t *));
+int cos_dict_move_all(cos_dict_t *, cos_dict_t *);
/* stream */
-int cos_stream_add(P2(cos_stream_t *, uint));
-int cos_stream_add_bytes(P3(cos_stream_t *, const byte *, uint));
-int cos_stream_add_stream_contents(P2(cos_stream_t *, stream *));
-cos_dict_t *cos_stream_dict(P1(cos_stream_t *));
+int cos_stream_add(cos_stream_t *, uint);
+int cos_stream_add_bytes(cos_stream_t *, const byte *, uint);
+int cos_stream_add_stream_contents(cos_stream_t *, stream *);
+cos_dict_t *cos_stream_dict(cos_stream_t *);
/*
* Get the first / next element for enumerating an array. Usage:
@@ -265,14 +263,14 @@
* they may or may not be included in the enumeration.
*/
const cos_array_element_t *
- cos_array_element_first(P1(const cos_array_t *));
+ cos_array_element_first(const cos_array_t *);
const cos_array_element_t *
- cos_array_element_next(P3(const cos_array_element_t *, long *,
- const cos_value_t **));
+ cos_array_element_next(const cos_array_element_t *, long *,
+ const cos_value_t **);
/* Look up a key in a dictionary. */
-const cos_value_t *cos_dict_find(P3(const cos_dict_t *, const byte *, uint));
-const cos_value_t *cos_dict_find_c_key(P2(const cos_dict_t *, const char *));
+const cos_value_t *cos_dict_find(const cos_dict_t *, const byte *, uint);
+const cos_value_t *cos_dict_find_c_key(const cos_dict_t *, const char *);
/* Set up a parameter list that writes into a Cos dictionary. */
typedef struct cos_param_list_writer_s {
@@ -280,44 +278,43 @@
cos_dict_t *pcd;
int print_ok;
} cos_param_list_writer_t;
-int cos_param_list_writer_init(P3(cos_param_list_writer_t *, cos_dict_t *,
- int print_ok));
+int cos_param_list_writer_init(cos_param_list_writer_t *, cos_dict_t *,
+ int print_ok);
/* Create a stream that writes into a Cos stream. */
/* Closing the stream will free it. */
-stream *cos_write_stream_alloc(P3(cos_stream_t *pcs, gx_device_pdf *pdev,
- client_name_t cname));
+stream *cos_write_stream_alloc(cos_stream_t *pcs, gx_device_pdf *pdev,
+ client_name_t cname);
/* Get cos stream from pipeline. */
cos_stream_t *
-cos_write_stream_from_pipeline(P1(stream *s));
+cos_write_stream_from_pipeline(stream *s);
/* Write a Cos value on the output. */
-int cos_value_write(P2(const cos_value_t *, gx_device_pdf *));
+int cos_value_write(const cos_value_t *, gx_device_pdf *);
/* Write the elements of a dictionary/stream on the output. */
-int cos_dict_elements_write(P2(const cos_dict_t *, gx_device_pdf *));
-int cos_stream_elements_write(P2(const cos_stream_t *, gx_device_pdf *)); /* = dict_elements_write */
-int cos_stream_contents_write(P2(const cos_stream_t *, gx_device_pdf *));
+int cos_dict_elements_write(const cos_dict_t *, gx_device_pdf *);
+int cos_stream_elements_write(const cos_stream_t *, gx_device_pdf *); /* = dict_elements_write */
+int cos_stream_contents_write(const cos_stream_t *, gx_device_pdf *);
/* Find the total length of a stream. */
-long cos_stream_length(P1(const cos_stream_t *pcs));
+long cos_stream_length(const cos_stream_t *pcs);
/* Write/delete definitions of named objects. */
/* This is a special-purpose facility for pdf_close. */
-int cos_dict_objects_write(P2(const cos_dict_t *, gx_device_pdf *));
-int cos_dict_objects_delete(P1(cos_dict_t *));
+int cos_dict_objects_write(const cos_dict_t *, gx_device_pdf *);
+int cos_dict_objects_delete(cos_dict_t *);
/* Write a cos object as a PDF object. */
-int cos_write_object(P2(cos_object_t *pco, gx_device_pdf *pdev));
+int cos_write_object(cos_object_t *pco, gx_device_pdf *pdev);
#define COS_WRITE_OBJECT(pc, pdev) cos_write_object(COS_OBJECT(pc), pdev)
/* Free a Cos value owned by a Cos object. */
-void cos_value_free(P3(const cos_value_t *, const cos_object_t *,
- client_name_t));
+void cos_value_free(const cos_value_t *, const cos_object_t *, client_name_t);
/* Free a cos object. */
-void cos_free(P2(cos_object_t *pco, client_name_t cname));
+void cos_free(cos_object_t *pco, client_name_t cname);
#define COS_FREE(pc, cname) cos_free(COS_OBJECT(pc), cname)
#endif /* gdevpdfo_INCLUDED */
Index: gdevpdfx.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpdfx.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- gdevpdfx.h 15 Jun 2002 21:11:53 -0000 1.45
+++ gdevpdfx.h 16 Jun 2002 07:25:26 -0000 1.46
@@ -489,44 +489,44 @@
/* ---------------- Exported by gdevpdf.c ---------------- */
/* Initialize the IDs allocated at startup. */
-void pdf_initialize_ids(P1(gx_device_pdf * pdev));
+void pdf_initialize_ids(gx_device_pdf * pdev);
/* Update the color mapping procedures after setting ProcessColorModel. */
-void pdf_set_process_color_model(P1(gx_device_pdf * pdev));
+void pdf_set_process_color_model(gx_device_pdf * pdev);
/* Reset the text state parameters to initial values. */
-void pdf_reset_text(P1(gx_device_pdf *pdev));
+void pdf_reset_text(gx_device_pdf *pdev);
/* ---------------- Exported by gdevpdfu.c ---------------- */
/* ------ Document ------ */
/* Open the document if necessary. */
-void pdf_open_document(P1(gx_device_pdf * pdev));
+void pdf_open_document(gx_device_pdf * pdev);
/* ------ Objects ------ */
/* Allocate an ID for a future object. */
-long pdf_obj_ref(P1(gx_device_pdf * pdev));
+long pdf_obj_ref(gx_device_pdf * pdev);
/* Read the current position in the output stream. */
-long pdf_stell(P1(gx_device_pdf * pdev));
+long pdf_stell(gx_device_pdf * pdev);
/* Begin an object, optionally allocating an ID. */
-long pdf_open_obj(P2(gx_device_pdf * pdev, long id));
-long pdf_begin_obj(P1(gx_device_pdf * pdev));
+long pdf_open_obj(gx_device_pdf * pdev, long id);
+long pdf_begin_obj(gx_device_pdf * pdev);
/* End an object. */
-int pdf_end_obj(P1(gx_device_pdf * pdev));
+int pdf_end_obj(gx_device_pdf * pdev);
/* ------ Page contents ------ */
/* Open a page contents part. */
/* Return an error if the page has too many contents parts. */
-int pdf_open_contents(P2(gx_device_pdf * pdev, pdf_context_t context));
+int pdf_open_contents(gx_device_pdf * pdev, pdf_context_t context);
/* Close the current contents part if we are in one. */
-int pdf_close_contents(P2(gx_device_pdf * pdev, bool last));
+int pdf_close_contents(gx_device_pdf * pdev, bool last);
/* ------ Resources et al ------ */
@@ -542,42 +542,42 @@
/* Begin an object logically separate from the contents. */
/* (I.e., an object in the resource file.) */
-long pdf_open_separate(P2(gx_device_pdf * pdev, long id));
-long pdf_begin_separate(P1(gx_device_pdf * pdev));
+long pdf_open_separate(gx_device_pdf * pdev, long id);
+long pdf_begin_separate(gx_device_pdf * pdev);
/* Begin an aside (resource, annotation, ...). */
-int pdf_begin_aside(P4(gx_device_pdf * pdev, pdf_resource_t **plist,
- const gs_memory_struct_type_t * pst,
- pdf_resource_t **ppres));
+int pdf_begin_aside(gx_device_pdf * pdev, pdf_resource_t **plist,
+ const gs_memory_struct_type_t * pst,
+ pdf_resource_t **ppres);
/* Begin a resource of a given type. */
-int pdf_begin_resource(P4(gx_device_pdf * pdev, pdf_resource_type_t rtype,
- gs_id rid, pdf_resource_t **ppres));
+int pdf_begin_resource(gx_device_pdf * pdev, pdf_resource_type_t rtype,
+ gs_id rid, pdf_resource_t **ppres);
/* Begin a resource body of a given type. */
-int pdf_begin_resource_body(P4(gx_device_pdf * pdev, pdf_resource_type_t rtype,
- gs_id rid, pdf_resource_t **ppres));
+int pdf_begin_resource_body(gx_device_pdf * pdev, pdf_resource_type_t rtype,
+ gs_id rid, pdf_resource_t **ppres);
/* Allocate a resource, but don't open the stream. */
-int pdf_alloc_resource(P5(gx_device_pdf * pdev, pdf_resource_type_t rtype,
- gs_id rid, pdf_resource_t **ppres, long id));
+int pdf_alloc_resource(gx_device_pdf * pdev, pdf_resource_type_t rtype,
+ gs_id rid, pdf_resource_t **ppres, long id);
/* Find a resource of a given type by gs_id. */
-pdf_resource_t *pdf_find_resource_by_gs_id(P3(gx_device_pdf * pdev,
- pdf_resource_type_t rtype,
- gs_id rid));
+pdf_resource_t *pdf_find_resource_by_gs_id(gx_device_pdf * pdev,
+ pdf_resource_type_t rtype,
+ gs_id rid);
/* Get the object id of a resource. */
-long pdf_resource_id(P1(const pdf_resource_t *pres));
+long pdf_resource_id(const pdf_resource_t *pres);
/* End a separate object. */
-int pdf_end_separate(P1(gx_device_pdf * pdev));
+int pdf_end_separate(gx_device_pdf * pdev);
/* End an aside. */
-int pdf_end_aside(P1(gx_device_pdf * pdev));
+int pdf_end_aside(gx_device_pdf * pdev);
/* End a resource. */
-int pdf_end_resource(P1(gx_device_pdf * pdev));
+int pdf_end_resource(gx_device_pdf * pdev);
/*
* Write the Cos objects for resources local to a content stream.
@@ -593,42 +593,42 @@
* Store the resource sets for a content stream (page or XObject).
* Sets page->{procsets, resource_ids[], fonts_id}.
*/
-int pdf_store_page_resources(P2(gx_device_pdf *pdev, pdf_page_t *page));
+int pdf_store_page_resources(gx_device_pdf *pdev, pdf_page_t *page);
/* Copy data from a temporary file to a stream. */
-void pdf_copy_data(P3(stream *s, FILE *file, long count));
+void pdf_copy_data(stream *s, FILE *file, long count);
/* ------ Pages ------ */
/* Get or assign the ID for a page. */
/* Returns 0 if the page number is out of range. */
-long pdf_page_id(P2(gx_device_pdf * pdev, int page_num));
+long pdf_page_id(gx_device_pdf * pdev, int page_num);
/* Get the page structure for the current page. */
-pdf_page_t *pdf_current_page(P1(gx_device_pdf *pdev));
+pdf_page_t *pdf_current_page(gx_device_pdf *pdev);
/* Get the dictionary object for the current page. */
-cos_dict_t *pdf_current_page_dict(P1(gx_device_pdf *pdev));
+cos_dict_t *pdf_current_page_dict(gx_device_pdf *pdev);
/* Open a page for writing. */
-int pdf_open_page(P2(gx_device_pdf * pdev, pdf_context_t context));
+int pdf_open_page(gx_device_pdf * pdev, pdf_context_t context);
/* Write saved page- or document-level information. */
-int pdf_write_saved_string(P2(gx_device_pdf * pdev, gs_string * pstr));
+int pdf_write_saved_string(gx_device_pdf * pdev, gs_string * pstr);
/* ------ Path drawing ------ */
/* Test whether the clip path needs updating. */
-bool pdf_must_put_clip_path(P2(gx_device_pdf * pdev, const gx_clip_path * pcpath));
+bool pdf_must_put_clip_path(gx_device_pdf * pdev, const gx_clip_path * pcpath);
/* Write and update the clip path. */
-int pdf_put_clip_path(P2(gx_device_pdf * pdev, const gx_clip_path * pcpath));
+int pdf_put_clip_path(gx_device_pdf * pdev, const gx_clip_path * pcpath);
/* ------ Miscellaneous output ------ */
#define PDF_MAX_PRODUCER 200 /* adhoc */
/* Generate the default Producer string. */
-void pdf_store_default_Producer(P1(char buf[PDF_MAX_PRODUCER]));
+void pdf_store_default_Producer(char buf[PDF_MAX_PRODUCER]);
/* Define the strings for filter names and parameters. */
typedef struct pdf_filter_names_s {
@@ -650,26 +650,26 @@
"/A85", "/AHx", "/CCF", "/DCT", "/DP", "/F", "/Fl", "/LZW", "/RL"
/* Write matrix values. */
-void pdf_put_matrix(P4(gx_device_pdf *pdev, const char *before,
- const gs_matrix *pmat, const char *after));
+void pdf_put_matrix(gx_device_pdf *pdev, const char *before,
+ const gs_matrix *pmat, const char *after);
/* Write a name, with escapes for unusual characters. */
-typedef int (*pdf_put_name_chars_proc_t)(P3(stream *, const byte *, uint));
+typedef int (*pdf_put_name_chars_proc_t)(stream *, const byte *, uint);
pdf_put_name_chars_proc_t
- pdf_put_name_chars_proc(P1(const gx_device_pdf *pdev));
-void pdf_put_name_chars(P3(const gx_device_pdf *pdev, const byte *nstr,
- uint size));
-void pdf_put_name(P3(const gx_device_pdf *pdev, const byte *nstr, uint size));
+ pdf_put_name_chars_proc(const gx_device_pdf *pdev);
+void pdf_put_name_chars(const gx_device_pdf *pdev, const byte *nstr,
+ uint size);
+void pdf_put_name(const gx_device_pdf *pdev, const byte *nstr, uint size);
/* Write a string in its shortest form ( () or <> ). */
-void pdf_put_string(P3(const gx_device_pdf *pdev, const byte *str, uint size));
+void pdf_put_string(const gx_device_pdf *pdev, const byte *str, uint size);
/* Write a value, treating names specially. */
-void pdf_write_value(P3(const gx_device_pdf *pdev, const byte *vstr, uint size));
+void pdf_write_value(const gx_device_pdf *pdev, const byte *vstr, uint size);
/* Store filters for a stream. */
-int pdf_put_filters(P4(cos_dict_t *pcd, gx_device_pdf *pdev, stream *s,
- const pdf_filter_names_t *pfn));
+int pdf_put_filters(cos_dict_t *pcd, gx_device_pdf *pdev, stream *s,
+ const pdf_filter_names_t *pfn);
/* Define a possibly encoded and compressed data stream. */
typedef struct pdf_data_writer_s {
@@ -684,13 +684,13 @@
#define DATA_STREAM_NOT_BINARY 0 /* data are text, not binary */
#define DATA_STREAM_BINARY 1 /* data are binary */
#define DATA_STREAM_COMPRESS 2 /* OK to compress data */
-int pdf_begin_data_stream(P3(gx_device_pdf *pdev, pdf_data_writer_t *pdw,
- int options));
+int pdf_begin_data_stream(gx_device_pdf *pdev, pdf_data_writer_t *pdw,
+ int options);
/* begin_data = begin_data_binary with both options = true. */
-int pdf_begin_data(P2(gx_device_pdf *pdev, pdf_data_writer_t *pdw));
+int pdf_begin_data(gx_device_pdf *pdev, pdf_data_writer_t *pdw);
/* End a data stream. */
-int pdf_end_data(P1(pdf_data_writer_t *pdw));
+int pdf_end_data(pdf_data_writer_t *pdw);
/* ------ Functions ------ */
@@ -708,14 +708,14 @@
typedef struct gs_function_s gs_function_t;
# define gs_function_DEFINED
#endif
-int pdf_function(P3(gx_device_pdf *pdev, const gs_function_t *pfn,
- cos_value_t *pvalue));
+int pdf_function(gx_device_pdf *pdev, const gs_function_t *pfn,
+ cos_value_t *pvalue);
int pdf_function_scaled(gx_device_pdf *pdev, const gs_function_t *pfn,
const gs_range_t *pranges, cos_value_t *pvalue);
/* Write a Function object, returning its object ID. */
-int pdf_write_function(P3(gx_device_pdf *pdev, const gs_function_t *pfn,
- long *pid));
+int pdf_write_function(gx_device_pdf *pdev, const gs_function_t *pfn,
+ long *pid);
/* ---------------- Exported by gdevpdfm.c ---------------- */
@@ -724,44 +724,44 @@
* If nameable is false, the objname argument is always NULL.
*/
#define pdfmark_proc(proc)\
- int proc(P5(gx_device_pdf *pdev, gs_param_string *pairs, uint count,\
- const gs_matrix *pctm, const gs_param_string *objname))
+ int proc(gx_device_pdf *pdev, gs_param_string *pairs, uint count,\
+ const gs_matrix *pctm, const gs_param_string *objname)
/* Compare a C string and a gs_param_string. */
-bool pdf_key_eq(P2(const gs_param_string * pcs, const char *str));
+bool pdf_key_eq(const gs_param_string * pcs, const char *str);
/* Scan an integer out of a parameter string. */
-int pdfmark_scan_int(P2(const gs_param_string * pstr, int *pvalue));
+int pdfmark_scan_int(const gs_param_string * pstr, int *pvalue);
/* Process a pdfmark (called from pdf_put_params). */
-int pdfmark_process(P2(gx_device_pdf * pdev, const gs_param_string_array * pma));
+int pdfmark_process(gx_device_pdf * pdev, const gs_param_string_array * pma);
/* Close the current level of the outline tree. */
-int pdfmark_close_outline(P1(gx_device_pdf * pdev));
+int pdfmark_close_outline(gx_device_pdf * pdev);
/* Finish writing an article. */
-int pdfmark_write_article(P2(gx_device_pdf * pdev, const pdf_article_t * part));
+int pdfmark_write_article(gx_device_pdf * pdev, const pdf_article_t * part);
/* ---------------- Exported by gdevpdfr.c ---------------- */
/* Test whether an object name has valid syntax, {name}. */
-bool pdf_objname_is_valid(P2(const byte *data, uint size));
+bool pdf_objname_is_valid(const byte *data, uint size);
/*
* Look up a named object. Return e_rangecheck if the syntax is invalid,
* e_undefined if no object by that name exists.
*/
-int pdf_find_named(P3(gx_device_pdf * pdev, const gs_param_string * pname,
- cos_object_t **ppco));
+int pdf_find_named(gx_device_pdf * pdev, const gs_param_string * pname,
+ cos_object_t **ppco);
/*
* Create a named object. id = -1L means do not assign an id. pname = 0
* means just create the object, do not name it.
*/
-int pdf_create_named(P5(gx_device_pdf *pdev, const gs_param_string *pname,
- cos_type_t cotype, cos_object_t **ppco, long id));
-int pdf_create_named_dict(P4(gx_device_pdf *pdev, const gs_param_string *pname,
- cos_dict_t **ppcd, long id));
+int pdf_create_named(gx_device_pdf *pdev, const gs_param_string *pname,
+ cos_type_t cotype, cos_object_t **ppco, long id);
+int pdf_create_named_dict(gx_device_pdf *pdev, const gs_param_string *pname,
+ cos_dict_t **ppcd, long id);
/*
* Look up a named object as for pdf_find_named. If the object does not
@@ -769,8 +769,8 @@
* {ThisPage}, {NextPage}, {PrevPage}, or {Page<#>}, otherwise as a
* generic object) and return 1.
*/
-int pdf_refer_named(P3(gx_device_pdf *pdev, const gs_param_string *pname,
- cos_object_t **ppco));
+int pdf_refer_named(gx_device_pdf *pdev, const gs_param_string *pname,
+ cos_object_t **ppco);
/*
* Look up a named object as for pdf_refer_named. If the object already
@@ -779,18 +779,18 @@
* otherwise, create the object with the given type and return 1.
* pname = 0 is allowed: in this case, simply create the object.
*/
-int pdf_make_named(P5(gx_device_pdf * pdev, const gs_param_string * pname,
- cos_type_t cotype, cos_object_t **ppco, bool assign_id));
-int pdf_make_named_dict(P4(gx_device_pdf * pdev, const gs_param_string * pname,
- cos_dict_t **ppcd, bool assign_id));
+int pdf_make_named(gx_device_pdf * pdev, const gs_param_string * pname,
+ cos_type_t cotype, cos_object_t **ppco, bool assign_id);
+int pdf_make_named_dict(gx_device_pdf * pdev, const gs_param_string * pname,
+ cos_dict_t **ppcd, bool assign_id);
/*
* Look up a named object as for pdf_refer_named. If the object does not
* exist, or is a forward reference, return e_undefined; if the object
* exists has the wrong type, return e_typecheck.
*/
-int pdf_get_named(P4(gx_device_pdf * pdev, const gs_param_string * pname,
- cos_type_t cotype, cos_object_t **ppco));
+int pdf_get_named(gx_device_pdf * pdev, const gs_param_string * pname,
+ cos_type_t cotype, cos_object_t **ppco);
/*
* Push the current local namespace onto the namespace stack, and reset it
@@ -810,19 +810,18 @@
* or an error. On a successful return, the token extends from *ptoken up
* to but not including *pscan.
*/
-int pdf_scan_token(P3(const byte **pscan, const byte * end,
- const byte **ptoken));
+int pdf_scan_token(const byte **pscan, const byte * end, const byte **ptoken);
/*
* Scan a possibly composite token: arrays and dictionaries are treated as
* single tokens.
*/
-int pdf_scan_token_composite(P3(const byte **pscan, const byte * end,
- const byte **ptoken));
+int pdf_scan_token_composite(const byte **pscan, const byte * end,
+ const byte **ptoken);
/* Replace object names with object references in a (parameter) string. */
-int pdf_replace_names(P3(gx_device_pdf *pdev, const gs_param_string *from,
- gs_param_string *to));
+int pdf_replace_names(gx_device_pdf *pdev, const gs_param_string *from,
+ gs_param_string *to);
/* ================ Text module procedures ================ */
@@ -834,7 +833,7 @@
* Close the text-related parts of a document, including writing out font
* and related resources.
*/
-int pdf_close_text_document(P1(gx_device_pdf *pdev));
+int pdf_close_text_document(gx_device_pdf *pdev);
/* ---------------- Exported by gdevpdft.c ---------------- */
@@ -850,16 +849,16 @@
int pdf_char_image_y_offset(const gx_device_pdf *pdev, int x, int y, int h);
/* Begin a CharProc for an embedded (bitmap) font. */
-int pdf_begin_char_proc(P8(gx_device_pdf * pdev, int w, int h, int x_width,
- int y_offset, gs_id id, pdf_char_proc_t **ppcp,
- pdf_stream_position_t * ppos));
+int pdf_begin_char_proc(gx_device_pdf * pdev, int w, int h, int x_width,
+ int y_offset, gs_id id, pdf_char_proc_t **ppcp,
+ pdf_stream_position_t * ppos);
/* End a CharProc. */
-int pdf_end_char_proc(P2(gx_device_pdf * pdev, pdf_stream_position_t * ppos));
+int pdf_end_char_proc(gx_device_pdf * pdev, pdf_stream_position_t * ppos);
/* Put out a reference to an image as a character in an embedded font. */
-int pdf_do_char_image(P3(gx_device_pdf * pdev, const pdf_char_proc_t * pcp,
- const gs_matrix * pimat));
+int pdf_do_char_image(gx_device_pdf * pdev, const pdf_char_proc_t * pcp,
+ const gs_matrix * pimat);
/* For gdevpdfu.c */
Index: gdevplnx.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevplnx.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevplnx.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevplnx.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -65,9 +65,8 @@
device_plane_extract_reloc_ptrs, gx_device_finalize)
/* Initialize a plane extraction device. */
-int plane_device_init(P5(gx_device_plane_extract *edev, gx_device *target,
- gx_device *plane_dev,
- const gx_render_plane_t *render_plane,
- bool clear));
+int plane_device_init(gx_device_plane_extract *edev, gx_device *target,
+ gx_device *plane_dev,
+ const gx_render_plane_t *render_plane, bool clear);
#endif /* gdevplnx_INCLUDED */
Index: gdevppla.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevppla.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevppla.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevppla.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -22,28 +22,28 @@
# define gdevppla_INCLUDED
/* Set the buf_procs in a printer device to planar mode. */
-int gdev_prn_set_procs_planar(P1(gx_device *pdev));
+int gdev_prn_set_procs_planar(gx_device *pdev);
/* Open a printer device, conditionally setting it to be planar. */
-int gdev_prn_open_planar(P2(gx_device *pdev, bool upb));
+int gdev_prn_open_planar(gx_device *pdev, bool upb);
/* Augment get/put_params to add UsePlanarBuffer. */
-int gdev_prn_get_params_planar(P3(gx_device * pdev, gs_param_list * plist,
- bool *pupb));
-int gdev_prn_put_params_planar(P3(gx_device * pdev, gs_param_list * plist,
- bool *pupb));
+int gdev_prn_get_params_planar(gx_device * pdev, gs_param_list * plist,
+ bool *pupb);
+int gdev_prn_put_params_planar(gx_device * pdev, gs_param_list * plist,
+ bool *pupb);
/* Create a planar buffer device. */
/* Use this instead of the default if UsePlanarBuffer is true. */
-int gdev_prn_create_buf_planar(P5(gx_device **pbdev, gx_device *target,
- const gx_render_plane_t *render_plane,
- gs_memory_t *mem, bool for_band));
+int gdev_prn_create_buf_planar(gx_device **pbdev, gx_device *target,
+ const gx_render_plane_t *render_plane,
+ gs_memory_t *mem, bool for_band);
/* Determine the space needed by a planar buffer device. */
/* Use this instead of the default if UsePlanarBuffer is true. */
-int gdev_prn_size_buf_planar(P5(gx_device_buf_space_t *space,
- gx_device *target,
- const gx_render_plane_t *render_plane,
- int height, bool for_band));
+int gdev_prn_size_buf_planar(gx_device_buf_space_t *space,
+ gx_device *target,
+ const gx_render_plane_t *render_plane,
+ int height, bool for_band);
#endif /* gdevppla_INCLUDED */
Index: gdevprn.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevprn.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gdevprn.h 21 Feb 2002 22:24:51 -0000 1.9
+++ gdevprn.h 16 Jun 2002 07:25:26 -0000 1.10
@@ -107,7 +107,7 @@
*/
#define prn_dev_proc_print_page(proc)\
- int proc(P2(gx_device_printer *, FILE *))
+ int proc(gx_device_printer *, FILE *)
prn_dev_proc_print_page((*print_page));
/* BACKWARD COMPATIBILITY */
#define dev_proc_print_page(proc) prn_dev_proc_print_page(proc)
@@ -115,7 +115,7 @@
/* Print the page on the output file, with a given # of copies. */
#define prn_dev_proc_print_page_copies(proc)\
- int proc(P3(gx_device_printer *, FILE *, int))
+ int proc(gx_device_printer *, FILE *, int)
prn_dev_proc_print_page_copies((*print_page_copies));
/* BACKWARD COMPATIBILITY */
#define dev_proc_print_page_copies(proc) prn_dev_proc_print_page_copies(proc)
@@ -139,7 +139,7 @@
*/
#define prn_dev_proc_get_space_params(proc)\
- void proc(P2(const gx_device_printer *, gdev_prn_space_params *))
+ void proc(const gx_device_printer *, gdev_prn_space_params *)
prn_dev_proc_get_space_params((*get_space_params));
/*
@@ -155,7 +155,7 @@
*/
#define prn_dev_proc_start_render_thread(proc)\
- int proc(P1(gdev_prn_start_render_params *))
+ int proc(gdev_prn_start_render_params *)
prn_dev_proc_start_render_thread((*start_render_thread));
/*
@@ -170,11 +170,11 @@
*/
#define prn_dev_proc_open_render_device(proc)\
- int proc(P1(gx_device_printer *))
+ int proc(gx_device_printer *)
prn_dev_proc_open_render_device((*open_render_device));
#define prn_dev_proc_close_render_device(proc)\
- int proc(P1(gx_device_printer *))
+ int proc(gx_device_printer *)
prn_dev_proc_close_render_device((*close_render_device));
/*
@@ -195,7 +195,7 @@
* default. */
#define prn_dev_proc_buffer_page(proc)\
- int proc(P3(gx_device_printer *, FILE *, int))
+ int proc(gx_device_printer *, FILE *, int)
prn_dev_proc_buffer_page((*buffer_page));
} gx_printer_device_procs;
@@ -464,18 +464,18 @@
* Open the printer's output file if necessary.
*/
/* VMS limits procedure names to 31 characters. */
-int gdev_prn_open_printer_seekable(P3(gx_device *dev, bool binary_mode,
- bool seekable));
+int gdev_prn_open_printer_seekable(gx_device *dev, bool binary_mode,
+ bool seekable);
/* BACKWARD COMPATIBILITY */
#define gdev_prn_open_printer_positionable gdev_prn_open_printer_seekable
/* open_printer defaults positionable = false */
-int gdev_prn_open_printer(P2(gx_device * dev, bool binary_mode));
+int gdev_prn_open_printer(gx_device * dev, bool binary_mode);
/*
* Test whether the printer's output file was just opened, i.e., whether
* this is the first page being written to this file. This is only valid
* at the entry to a driver's print_page procedure.
*/
-bool gdev_prn_file_is_new(P1(const gx_device_printer *pdev));
+bool gdev_prn_file_is_new(const gx_device_printer *pdev);
/*
* Determine the number of bytes required for one scan line of output to
@@ -495,18 +495,18 @@
* is stored in *range_start, and the height of the range is returned.
* If the parameters are invalid, the procedure returns -1.
*/
-int gdev_prn_colors_used(P5(gx_device *dev, int y, int height,
- gx_colors_used_t *colors_used,
- int *range_start));
+int gdev_prn_colors_used(gx_device *dev, int y, int height,
+ gx_colors_used_t *colors_used,
+ int *range_start);
/*
* Determine the colors used in a saved page. We still need the device
* in order to know the total page height.
*/
-int gx_page_info_colors_used(P6(const gx_device *dev,
- const gx_band_page_info_t *page_info,
- int y, int height,
- gx_colors_used_t *colors_used,
- int *range_start));
+int gx_page_info_colors_used(const gx_device *dev,
+ const gx_band_page_info_t *page_info,
+ int y, int height,
+ gx_colors_used_t *colors_used,
+ int *range_start);
/*
* Render a subrectangle of the page into a target device provided by the
@@ -530,11 +530,11 @@
* asked to execute an operation that requires full pixels, it will return
* an error.
*/
-int gdev_prn_render_rectangle(P5(gx_device_printer *pdev,
- const gs_int_rect *prect,
- gx_device *target,
- const gx_render_plane_t *render_plane,
- bool clear));
+int gdev_prn_render_rectangle(gx_device_printer *pdev,
+ const gs_int_rect *prect,
+ gx_device *target,
+ const gx_render_plane_t *render_plane,
+ bool clear);
/*
* Read one or more rasterized scan lines for printing.
@@ -552,18 +552,18 @@
* occur in the preallocated buffer, and a pointer into the buffer will be
* returned.
*/
-int gdev_prn_get_lines(P8(gx_device_printer *pdev, int y, int height,
- byte *buffer, uint bytes_per_line,
- byte **actual_buffer, uint *actual_bytes_per_line,
- const gx_render_plane_t *render_plane));
+int gdev_prn_get_lines(gx_device_printer *pdev, int y, int height,
+ byte *buffer, uint bytes_per_line,
+ byte **actual_buffer, uint *actual_bytes_per_line,
+ const gx_render_plane_t *render_plane);
/*
* Read a rasterized scan line for sending to the printer.
* This is essentially a simplified form of gdev_prn_get_lines,
* except that it also calls gdev_prn_clear_trailing_bits.
*/
-int gdev_prn_get_bits(P4(gx_device_printer *pdev, int y, byte *buffer,
- byte **actual_buffer));
+int gdev_prn_get_bits(gx_device_printer *pdev, int y, byte *buffer,
+ byte **actual_buffer);
/*
* Copy scan lines to send to the printer. This is now DEPRECATED,
@@ -571,7 +571,7 @@
* the right form in the rasterizer buffer. Use gdev_prn_get_bits
* instead. For documentation, see the implementation in gdevprn.c.
*/
-int gdev_prn_copy_scan_lines(P4(gx_device_printer *, int, byte *, uint));
+int gdev_prn_copy_scan_lines(gx_device_printer *, int, byte *, uint);
/*
* Clear any trailing bits in the last byte of one or more scan lines
@@ -579,13 +579,13 @@
* the device is only used to get the width and depth, and need not be
* a printer device.
*/
-void gdev_prn_clear_trailing_bits(P4(byte *data, uint raster, int height,
- const gx_device *dev));
+void gdev_prn_clear_trailing_bits(byte *data, uint raster, int height,
+ const gx_device *dev);
/*
* Close the printer's output file.
*/
-int gdev_prn_close_printer(P1(gx_device *));
+int gdev_prn_close_printer(gx_device *);
/* Print a single copy of a page by calling print_page_copies. */
prn_dev_proc_print_page(gx_print_page_single_copy);
@@ -600,16 +600,16 @@
* Determine the number of scan lines that should actually be passed
* to the device.
*/
-int gdev_prn_print_scan_lines(P1(gx_device *));
+int gdev_prn_print_scan_lines(gx_device *);
/* Allocate / reallocate / free printer memory. */
-int gdev_prn_allocate_memory(P4(gx_device *pdev,
- gdev_prn_space_params *space,
- int new_width, int new_height));
-int gdev_prn_reallocate_memory(P4(gx_device *pdev,
- gdev_prn_space_params *space,
- int new_width, int new_height));
-int gdev_prn_free_memory(P1(gx_device *pdev));
+int gdev_prn_allocate_memory(gx_device *pdev,
+ gdev_prn_space_params *space,
+ int new_width, int new_height);
+int gdev_prn_reallocate_memory(gx_device *pdev,
+ gdev_prn_space_params *space,
+ int new_width, int new_height);
+int gdev_prn_free_memory(gx_device *pdev);
/*
* Create the buffer device for a printer device. Clients should always
@@ -618,10 +618,10 @@
* code needs this: normally it is dev_proc(some_dev, create_buf_device).
*/
typedef dev_proc_create_buf_device((*create_buf_device_proc_t));
-int gdev_create_buf_device(P6(create_buf_device_proc_t cbd_proc,
- gx_device **pbdev, gx_device *target,
- const gx_render_plane_t *render_plane,
- gs_memory_t *mem, bool for_band));
+int gdev_create_buf_device(create_buf_device_proc_t cbd_proc,
+ gx_device **pbdev, gx_device *target,
+ const gx_render_plane_t *render_plane,
+ gs_memory_t *mem, bool for_band);
/* BACKWARD COMPATIBILITY */
#define dev_print_scan_lines(dev)\
@@ -636,8 +636,8 @@
#if 0 /**************** VMS linker gets upset *************** */
#endif
-int gdev_prn_initialize(P3(gx_device *, const char *, dev_proc_print_page((*))));
-void gdev_prn_init_color(P4(gx_device *, int, dev_proc_map_rgb_color((*)), dev_proc_map_color_rgb((*))));
+int gdev_prn_initialize(gx_device *, const char *, dev_proc_print_page((*)));
+void gdev_prn_init_color(gx_device *, int, dev_proc_map_rgb_color((*)), dev_proc_map_color_rgb((*)));
#define prn_device_type(dtname, initproc, pageproc)\
private dev_proc_print_page(pageproc);\
Index: gdevprna.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevprna.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevprna.h 21 Feb 2002 22:24:51 -0000 1.4
+++ gdevprna.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -158,15 +158,15 @@
* This routine is always called by the concrete device's xx_open routine
* in lieu of gdev_prn_open.
*/
-int gdev_prn_async_write_open(P4(gx_device_printer *pdev, int max_raster,
- int min_band_height, int max_src_image_row));
+int gdev_prn_async_write_open(gx_device_printer *pdev, int max_raster,
+ int min_band_height, int max_src_image_row);
/* Open the render portion of a printer device in ASYNC (overlapped) mode.
*
* This routine is always called by concrete device's xx_open_render_device
* in lieu of gdev_prn_open.
*/
-int gdev_prn_async_render_open(P1(gx_device_printer *prdev));
+int gdev_prn_async_render_open(gx_device_printer *prdev);
/*
* Must be called by async device driver implementation (see
@@ -175,6 +175,6 @@
* the device is open. This proc only returns after the device is closed.
*/
int /* rets 0 ok, -ve error code */
-gdev_prn_async_render_thread(P1(gdev_prn_start_render_params *));
+gdev_prn_async_render_thread(gdev_prn_start_render_params *);
#endif /* gdevprna_INCLUDED */
Index: gdevpsdf.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpsdf.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gdevpsdf.h 14 Jun 2002 06:03:08 -0000 1.14
+++ gdevpsdf.h 16 Jun 2002 07:25:26 -0000 1.15
@@ -256,34 +256,34 @@
/* ---------------- Vector implementation procedures ---------------- */
/* Imager state */
-int psdf_setlinewidth(P2(gx_device_vector * vdev, floatp width));
-int psdf_setlinecap(P2(gx_device_vector * vdev, gs_line_cap cap));
-int psdf_setlinejoin(P2(gx_device_vector * vdev, gs_line_join join));
-int psdf_setmiterlimit(P2(gx_device_vector * vdev, floatp limit));
-int psdf_setdash(P4(gx_device_vector * vdev, const float *pattern,
- uint count, floatp offset));
-int psdf_setflat(P2(gx_device_vector * vdev, floatp flatness));
-int psdf_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop,
- gs_logical_operation_t diff));
+int psdf_setlinewidth(gx_device_vector * vdev, floatp width);
+int psdf_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
+int psdf_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+int psdf_setmiterlimit(gx_device_vector * vdev, floatp limit);
+int psdf_setdash(gx_device_vector * vdev, const float *pattern,
+ uint count, floatp offset);
+int psdf_setflat(gx_device_vector * vdev, floatp flatness);
+int psdf_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
+ gs_logical_operation_t diff);
/* Other state */
-int psdf_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
-int psdf_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
+int psdf_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
+int psdf_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
/* Paths */
#define psdf_dopath gdev_vector_dopath
-int psdf_dorect(P6(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
- fixed y1, gx_path_type_t type));
-int psdf_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-int psdf_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
- floatp x, floatp y, gx_path_type_t type));
-int psdf_lineto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
- floatp x, floatp y, gx_path_type_t type));
-int psdf_curveto(P10(gx_device_vector * vdev, floatp x0, floatp y0,
- floatp x1, floatp y1, floatp x2,
- floatp y2, floatp x3, floatp y3, gx_path_type_t type));
-int psdf_closepath(P6(gx_device_vector * vdev, floatp x0, floatp y0,
- floatp x_start, floatp y_start, gx_path_type_t type));
+int psdf_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
+ fixed y1, gx_path_type_t type);
+int psdf_beginpath(gx_device_vector * vdev, gx_path_type_t type);
+int psdf_moveto(gx_device_vector * vdev, floatp x0, floatp y0,
+ floatp x, floatp y, gx_path_type_t type);
+int psdf_lineto(gx_device_vector * vdev, floatp x0, floatp y0,
+ floatp x, floatp y, gx_path_type_t type);
+int psdf_curveto(gx_device_vector * vdev, floatp x0, floatp y0,
+ floatp x1, floatp y1, floatp x2,
+ floatp y2, floatp x3, floatp y3, gx_path_type_t type);
+int psdf_closepath(gx_device_vector * vdev, floatp x0, floatp y0,
+ floatp x_start, floatp y_start, gx_path_type_t type);
/* ---------------- Binary (image) data procedures ---------------- */
@@ -302,16 +302,16 @@
#define psdf_binary_writer_max_ptrs 4
/* Begin writing binary data. */
-int psdf_begin_binary(P2(gx_device_psdf * pdev, psdf_binary_writer * pbw));
+int psdf_begin_binary(gx_device_psdf * pdev, psdf_binary_writer * pbw);
/* Add an encoding filter. The client must have allocated the stream state, */
/* if any, using pdev->v_memory. */
-int psdf_encode_binary(P3(psdf_binary_writer * pbw,
- const stream_template * template, stream_state * ss));
+int psdf_encode_binary(psdf_binary_writer * pbw,
+ const stream_template * template, stream_state * ss);
/* Add a 2-D CCITTFax encoding filter. */
/* Set EndOfBlock iff the stream is not ASCII85 encoded. */
-int psdf_CFE_binary(P4(psdf_binary_writer * pbw, int w, int h, bool invert));
+int psdf_CFE_binary(psdf_binary_writer * pbw, int w, int h, bool invert);
/*
* Acquire parameters, and optionally set up the filter for, a DCTEncode
@@ -319,34 +319,33 @@
* filter parameters when they are set, rather than waiting until they are
* used. pbw = NULL means just set up the stream state.
*/
-int psdf_DCT_filter(P6(gs_param_list *plist /* may be NULL */,
- stream_state /*stream_DCTE_state*/ *st,
- int Columns, int Rows, int Colors,
- psdf_binary_writer *pbw /* may be NULL */));
+int psdf_DCT_filter(gs_param_list *plist /* may be NULL */,
+ stream_state /*stream_DCTE_state*/ *st,
+ int Columns, int Rows, int Colors,
+ psdf_binary_writer *pbw /* may be NULL */);
/* Set up compression and downsampling filters for an image. */
/* Note that this may modify the image parameters. */
/* If pctm is NULL, downsampling is not used. */
/* pis only provides UCR and BG information for CMYK => RGB conversion. */
-int psdf_setup_image_filters(P6(gx_device_psdf *pdev, psdf_binary_writer *pbw,
- gs_pixel_image_t *pim, const gs_matrix *pctm,
- const gs_imager_state * pis, bool lossless));
+int psdf_setup_image_filters(gx_device_psdf *pdev, psdf_binary_writer *pbw,
+ gs_pixel_image_t *pim, const gs_matrix *pctm,
+ const gs_imager_state * pis, bool lossless);
/* Set up compression filters for a lossless image, with no downsampling, */
/* no color space conversion, and only lossless filters. */
/* Note that this may modify the image parameters. */
-int psdf_setup_lossless_filters(P3(gx_device_psdf *pdev,
- psdf_binary_writer *pbw,
- gs_pixel_image_t *pim));
+int psdf_setup_lossless_filters(gx_device_psdf *pdev, psdf_binary_writer *pbw,
+ gs_pixel_image_t *pim);
/* Finish writing binary data. */
-int psdf_end_binary(P1(psdf_binary_writer * pbw));
+int psdf_end_binary(psdf_binary_writer * pbw);
/* Set up image compression chooser. */
-int psdf_setup_compression_chooser(P6(psdf_binary_writer *pbw,
- gx_device_psdf *pdev,
- int width, int height, int depth,
- int bits_per_sample));
+int psdf_setup_compression_chooser(psdf_binary_writer *pbw,
+ gx_device_psdf *pdev,
+ int width, int height, int depth,
+ int bits_per_sample);
/* ---------------- Symbolic data printing ---------------- */
@@ -379,11 +378,11 @@
* Adjust a gx_color_index to compensate for the fact that the bit pattern
* of gx_color_index isn't representable.
*/
-gx_color_index psdf_adjust_color_index(P2(gx_device_vector *vdev,
- gx_color_index color));
+gx_color_index psdf_adjust_color_index(gx_device_vector *vdev,
+ gx_color_index color);
/* Set the fill or stroke color. */
-int psdf_set_color(P3(gx_device_vector *vdev, const gx_drawing_color *pdc,
- const psdf_set_color_commands_t *ppscc));
+int psdf_set_color(gx_device_vector *vdev, const gx_drawing_color *pdc,
+ const psdf_set_color_commands_t *ppscc);
#endif /* gdevpsdf_INCLUDED */
Index: gdevpsds.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpsds.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gdevpsds.h 14 Jun 2002 06:35:08 -0000 1.8
+++ gdevpsds.h 16 Jun 2002 07:25:26 -0000 1.9
@@ -47,7 +47,7 @@
extern const stream_template s_8_4_template;
/* Initialize an expansion or reduction stream. */
-int s_1248_init(P3(stream_1248_state *ss, int Columns, int samples_per_pixel));
+int s_1248_init(stream_1248_state *ss, int Columns, int samples_per_pixel);
/* ---------------- Color space conversion ---------------- */
@@ -64,7 +64,7 @@
extern const stream_template s_C2R_template;
/* Initialize a CMYK => RGB conversion stream. */
-int s_C2R_init(P2(stream_C2R_state *ss, const gs_imager_state *pis));
+int s_C2R_init(stream_C2R_state *ss, const gs_imager_state *pis);
/* Convert an image to indexed form (IndexedEncode filter). */
typedef struct stream_IE_state_s {
@@ -126,7 +126,7 @@
} stream_Downsample_state;
/* Return the number of samples after downsampling. */
-int s_Downsample_size_out(P3(int size_in, int factor, bool pad));
+int s_Downsample_size_out(int size_in, int factor, bool pad);
/* Subsample */
typedef struct stream_Subsample_state_s {
@@ -169,10 +169,10 @@
/* Set image dimensions. */
int
-s_compr_chooser_set_dimensions(P5(stream_compr_chooser_state * st, int width,
- int height, int depth, int bits_per_sample));
+s_compr_chooser_set_dimensions(stream_compr_chooser_state * st, int width,
+ int height, int depth, int bits_per_sample);
/* Get choice */
-uint s_compr_chooser__get_choice(P2(stream_compr_chooser_state *st, bool force));
+uint s_compr_chooser__get_choice(stream_compr_chooser_state *st, bool force);
#endif /* gdevpsds_INCLUDED */
Index: gdevpsf.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpsf.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gdevpsf.h 15 Jun 2002 21:11:53 -0000 1.16
+++ gdevpsf.h 16 Jun 2002 07:25:26 -0000 1.17
@@ -55,7 +55,7 @@
} subset;
gs_glyph_space_t glyph_space;
ulong index;
- int (*enumerate_next)(P2(psf_glyph_enum_t *, gs_glyph *));
+ int (*enumerate_next)(psf_glyph_enum_t *, gs_glyph *);
};
/*
@@ -63,18 +63,18 @@
* > 0 but subset_glyphs == 0, enumerate all glyphs in [0 .. subset_size-1]
* (as integer glyphs, i.e., offset by gs_min_cid_glyph).
*/
-void psf_enumerate_list_begin(P5(psf_glyph_enum_t *ppge, gs_font *font,
- const gs_glyph *subset_list,
- uint subset_size,
- gs_glyph_space_t glyph_space));
+void psf_enumerate_list_begin(psf_glyph_enum_t *ppge, gs_font *font,
+ const gs_glyph *subset_list,
+ uint subset_size,
+ gs_glyph_space_t glyph_space);
/* Backward compatibility */
#define psf_enumerate_glyphs_begin psf_enumerate_list_begin
/* Begin enumerating CID or TT glyphs in a subset given by a bit vector. */
/* Note that subset_size is given in bits, not in bytes. */
-void psf_enumerate_bits_begin(P5(psf_glyph_enum_t *ppge, gs_font *font,
- const byte *subset_bits, uint subset_size,
- gs_glyph_space_t glyph_space));
+void psf_enumerate_bits_begin(psf_glyph_enum_t *ppge, gs_font *font,
+ const byte *subset_bits, uint subset_size,
+ gs_glyph_space_t glyph_space);
/* Backward compatibility */
#define psf_enumerate_cids_begin(ppge, font, bits, size)\
psf_enumerate_bits_begin(ppge, font, bits, size, GLYPH_SPACE_NAME)
@@ -82,20 +82,20 @@
/*
* Reset a glyph enumeration.
*/
-void psf_enumerate_glyphs_reset(P1(psf_glyph_enum_t *ppge));
+void psf_enumerate_glyphs_reset(psf_glyph_enum_t *ppge);
/*
* Enumerate the next glyph in a font or a font subset.
* Return 0 if more glyphs, 1 if done, <0 if error.
*/
-int psf_enumerate_glyphs_next(P2(psf_glyph_enum_t *ppge, gs_glyph *pglyph));
+int psf_enumerate_glyphs_next(psf_glyph_enum_t *ppge, gs_glyph *pglyph);
/*
* Get the set of referenced glyphs (indices) for writing a subset font.
* Does not sort or remove duplicates.
*/
-int psf_subset_glyphs(P3(gs_glyph glyphs[256], gs_font *font,
- const byte used[32]));
+int psf_subset_glyphs(gs_glyph glyphs[256], gs_font *font,
+ const byte used[32]);
/*
* Add composite glyph pieces to a list of glyphs. Does not sort or
@@ -103,26 +103,26 @@
* single glyph can have: if this value is not known, the caller should
* use max_count.
*/
-int psf_add_subset_pieces(P5(gs_glyph *glyphs, uint *pcount, uint max_count,
- uint max_pieces, gs_font *font));
+int psf_add_subset_pieces(gs_glyph *glyphs, uint *pcount, uint max_count,
+ uint max_pieces, gs_font *font);
/*
* Sort a list of glyphs and remove duplicates. Return the number of glyphs
* in the result.
*/
-int psf_sort_glyphs(P2(gs_glyph *glyphs, int count));
+int psf_sort_glyphs(gs_glyph *glyphs, int count);
/*
* Return the index of a given glyph in a sorted list of glyphs, or -1
* if the glyph is not present.
*/
-int psf_sorted_glyphs_index_of(P3(const gs_glyph *glyphs, int count,
- gs_glyph glyph));
+int psf_sorted_glyphs_index_of(const gs_glyph *glyphs, int count,
+ gs_glyph glyph);
/*
* Determine whether a sorted list of glyphs includes a given glyph.
*/
-bool psf_sorted_glyphs_include(P3(const gs_glyph *glyphs, int count,
- gs_glyph glyph));
+bool psf_sorted_glyphs_include(const gs_glyph *glyphs, int count,
+ gs_glyph glyph);
/*
* Define the internal structure that holds glyph information for an
@@ -143,13 +143,13 @@
#endif
/* Define the type for the glyph data callback procedure. */
-typedef int (*glyph_data_proc_t)(P4(gs_font_base *, gs_glyph,
- gs_glyph_data_t *, gs_font_type1 **));
+typedef int (*glyph_data_proc_t)(gs_font_base *, gs_glyph,
+ gs_glyph_data_t *, gs_font_type1 **);
/* Check that all selected glyphs can be written. */
-int psf_check_outline_glyphs(P3(gs_font_base *pfont,
- psf_glyph_enum_t *ppge,
- glyph_data_proc_t glyph_data));
+int psf_check_outline_glyphs(gs_font_base *pfont,
+ psf_glyph_enum_t *ppge,
+ glyph_data_proc_t glyph_data);
/*
* Gather glyph information for a Type 1, Type 2, or CIDFontType 0 font.
@@ -159,18 +159,18 @@
* FDArray element. If subset_glyphs != 0, this procedure removes
* undefined glyphs from the list it builds.
*/
-int psf_get_outline_glyphs(P5(psf_outline_glyphs_t *pglyphs,
- gs_font_base *pfont, gs_glyph *subset_glyphs,
- uint subset_size, glyph_data_proc_t glyph_data));
+int psf_get_outline_glyphs(psf_outline_glyphs_t *pglyphs,
+ gs_font_base *pfont, gs_glyph *subset_glyphs,
+ uint subset_size, glyph_data_proc_t glyph_data);
/* ------ Exported by gdevpsf1.c ------ */
/* Gather glyph information for a Type 1 or Type 2 font. */
-int psf_type1_glyph_data(P4(gs_font_base *, gs_glyph, gs_glyph_data_t *,
- gs_font_type1 **));
-int psf_get_type1_glyphs(P4(psf_outline_glyphs_t *pglyphs,
- gs_font_type1 *pfont,
- gs_glyph *subset_glyphs, uint subset_size));
+int psf_type1_glyph_data(gs_font_base *, gs_glyph, gs_glyph_data_t *,
+ gs_font_type1 **);
+int psf_get_type1_glyphs(psf_outline_glyphs_t *pglyphs,
+ gs_font_type1 *pfont,
+ gs_glyph *subset_glyphs, uint subset_size);
/*
* Write a Type 1 font definition. This procedure does not allocate
@@ -182,11 +182,10 @@
#define WRITE_TYPE1_EEXEC_MARK 8 /* assume 512 0s will be added */
#define WRITE_TYPE1_POSTSCRIPT 16 /* don't observe ATM restrictions */
#define WRITE_TYPE1_WITH_LENIV 32 /* don't allow lenIV = -1 */
-int psf_write_type1_font(P7(stream *s, gs_font_type1 *pfont, int options,
- gs_glyph *subset_glyphs, uint subset_size,
- const gs_const_string *alt_font_name,
- int lengths[3]));
-
+int psf_write_type1_font(stream *s, gs_font_type1 *pfont, int options,
+ gs_glyph *subset_glyphs, uint subset_size,
+ const gs_const_string *alt_font_name,
+ int lengths[3]);
/* ------ Exported by gdevpsf2.c ------ */
@@ -197,9 +196,9 @@
#define WRITE_TYPE2_NO_LENIV 1 /* always use lenIV = -1 */
#define WRITE_TYPE2_CHARSTRINGS 2 /* convert T1 charstrings to T2 */
#define WRITE_TYPE2_AR3 4 /* work around bugs in Acrobat Reader 3 */
-int psf_write_type2_font(P6(stream *s, gs_font_type1 *pfont, int options,
- gs_glyph *subset_glyphs, uint subset_size,
- const gs_const_string *alt_font_name));
+int psf_write_type2_font(stream *s, gs_font_type1 *pfont, int options,
+ gs_glyph *subset_glyphs, uint subset_size,
+ const gs_const_string *alt_font_name);
#ifndef gs_font_cid0_DEFINED
# define gs_font_cid0_DEFINED
@@ -212,9 +211,9 @@
* subset_size bits (not bytes).
* This procedure does not allocate or free any data.
*/
-int psf_write_cid0_font(P6(stream *s, gs_font_cid0 *pfont, int options,
- const byte *subset_cids, uint subset_size,
- const gs_const_string *alt_font_name));
+int psf_write_cid0_font(stream *s, gs_font_cid0 *pfont, int options,
+ const byte *subset_cids, uint subset_size,
+ const gs_const_string *alt_font_name);
/* ------ Exported by gdevpsfm.c ------ */
@@ -226,10 +225,10 @@
# define gs_cmap_DEFINED
typedef struct gs_cmap_s gs_cmap_t;
#endif
-typedef int (*psf_put_name_chars_proc_t)(P3(stream *, const byte *, uint));
-int psf_write_cmap(P4(stream *s, const gs_cmap_t *pcmap,
- psf_put_name_chars_proc_t put_name_chars,
- const gs_const_string *alt_cmap_name));
+typedef int (*psf_put_name_chars_proc_t)(stream *, const byte *, uint);
+int psf_write_cmap(stream *s, const gs_cmap_t *pcmap,
+ psf_put_name_chars_proc_t put_name_chars,
+ const gs_const_string *alt_cmap_name);
/* ------ Exported by gdevpsft.c ------ */
@@ -245,9 +244,9 @@
#define WRITE_TRUETYPE_NAME 2 /* generate name if missing */
#define WRITE_TRUETYPE_POST 4 /* generate post if missing */
#define WRITE_TRUETYPE_NO_TRIMMED_TABLE 8 /* not OK to use cmap format 6 */
-int psf_write_truetype_font(P6(stream *s, gs_font_type42 *pfont, int options,
- gs_glyph *subset_glyphs, uint subset_size,
- const gs_const_string *alt_font_name));
+int psf_write_truetype_font(stream *s, gs_font_type42 *pfont, int options,
+ gs_glyph *subset_glyphs, uint subset_size,
+ const gs_const_string *alt_font_name);
/*
* Write a "stripped" TrueType font definition. All tables are written
@@ -284,9 +283,9 @@
* included explicitly in the subset.
* This procedure does not allocate or free any data.
*/
-int psf_write_cid2_font(P6(stream *s, gs_font_cid2 *pfont, int options,
- const byte *subset_glyphs, uint subset_size,
- const gs_const_string *alt_font_name));
+int psf_write_cid2_font(stream *s, gs_font_cid2 *pfont, int options,
+ const byte *subset_glyphs, uint subset_size,
+ const gs_const_string *alt_font_name);
/*
* Write a "stripped" CIDFontType 2 font definition. This is the same
@@ -301,7 +300,7 @@
* This procedure does not allocate or free any data.
* NOTE: this procedure expands all Subrs in-line.
*/
-int psf_convert_type1_to_type2(P3(stream *s, const gs_glyph_data_t *pgd,
- gs_font_type1 *pfont));
+int psf_convert_type1_to_type2(stream *s, const gs_glyph_data_t *pgd,
+ gs_font_type1 *pfont);
#endif /* gdevpsf_INCLUDED */
Index: gdevpsu.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpsu.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gdevpsu.h 21 Feb 2002 22:24:52 -0000 1.6
+++ gdevpsu.h 16 Jun 2002 07:25:26 -0000 1.7
@@ -34,7 +34,7 @@
/* ---------------- Low level ---------------- */
/* Write a 0-terminated array of strings as lines. */
-void psw_print_lines(P2(FILE *f, const char *const lines[]));
+void psw_print_lines(FILE *f, const char *const lines[]);
/* ---------------- File level ---------------- */
@@ -42,31 +42,31 @@
* Write the file header, up through the BeginProlog. This must write to a
* file, not a stream, because it may be called during finalization.
*/
-void psw_begin_file_header(P5(FILE *f, const gx_device *dev,
- const gs_rect *pbbox,
- gx_device_pswrite_common_t *pdpc, bool ascii));
+void psw_begin_file_header(FILE *f, const gx_device *dev,
+ const gs_rect *pbbox,
+ gx_device_pswrite_common_t *pdpc, bool ascii);
/* End the file header.*/
-void psw_end_file_header(P1(FILE *f));
+void psw_end_file_header(FILE *f);
/* End the file. */
-void psw_end_file(P5(FILE *f, const gx_device *dev,
- const gx_device_pswrite_common_t *pdpc,
- const gs_rect *pbbox, int page_count));
+void psw_end_file(FILE *f, const gx_device *dev,
+ const gx_device_pswrite_common_t *pdpc,
+ const gs_rect *pbbox, int page_count);
/* ---------------- Page level ---------------- */
/*
* Write the page header.
*/
-void psw_write_page_header(P5(stream *s, const gx_device *dev,
- const gx_device_pswrite_common_t *pdpc,
- bool do_scale, long page_ord));
+void psw_write_page_header(stream *s, const gx_device *dev,
+ const gx_device_pswrite_common_t *pdpc,
+ bool do_scale, long page_ord);
/*
* Write the page trailer. We do this directly to the file, rather than to
* the stream, because we may have to do it during finalization.
*/
-void psw_write_page_trailer(P3(FILE *f, int num_copies, int flush));
+void psw_write_page_trailer(FILE *f, int num_copies, int flush);
#endif /* gdevpsu_INCLUDED */
Index: gdevpxut.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpxut.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevpxut.h 21 Feb 2002 22:24:52 -0000 1.4
+++ gdevpxut.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -24,58 +24,58 @@
/* ---------------- High-level constructs ---------------- */
/* Write the file header, including the resolution. */
-int px_write_file_header(P2(stream *s, const gx_device *dev));
+int px_write_file_header(stream *s, const gx_device *dev);
/* Write the page header, including orientation. */
-int px_write_page_header(P2(stream *s, const gx_device *dev));
+int px_write_page_header(stream *s, const gx_device *dev);
/* Write the media selection command if needed, updating the media size. */
-int px_write_select_media(P3(stream *s, const gx_device *dev,
- pxeMediaSize_t *pms));
+int px_write_select_media(stream *s, const gx_device *dev,
+ pxeMediaSize_t *pms);
/*
* Write the file trailer. Note that this takes a FILE *, not a stream *,
* since it may be called after the stream is closed.
*/
-int px_write_file_trailer(P1(FILE *file));
+int px_write_file_trailer(FILE *file);
/* ---------------- Low-level data output ---------------- */
/* Write a sequence of bytes. */
#define PX_PUT_LIT(s, bytes) px_put_bytes(s, bytes, sizeof(bytes))
-void px_put_bytes(P3(stream * s, const byte * data, uint count));
+void px_put_bytes(stream * s, const byte * data, uint count);
/* Utilities for writing data values. */
/* H-P printers only support little-endian data, so that's what we emit. */
#define DA(a) pxt_attr_ubyte, (a)
-void px_put_a(P2(stream * s, px_attribute_t a));
-void px_put_ac(P3(stream *s, px_attribute_t a, px_tag_t op));
+void px_put_a(stream * s, px_attribute_t a);
+void px_put_ac(stream *s, px_attribute_t a, px_tag_t op);
#define DUB(b) pxt_ubyte, (byte)(b)
-void px_put_ub(P2(stream * s, byte b));
-void px_put_uba(P3(stream *s, byte b, px_attribute_t a));
+void px_put_ub(stream * s, byte b);
+void px_put_uba(stream *s, byte b, px_attribute_t a);
#define DS(i) (byte)(i), (byte)((i) >> 8)
-void px_put_s(P2(stream * s, uint i));
+void px_put_s(stream * s, uint i);
#define DUS(i) pxt_uint16, DS(i)
-void px_put_us(P2(stream * s, uint i));
-void px_put_usa(P3(stream *s, uint i, px_attribute_t a));
-void px_put_u(P2(stream * s, uint i));
+void px_put_us(stream * s, uint i);
+void px_put_usa(stream *s, uint i, px_attribute_t a);
+void px_put_u(stream * s, uint i);
#define DUSP(ix,iy) pxt_uint16_xy, DS(ix), DS(iy)
-void px_put_usp(P3(stream * s, uint ix, uint iy));
-void px_put_usq_fixed(P5(stream * s, fixed x0, fixed y0, fixed x1, fixed y1));
+void px_put_usp(stream * s, uint ix, uint iy);
+void px_put_usq_fixed(stream * s, fixed x0, fixed y0, fixed x1, fixed y1);
-void px_put_ss(P2(stream * s, int i));
-void px_put_ssp(P3(stream * s, int ix, int iy));
+void px_put_ss(stream * s, int i);
+void px_put_ssp(stream * s, int ix, int iy);
-void px_put_l(P2(stream * s, ulong l));
+void px_put_l(stream * s, ulong l);
-void px_put_r(P2(stream * s, floatp r)); /* no tag */
-void px_put_rl(P2(stream * s, floatp r)); /* pxt_real32 tag */
+void px_put_r(stream * s, floatp r); /* no tag */
+void px_put_rl(stream * s, floatp r); /* pxt_real32 tag */
-void px_put_data_length(P2(stream * s, uint num_bytes));
+void px_put_data_length(stream * s, uint num_bytes);
#endif /* gdevpxut_INCLUDED */
Index: gdevstc.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevstc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevstc.h 21 Feb 2002 22:24:52 -0000 1.4
+++ gdevstc.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -135,7 +135,7 @@
/*** Datatype for the array of dithering-Algorithms ***/
#define stc_proc_dither(name) \
- int name(P5(stcolor_device *sdev,int npixel,byte *in,byte *buf,byte *out))
+ int name(stcolor_device *sdev,int npixel,byte *in,byte *buf,byte *out)
typedef struct stc_dither_s {
const char *name; /* Mode-Name for Dithering */
Index: gdevsvga.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevsvga.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdevsvga.h 21 Feb 2002 22:24:52 -0000 1.4
+++ gdevsvga.h 16 Jun 2002 07:25:26 -0000 1.5
@@ -46,9 +46,9 @@
typedef struct gx_device_svga_s gx_device_svga;
struct gx_device_svga_s {
gx_device_common;
- int (*get_mode) (P0());
- void (*set_mode) (P1(int));
- void (*set_page) (P3(gx_device_svga * fbdev, int pnum, int wnum));
+ int (*get_mode) (void);
+ void (*set_mode) (int);
+ void (*set_page) (gx_device_svga * fbdev, int pnum, int wnum);
bool fixed_colors; /* if true, used a fixed palette */
const mode_info *mode; /* BIOS display mode info */
uint raster; /* frame buffer bytes per line */
@@ -57,7 +57,7 @@
/* Following are device-specific. */
union {
struct {
- void (*bios_set_page) (P2(int, int)); /* set-page function */
+ void (*bios_set_page) (int, int); /* set-page function */
int pn_shift; /* log2(64K/granularity) */
} vesa;
struct {
@@ -86,8 +86,8 @@
svga_color_device(procs, name, 8, 31, 4, get_mode, set_mode, set_page)
/* Utility procedures */
-void svga_init_colors(P1(gx_device *));
-int svga_find_mode(P2(gx_device *, const mode_info *));
-int svga_open(P1(gx_device *));
+void svga_init_colors(gx_device *);
+int svga_find_mode(gx_device *, const mode_info *);
+int svga_open(gx_device *);
#endif /* gdevsvga_INCLUDED */
Index: gdevtfax.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevtfax.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gdevtfax.h 21 Feb 2002 22:24:52 -0000 1.6
+++ gdevtfax.h 16 Jun 2002 07:25:26 -0000 1.7
@@ -20,7 +20,7 @@
#ifndef gdevtfax_INCLUDED
# define gdevtfax_INCLUDED
-int gdev_fax_print_page_stripped(P4(gx_device_printer *pdev, FILE *prn_stream,
- stream_CFE_state *ss, long rows_per_strip));
+int gdev_fax_print_page_stripped(gx_device_printer *pdev, FILE *prn_stream,
+ stream_CFE_state *ss, long rows_per_strip);
#endif /* gdevtfax_INCLUDED */
Index: gdevtifs.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevtifs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gdevtifs.h 21 Feb 2002 22:24:52 -0000 1.5
+++ gdevtifs.h 16 Jun 2002 07:25:26 -0000 1.6
@@ -168,10 +168,10 @@
TIFFTAG_PageNumber = 297, /* page number if multi-page */
TIFFTAG_Software = 305, /* software name & release */
TIFFTAG_DateTime = 306, /* creation date and time */
-/*
- * The CleanFaxData tag isn't in the TIFF 6 documentation, and many
- * TIFF-reading applications don't recognize it. Don't use it!
- */
+ /*
+ * The CleanFaxData tag isn't in the TIFF 6 documentation, and many
+ * TIFF-reading applications don't recognize it. Don't use it!
+ */
TIFFTAG_CleanFaxData = 327 /* regenerated line info */
#define CleanFaxData_clean 0 /* no errors detected */
#define CleanFaxData_regenerated 1 /* receiver regenerated lines */
@@ -205,22 +205,22 @@
* tags; the client can provide additional tags (pre-sorted) and
* indirect values.
*/
-int gdev_tiff_begin_page(P8(gx_device_printer * pdev, gdev_tiff_state * tifs,
- FILE * fp,
- const TIFF_dir_entry * entries, int entry_count,
- const byte * values, int value_size,
- long max_strip_size));
+int gdev_tiff_begin_page(gx_device_printer * pdev, gdev_tiff_state * tifs,
+ FILE * fp,
+ const TIFF_dir_entry * entries, int entry_count,
+ const byte * values, int value_size,
+ long max_strip_size);
/*
* Finish writing a TIFF strip. All data written since begin or last
* end_strip is considered to be a single strip.
*/
-int gdev_tiff_end_strip(P2(gdev_tiff_state * tifs, FILE * fp));
+int gdev_tiff_end_strip(gdev_tiff_state * tifs, FILE * fp);
/*
* Finish writing a TIFF page. StripOffsets and StripByteCounts are
* patched into the file.
*/
-int gdev_tiff_end_page(P2(gdev_tiff_state * tifs, FILE * fp));
+int gdev_tiff_end_page(gdev_tiff_state * tifs, FILE * fp);
#endif /* gdevtifs_INCLUDED */
Index: gdevvec.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevvec.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gdevvec.h 21 Feb 2002 22:24:52 -0000 1.9
+++ gdevvec.h 16 Jun 2002 07:25:26 -0000 1.10
@@ -97,51 +97,51 @@
} gx_rect_direction_t;
typedef struct gx_device_vector_procs_s {
/* Page management */
- int (*beginpage) (P1(gx_device_vector * vdev));
+ int (*beginpage) (gx_device_vector * vdev);
/* Imager state */
- int (*setlinewidth) (P2(gx_device_vector * vdev, floatp width));
- int (*setlinecap) (P2(gx_device_vector * vdev, gs_line_cap cap));
- int (*setlinejoin) (P2(gx_device_vector * vdev, gs_line_join join));
- int (*setmiterlimit) (P2(gx_device_vector * vdev, floatp limit));
- int (*setdash) (P4(gx_device_vector * vdev, const float *pattern,
- uint count, floatp offset));
- int (*setflat) (P2(gx_device_vector * vdev, floatp flatness));
- int (*setlogop) (P3(gx_device_vector * vdev, gs_logical_operation_t lop,
- gs_logical_operation_t diff));
+ int (*setlinewidth) (gx_device_vector * vdev, floatp width);
+ int (*setlinecap) (gx_device_vector * vdev, gs_line_cap cap);
+ int (*setlinejoin) (gx_device_vector * vdev, gs_line_join join);
+ int (*setmiterlimit) (gx_device_vector * vdev, floatp limit);
+ int (*setdash) (gx_device_vector * vdev, const float *pattern,
+ uint count, floatp offset);
+ int (*setflat) (gx_device_vector * vdev, floatp flatness);
+ int (*setlogop) (gx_device_vector * vdev, gs_logical_operation_t lop,
+ gs_logical_operation_t diff);
/* Other state */
- int (*setfillcolor) (P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
- int (*setstrokecolor) (P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
+ int (*setfillcolor) (gx_device_vector * vdev, const gx_drawing_color * pdc);
+ int (*setstrokecolor) (gx_device_vector * vdev, const gx_drawing_color * pdc);
/* Paths */
/* dopath and dorect are normally defaulted */
- int (*dopath) (P4(gx_device_vector * vdev, const gx_path * ppath,
- gx_path_type_t type, const gs_matrix *pmat));
- int (*dorect) (P6(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
- fixed y1, gx_path_type_t type));
- int (*beginpath) (P2(gx_device_vector * vdev, gx_path_type_t type));
- int (*moveto) (P6(gx_device_vector * vdev, floatp x0, floatp y0,
- floatp x, floatp y, gx_path_type_t type));
- int (*lineto) (P6(gx_device_vector * vdev, floatp x0, floatp y0,
- floatp x, floatp y, gx_path_type_t type));
- int (*curveto) (P10(gx_device_vector * vdev, floatp x0, floatp y0,
- floatp x1, floatp y1, floatp x2, floatp y2,
- floatp x3, floatp y3, gx_path_type_t type));
- int (*closepath) (P6(gx_device_vector * vdev, floatp x0, floatp y0,
- floatp x_start, floatp y_start, gx_path_type_t type));
- int (*endpath) (P2(gx_device_vector * vdev, gx_path_type_t type));
+ int (*dopath) (gx_device_vector * vdev, const gx_path * ppath,
+ gx_path_type_t type, const gs_matrix *pmat);
+ int (*dorect) (gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
+ fixed y1, gx_path_type_t type);
+ int (*beginpath) (gx_device_vector * vdev, gx_path_type_t type);
+ int (*moveto) (gx_device_vector * vdev, floatp x0, floatp y0,
+ floatp x, floatp y, gx_path_type_t type);
+ int (*lineto) (gx_device_vector * vdev, floatp x0, floatp y0,
+ floatp x, floatp y, gx_path_type_t type);
+ int (*curveto) (gx_device_vector * vdev, floatp x0, floatp y0,
+ floatp x1, floatp y1, floatp x2, floatp y2,
+ floatp x3, floatp y3, gx_path_type_t type);
+ int (*closepath) (gx_device_vector * vdev, floatp x0, floatp y0,
+ floatp x_start, floatp y_start, gx_path_type_t type);
+ int (*endpath) (gx_device_vector * vdev, gx_path_type_t type);
} gx_device_vector_procs;
/* Default implementations of procedures */
/* setflat does nothing */
-int gdev_vector_setflat(P2(gx_device_vector * vdev, floatp flatness));
+int gdev_vector_setflat(gx_device_vector * vdev, floatp flatness);
/* dopath may call dorect, beginpath, moveto/lineto/curveto/closepath, */
/* endpath */
-int gdev_vector_dopath(P4(gx_device_vector * vdev, const gx_path * ppath,
- gx_path_type_t type, const gs_matrix *pmat));
+int gdev_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
+ gx_path_type_t type, const gs_matrix *pmat);
/* dorect may call beginpath, moveto, lineto, closepath */
-int gdev_vector_dorect(P6(gx_device_vector * vdev, fixed x0, fixed y0,
- fixed x1, fixed y1, gx_path_type_t type));
+int gdev_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0,
+ fixed x1, fixed y1, gx_path_type_t type);
/* Finally, define the extended device structure. */
#define gx_device_vector_common\
@@ -210,10 +210,10 @@
/* ================ Utility procedures ================ */
/* Initialize the state. */
-void gdev_vector_init(P1(gx_device_vector * vdev));
+void gdev_vector_init(gx_device_vector * vdev);
/* Reset the remembered graphics state. */
-void gdev_vector_reset(P1(gx_device_vector * vdev));
+void gdev_vector_reset(gx_device_vector * vdev);
/*
* Open the output file and stream, with optional bbox tracking.
@@ -224,8 +224,8 @@
#define VECTOR_OPEN_FILE_SEQUENTIAL_OK 4 /* open as non-seekable if */
/* open as seekable fails */
#define VECTOR_OPEN_FILE_BBOX 8 /* also open bbox device */
-int gdev_vector_open_file_options(P3(gx_device_vector * vdev,
- uint strmbuf_size, int open_options));
+int gdev_vector_open_file_options(gx_device_vector * vdev,
+ uint strmbuf_size, int open_options);
#define gdev_vector_open_file_bbox(vdev, bufsize, bbox)\
gdev_vector_open_file_options(vdev, bufsize,\
(bbox ? VECTOR_OPEN_FILE_BBOX : 0))
@@ -233,35 +233,35 @@
gdev_vector_open_file_bbox(vdev, strmbuf_size, false)
/* Get the current stream, calling beginpage if in_page is false. */
-stream *gdev_vector_stream(P1(gx_device_vector * vdev));
+stream *gdev_vector_stream(gx_device_vector * vdev);
/* Bring the logical operation up to date. */
/* May call setlogop. */
-int gdev_vector_update_log_op(P2(gx_device_vector * vdev,
- gs_logical_operation_t lop));
+int gdev_vector_update_log_op(gx_device_vector * vdev,
+ gs_logical_operation_t lop);
/* Bring the fill color up to date. */
/* May call setfillcolor. */
-int gdev_vector_update_fill_color(P2(gx_device_vector * vdev,
- const gx_drawing_color * pdcolor));
+int gdev_vector_update_fill_color(gx_device_vector * vdev,
+ const gx_drawing_color * pdcolor);
/* Bring state up to date for filling. */
/* May call setflat, setfillcolor, setlogop. */
-int gdev_vector_prepare_fill(P4(gx_device_vector * vdev,
- const gs_imager_state * pis,
- const gx_fill_params * params,
- const gx_drawing_color * pdcolor));
+int gdev_vector_prepare_fill(gx_device_vector * vdev,
+ const gs_imager_state * pis,
+ const gx_fill_params * params,
+ const gx_drawing_color * pdcolor);
/* Bring state up to date for stroking. Note that we pass the scale */
/* for the line width and dash offset explicitly. */
/* May call setlinewidth, setlinecap, setlinejoin, setmiterlimit, */
/* setdash, setflat, setstrokecolor, setlogop. */
/* Any of pis, params, and pdcolor may be NULL. */
-int gdev_vector_prepare_stroke(P5(gx_device_vector * vdev,
- const gs_imager_state * pis,
- const gx_stroke_params * params,
- const gx_drawing_color * pdcolor,
- floatp scale));
+int gdev_vector_prepare_stroke(gx_device_vector * vdev,
+ const gs_imager_state * pis,
+ const gx_stroke_params * params,
+ const gx_drawing_color * pdcolor,
+ floatp scale);
/*
* Compute the scale for transforming the line width and dash pattern for a
@@ -269,9 +269,9 @@
* transformation matrix to be inverse-applied to the path elements as well.
* Return 0 if only scaling, 1 if a full matrix is needed.
*/
-int gdev_vector_stroke_scaling(P4(const gx_device_vector *vdev,
- const gs_imager_state *pis,
- double *pscale, gs_matrix *pmat));
+int gdev_vector_stroke_scaling(const gx_device_vector *vdev,
+ const gs_imager_state *pis,
+ double *pscale, gs_matrix *pmat);
/* Prepare to write a path using the default implementation. */
typedef struct gdev_vector_dopath_state_s {
@@ -284,39 +284,39 @@
gs_point start;
gs_point prev;
} gdev_vector_dopath_state_t;
-void gdev_vector_dopath_init(P4(gdev_vector_dopath_state_t *state,
- gx_device_vector *vdev,
- gx_path_type_t type, const gs_matrix *pmat));
+void gdev_vector_dopath_init(gdev_vector_dopath_state_t *state,
+ gx_device_vector *vdev,
+ gx_path_type_t type, const gs_matrix *pmat);
/* Write a segment of a path using the default implementation. */
-int gdev_vector_dopath_segment(P3(gdev_vector_dopath_state_t *state, int pe_op,
- gs_fixed_point vs[3]));
+int gdev_vector_dopath_segment(gdev_vector_dopath_state_t *state, int pe_op,
+ gs_fixed_point vs[3]);
/* Write a polygon as part of a path (type = gx_path_type_none) */
/* or as a path. */
/* May call moveto, lineto, closepath (if close); */
/* may call beginpath & endpath if type != none. */
-int gdev_vector_write_polygon(P5(gx_device_vector * vdev,
- const gs_fixed_point * points, uint count,
- bool close, gx_path_type_t type));
+int gdev_vector_write_polygon(gx_device_vector * vdev,
+ const gs_fixed_point * points, uint count,
+ bool close, gx_path_type_t type);
/* Write a rectangle. This is just a special case of write_polygon. */
-int gdev_vector_write_rectangle(P7(gx_device_vector * vdev,
- fixed x0, fixed y0, fixed x1, fixed y1,
- bool close, gx_rect_direction_t dir));
+int gdev_vector_write_rectangle(gx_device_vector * vdev,
+ fixed x0, fixed y0, fixed x1, fixed y1,
+ bool close, gx_rect_direction_t dir);
/* Write a clipping path by calling the path procedures. */
/* May call the same procedures as writepath. */
-int gdev_vector_write_clip_path(P2(gx_device_vector * vdev,
- const gx_clip_path * pcpath));
+int gdev_vector_write_clip_path(gx_device_vector * vdev,
+ const gx_clip_path * pcpath);
/* Bring the clipping state up to date. */
/* May call write_rectangle (q.v.), write_clip_path (q.v.). */
-int gdev_vector_update_clip_path(P2(gx_device_vector * vdev,
- const gx_clip_path * pcpath));
+int gdev_vector_update_clip_path(gx_device_vector * vdev,
+ const gx_clip_path * pcpath);
/* Close the output file and stream. */
-int gdev_vector_close_file(P1(gx_device_vector * vdev));
+int gdev_vector_close_file(gx_device_vector * vdev);
/* ---------------- Image enumeration ---------------- */
@@ -347,17 +347,17 @@
* already-allocated enumerator, not a pointer to the place to store the
* enumerator.
*/
-int gdev_vector_begin_image(P10(gx_device_vector * vdev,
+int gdev_vector_begin_image(gx_device_vector * vdev,
const gs_imager_state * pis, const gs_image_t * pim,
gs_image_format_t format, const gs_int_rect * prect,
const gx_drawing_color * pdcolor, const gx_clip_path * pcpath,
gs_memory_t * mem, const gx_image_enum_procs_t * pprocs,
- gdev_vector_image_enum_t * pie));
+ gdev_vector_image_enum_t * pie);
/* End an image, optionally supplying any necessary blank padding rows. */
/* Return 0 if we used the default implementation, 1 if not. */
-int gdev_vector_end_image(P4(gx_device_vector * vdev,
- gdev_vector_image_enum_t * pie, bool draw_last, gx_color_index pad));
+int gdev_vector_end_image(gx_device_vector * vdev,
+ gdev_vector_image_enum_t * pie, bool draw_last, gx_color_index pad);
/* ================ Device procedures ================ */
Index: gdevx.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevx.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gdevx.h 21 Feb 2002 22:24:52 -0000 1.6
+++ gdevx.h 16 Jun 2002 07:25:26 -0000 1.7
@@ -243,12 +243,12 @@
symbol_fonts, dingbat_fonts)
/* Send an event to the Ghostview process */
-void gdev_x_send_event(P2(gx_device_X *xdev, Atom msg));
+void gdev_x_send_event(gx_device_X *xdev, Atom msg);
/* function to keep track of screen updates */
-void x_update_add(P5(gx_device_X *, int, int, int, int));
-void gdev_x_clear_window(P1(gx_device_X *));
-int x_catch_free_colors(P2(Display *, XErrorEvent *));
+void x_update_add(gx_device_X *, int, int, int, int);
+void gdev_x_clear_window(gx_device_X *);
+int x_catch_free_colors(Display *, XErrorEvent *);
/* Number used to distinguish when resolution was set from the command line */
#define FAKE_RES (16*72)
@@ -256,13 +256,13 @@
/* ------ Inter-module procedures ------ */
/* Exported by gdevxcmp.c for gdevxini.c */
-int gdev_x_setup_colors(P1(gx_device_X *));
-void gdev_x_free_colors(P1(gx_device_X *));
-void gdev_x_free_dynamic_colors(P1(gx_device_X *));
+int gdev_x_setup_colors(gx_device_X *);
+void gdev_x_free_colors(gx_device_X *);
+void gdev_x_free_dynamic_colors(gx_device_X *);
/* Exported by gdevxini.c for gdevx.c */
-int gdev_x_open(P1(gx_device_X *));
-int gdev_x_close(P1(gx_device_X *));
+int gdev_x_open(gx_device_X *);
+int gdev_x_close(gx_device_X *);
/* Driver procedures exported for gdevx.c */
dev_proc_map_rgb_color(gdev_x_map_rgb_color); /* gdevxcmp.c */
More information about the gs-cvs
mailing list