[gs-cvs] rev 8766 - trunk/gs/src
giles at ghostscript.com
giles at ghostscript.com
Wed May 21 12:46:45 PDT 2008
Author: giles
Date: 2008-05-21 12:46:43 -0700 (Wed, 21 May 2008)
New Revision: 8766
Modified:
trunk/gs/src/dxmainc.c
trunk/gs/src/gdevmac.c
trunk/gs/src/gdevmac.h
trunk/gs/src/gdevmacttf.h
trunk/gs/src/gdevmacxf.c
trunk/gs/src/gdevpdfb.h
trunk/gs/src/gdevpdtv.c
trunk/gs/src/gdevpdtv.h
trunk/gs/src/gdevtxtw.c
trunk/gs/src/gp_mac.h
trunk/gs/src/gsimage.c
trunk/gs/src/gsiparam.h
trunk/gs/src/gxclimag.c
trunk/gs/src/gxidata.c
trunk/gs/src/gximage.c
trunk/gs/src/gxiparam.h
trunk/gs/src/gxsamplp.h
trunk/gs/src/iimage.h
trunk/gs/src/macsystypes.h
trunk/gs/src/zimage.c
Log:
Remove the lowercase "compatibility" versions of the GS_IMAGE_MAX_*
macros.
Modified: trunk/gs/src/dxmainc.c
===================================================================
Property changes on: trunk/gs/src/dxmainc.c
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/gdevmac.c
===================================================================
Property changes on: trunk/gs/src/gdevmac.c
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/gdevmac.h
===================================================================
Property changes on: trunk/gs/src/gdevmac.h
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/gdevmacttf.h
===================================================================
Property changes on: trunk/gs/src/gdevmacttf.h
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/gdevmacxf.c
===================================================================
Property changes on: trunk/gs/src/gdevmacxf.c
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/gdevpdfb.h
===================================================================
Property changes on: trunk/gs/src/gdevpdfb.h
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/gdevpdtv.c
===================================================================
Property changes on: trunk/gs/src/gdevpdtv.c
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/gdevpdtv.h
===================================================================
Property changes on: trunk/gs/src/gdevpdtv.h
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/gdevtxtw.c
===================================================================
Property changes on: trunk/gs/src/gdevtxtw.c
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/gp_mac.h
===================================================================
Property changes on: trunk/gs/src/gp_mac.h
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/gsimage.c
===================================================================
--- trunk/gs/src/gsimage.c 2008-05-21 19:05:31 UTC (rev 8765)
+++ trunk/gs/src/gsimage.c 2008-05-21 19:46:43 UTC (rev 8766)
@@ -102,9 +102,9 @@
/* only needed for gs_image_next */
int y;
bool error;
- byte wanted[gs_image_max_planes]; /* cache gx_image_planes_wanted */
- byte client_wanted[gs_image_max_planes]; /* see gsimage.h */
- image_enum_plane_t planes[gs_image_max_planes]; /* see above */
+ byte wanted[GS_IMAGE_MAX_PLANES]; /* cache gx_image_planes_wanted */
+ byte client_wanted[GS_IMAGE_MAX_PLANES]; /* see gsimage.h */
+ image_enum_plane_t planes[GS_IMAGE_MAX_PLANES]; /* see above */
/*
* To reduce setup for transferring complete rows, we maintain a
* partially initialized parameter array for gx_image_plane_data_rows.
@@ -112,7 +112,7 @@
* gx_image_plane_data_rows; the data_x and raster members are reset
* when needed.
*/
- gx_image_plane_t image_planes[gs_image_max_planes];
+ gx_image_plane_t image_planes[GS_IMAGE_MAX_PLANES];
};
gs_private_st_composite(st_gs_image_enum, gs_image_enum, "gs_image_enum",
@@ -456,8 +456,8 @@
int px = penum->plane_index;
int num_planes = penum->num_planes;
int i, code;
- uint used[gs_image_max_planes];
- gs_const_string plane_data[gs_image_max_planes];
+ uint used[GS_IMAGE_MAX_PLANES];
+ gs_const_string plane_data[GS_IMAGE_MAX_PLANES];
if (penum->planes[px].source.size != 0)
return_error(gs_error_rangecheck);
Modified: trunk/gs/src/gsiparam.h
===================================================================
--- trunk/gs/src/gsiparam.h 2008-05-21 19:05:31 UTC (rev 8765)
+++ trunk/gs/src/gsiparam.h 2008-05-21 19:46:43 UTC (rev 8766)
@@ -63,15 +63,11 @@
*/
#define GS_IMAGE_MAX_COLOR_COMPONENTS GS_CLIENT_COLOR_MAX_COMPONENTS
#define GS_IMAGE_MAX_COMPONENTS (GS_IMAGE_MAX_COLOR_COMPONENTS + 1)
-/* Backward compatibility */
-#define gs_image_max_components GS_IMAGE_MAX_COMPONENTS
/*
* Define the maximum number of planes in image data.
*/
#define GS_IMAGE_MAX_PLANES GS_IMAGE_MAX_COMPONENTS
-/* Backward compatibility */
-#define gs_image_max_planes GS_IMAGE_MAX_PLANES
/*
* Define the structure for defining data common to ImageType 1 images,
Modified: trunk/gs/src/gxclimag.c
===================================================================
--- trunk/gs/src/gxclimag.c 2008-05-21 19:05:31 UTC (rev 8765)
+++ trunk/gs/src/gxclimag.c 2008-05-21 19:46:43 UTC (rev 8766)
@@ -748,7 +748,7 @@
int by0 = ibox.p.y, by1 = ibox.q.y;
int bpp = pie->bits_per_plane;
int num_planes = pie->num_planes;
- uint offsets[gs_image_max_planes];
+ uint offsets[GS_IMAGE_MAX_PLANES];
int i, iy, ih, xskip, xoff, nrows;
uint bytes_per_plane, bytes_per_row, rows_per_cmd;
Modified: trunk/gs/src/gxidata.c
===================================================================
--- trunk/gs/src/gxidata.c 2008-05-21 19:05:31 UTC (rev 8765)
+++ trunk/gs/src/gxidata.c 2008-05-21 19:46:43 UTC (rev 8766)
@@ -47,7 +47,7 @@
+ 7) >> 3)
fixed adjust = penum->adjust;
- ulong offsets[gs_image_max_planes];
+ ulong offsets[GS_IMAGE_MAX_PLANES];
int ignore_data_x;
bool bit_planar = penum->num_planes > penum->spp;
int code;
Modified: trunk/gs/src/gximage.c
===================================================================
--- trunk/gs/src/gximage.c 2008-05-21 19:05:31 UTC (rev 8765)
+++ trunk/gs/src/gximage.c 2008-05-21 19:46:43 UTC (rev 8766)
@@ -146,13 +146,13 @@
int data_x, uint raster, int height)
{
int num_planes = info->num_planes;
- gx_image_plane_t planes[gs_image_max_planes];
+ gx_image_plane_t planes[GS_IMAGE_MAX_PLANES];
int i;
#ifdef DEBUG
- if (num_planes > gs_image_max_planes) {
- lprintf2("num_planes=%d > gs_image_max_planes=%d!\n",
- num_planes, gs_image_max_planes);
+ if (num_planes > GS_IMAGE_MAX_PLANES) {
+ lprintf2("num_planes=%d > GS_IMAGE_MAX_PLANES=%d!\n",
+ num_planes, GS_IMAGE_MAX_PLANES);
return_error(gs_error_Fatal);
}
#endif
Modified: trunk/gs/src/gxiparam.h
===================================================================
--- trunk/gs/src/gxiparam.h 2008-05-21 19:05:31 UTC (rev 8765)
+++ trunk/gs/src/gxiparam.h 2008-05-21 19:46:43 UTC (rev 8766)
@@ -216,8 +216,8 @@
gs_id id;\
bool skipping; /* don't render, just consume image streams. */\
int num_planes;\
- int plane_depths[gs_image_max_planes]; /* [num_planes] */\
- int plane_widths[gs_image_max_planes] /* [num_planes] */
+ int plane_depths[GS_IMAGE_MAX_PLANES]; /* [num_planes] */\
+ int plane_widths[GS_IMAGE_MAX_PLANES] /* [num_planes] */
struct gx_image_enum_common_s {
gx_image_enum_common;
};
Modified: trunk/gs/src/gxsamplp.h
===================================================================
Property changes on: trunk/gs/src/gxsamplp.h
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/iimage.h
===================================================================
--- trunk/gs/src/iimage.h 2008-05-21 19:05:31 UTC (rev 8765)
+++ trunk/gs/src/iimage.h 2008-05-21 19:46:43 UTC (rev 8766)
@@ -26,7 +26,7 @@
*/
typedef struct image_params_s {
bool MultipleDataSources;
- ref DataSource[gs_image_max_components];
+ ref DataSource[GS_IMAGE_MAX_COMPONENTS];
const float *pDecode;
} image_params;
Modified: trunk/gs/src/macsystypes.h
===================================================================
Property changes on: trunk/gs/src/macsystypes.h
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/gs/src/zimage.c
===================================================================
--- trunk/gs/src/zimage.c 2008-05-21 19:05:31 UTC (rev 8765)
+++ trunk/gs/src/zimage.c 2008-05-21 19:46:43 UTC (rev 8766)
@@ -378,8 +378,8 @@
gs_image_enum *penum = r_ptr(esp, gs_image_enum);
int px = ETOP_PLANE_INDEX(esp)->value.intval;
int num_sources = ETOP_NUM_SOURCES(esp)->value.intval;
- uint size, used[gs_image_max_planes];
- gs_const_string plane_data[gs_image_max_planes];
+ uint size, used[GS_IMAGE_MAX_PLANES];
+ gs_const_string plane_data[GS_IMAGE_MAX_PLANES];
const byte *wanted;
int i, code;
@@ -451,7 +451,7 @@
for (;;) {
uint min_avail = max_int;
- gs_const_string plane_data[gs_image_max_planes];
+ gs_const_string plane_data[GS_IMAGE_MAX_PLANES];
int code;
int px;
const ref *pp;
@@ -515,7 +515,7 @@
{
int pi;
- uint used[gs_image_max_planes];
+ uint used[GS_IMAGE_MAX_PLANES];
code = gs_image_next_planes(penum, plane_data, used);
/* Now that used has been set, update the streams. */
@@ -545,8 +545,8 @@
{
gs_image_enum *penum = r_ptr(esp, gs_image_enum);
int num_sources = ETOP_NUM_SOURCES(esp)->value.intval;
- gs_const_string sources[gs_image_max_planes];
- uint used[gs_image_max_planes];
+ gs_const_string sources[GS_IMAGE_MAX_PLANES];
+ uint used[GS_IMAGE_MAX_PLANES];
/* Pass no data initially, to find out how much is retained. */
memset(sources, 0, sizeof(sources[0]) * num_sources);
More information about the gs-cvs
mailing list