[gs-cvs] rev 8488 - trunk/gs/src
leonardo at ghostscript.com
leonardo at ghostscript.com
Thu Jan 17 05:37:21 PST 2008
Author: leonardo
Date: 2008-01-17 05:37:19 -0800 (Thu, 17 Jan 2008)
New Revision: 8488
Modified:
trunk/gs/src/devs.mak
trunk/gs/src/gdevbit.c
trunk/gs/src/gdevcgm.c
trunk/gs/src/gdevdflt.c
trunk/gs/src/gdevp14.c
trunk/gs/src/gdevp2up.c
trunk/gs/src/gdevpdfe.c
trunk/gs/src/gdevpdtd.c
trunk/gs/src/gdevprn.c
trunk/gs/src/genarch.c
trunk/gs/src/gscdevn.c
trunk/gs/src/gscie.c
trunk/gs/src/gscsepr.c
trunk/gs/src/gsovrc.c
trunk/gs/src/gstrans.c
trunk/gs/src/gxclmem.c
trunk/gs/src/gxclread.c
trunk/gs/src/gxclutil.c
trunk/gs/src/gxcomp.h
trunk/gs/src/int.mak
trunk/gs/src/lib.mak
trunk/gs/src/ztoken.c
Log:
Fix : Cygwin/gcc warnings.
Modified: trunk/gs/src/devs.mak
===================================================================
--- trunk/gs/src/devs.mak 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/devs.mak 2008-01-17 13:37:19 UTC (rev 8488)
@@ -1036,7 +1036,7 @@
$(GLCC) $(GLO_)gdevpdte.$(OBJ) $(C_) $(GLSRC)gdevpdte.c
$(GLOBJ)gdevpdtd.$(OBJ) : $(GLSRC)gdevpdtd.c $(math__h) $(memory__h) $(gx_h)\
- $(gserrors_h) $(gsrect_h)\
+ $(gserrors_h) $(gsrect_h) $(gscencs_h)\
$(gdevpdfo_h) $(gdevpdfx_h)\
$(gdevpdtb_h) $(gdevpdtd_h) $(gdevpdtf_h)
$(GLCC) $(GLO_)gdevpdtd.$(OBJ) $(C_) $(GLSRC)gdevpdtd.c
@@ -1210,7 +1210,7 @@
gdevcgmx_h=$(GLSRC)gdevcgmx.h $(gdevcgml_h)
$(GLOBJ)gdevcgm.$(OBJ) : $(GLSRC)gdevcgm.c $(GDEV) $(memory__h)\
- $(gp_h) $(gsparam_h) $(gdevpccm_h) $(gdevcgml_h)
+ $(gp_h) $(gsparam_h) $(gsutil_h) $(gdevpccm_h) $(gdevcgml_h)
$(GLCC) $(GLO_)gdevcgm.$(OBJ) $(C_) $(GLSRC)gdevcgm.c
$(GLOBJ)gdevcgml.$(OBJ) : $(GLSRC)gdevcgml.c $(memory__h) $(stdio__h)\
Modified: trunk/gs/src/gdevbit.c
===================================================================
--- trunk/gs/src/gdevbit.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gdevbit.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -38,7 +38,9 @@
static dev_proc_map_color_rgb(bittag_map_color_rgb);
static dev_proc_put_params(bittag_put_params);
static dev_proc_map_rgb_color(bit_mono_map_color);
+#if 0 /* unused */
static dev_proc_map_rgb_color(bit_forcemono_map_rgb_color);
+#endif
static dev_proc_map_color_rgb(bit_map_color_rgb);
static dev_proc_map_cmyk_color(bit_map_cmyk_color);
static dev_proc_get_params(bit_get_params);
@@ -382,6 +384,7 @@
return (bpc == 1 ? gx_max_color_value - gray : gray) >> drop;
}
+#if 0 /* unused */
/* Map RGB to gray shade. */
/* Only used in CMYK mode when put_params has set ForceMono=1 */
static gx_color_index
@@ -403,6 +406,7 @@
color = (gx_max_color_value - gray) >> drop; /* color is in K channel */
return color;
}
+#endif
/* Map color to RGB. This has 3 separate cases, but since it is rarely */
/* used, we do a case test rather than providing 3 separate routines. */
Modified: trunk/gs/src/gdevcgm.c
===================================================================
--- trunk/gs/src/gdevcgm.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gdevcgm.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -18,6 +18,7 @@
#include "gxdevice.h"
#include "gp.h"
#include "gsparam.h"
+#include "gsutil.h"
#include "gdevcgml.h"
#include "gdevpccm.h"
Modified: trunk/gs/src/gdevdflt.c
===================================================================
--- trunk/gs/src/gdevdflt.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gdevdflt.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -856,7 +856,7 @@
* Default check for closing compositor.
*/
int
-gx_default_composite_is_closing(const gs_composite_t *this, const gs_composite_t **pcte, gx_device *dev)
+gx_default_composite_is_closing(const gs_composite_t *this, gs_composite_t **pcte, gx_device *dev)
{
return false;
}
Modified: trunk/gs/src/gdevp14.c
===================================================================
--- trunk/gs/src/gdevp14.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gdevp14.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -30,6 +30,7 @@
#include "gsdfilt.h"
#include "gsimage.h"
#include "gsrect.h"
+#include "gscoord.h"
#include "gzstate.h"
#include "gdevdevn.h"
#include "gdevp14.h"
@@ -2781,7 +2782,7 @@
}
#ifdef DEBUG
-static char * pdf14_opcode_names[] = PDF14_OPCODE_NAMES;
+static const char * pdf14_opcode_names[] = PDF14_OPCODE_NAMES;
#endif
#define put_value(dp, value)\
@@ -3065,10 +3066,10 @@
* Find an opening compositor op.
*/
static int
-find_opening_op(int opening_op, const gs_composite_t **ppcte)
+find_opening_op(int opening_op, gs_composite_t **ppcte)
{
/* Assuming a right *BEGIN* - *END* operation balance. */
- const gs_composite_t *pcte = *ppcte;
+ gs_composite_t *pcte = *ppcte;
for (;;) {
if (pcte->type->comp_id == GX_COMPOSITOR_PDF14_TRANS) {
@@ -3092,10 +3093,10 @@
* Find an opening compositor op.
*/
static int
-find_same_op(const gs_composite_t *this, int my_op, const gs_composite_t **ppcte)
+find_same_op(const gs_composite_t *this, int my_op, gs_composite_t **ppcte)
{
const gs_pdf14trans_t *pct0 = (gs_pdf14trans_t *)this;
- const gs_composite_t *pct = *ppcte;
+ gs_composite_t *pct = *ppcte;
for (;;) {
if (pct->type->comp_id == GX_COMPOSITOR_PDF14_TRANS) {
@@ -3118,10 +3119,9 @@
* Check for closing compositor.
*/
static int
-c_pdf14trans_is_closing(const gs_composite_t * this, const gs_composite_t ** ppcte, gx_device *dev)
+c_pdf14trans_is_closing(const gs_composite_t * this, gs_composite_t ** ppcte, gx_device *dev)
{
gs_pdf14trans_t *pct0 = (gs_pdf14trans_t *)this;
- gs_pdf14trans_t *pct1 = (gs_pdf14trans_t *)*ppcte;
int op0 = pct0->params.pdf14_op;
switch (op0) {
Modified: trunk/gs/src/gdevp2up.c
===================================================================
--- trunk/gs/src/gdevp2up.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gdevp2up.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -89,7 +89,6 @@
gx_saved_page even_page;
gx_placed_page pages[2];
int x_offset = (int)(pdev->HWResolution[0] * 0.5);
- int y_offset = (int)(pdev->HWResolution[1] * 0.5);
int code = gdev_prn_save_page(pdev, &even_page, 1);
int prdev_size = prdev_template->params_size;
gx_device_printer *prdev;
Modified: trunk/gs/src/gdevpdfe.c
===================================================================
--- trunk/gs/src/gdevpdfe.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gdevpdfe.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -323,7 +323,8 @@
write(s, data, data_length);
return 0;
} else {
- UTF16 *buf0, *buf0b;
+ UTF16 *buf0;
+ const UTF16 *buf0b;
UTF8 *buf1, *buf1b;
int i, j = 0;
Modified: trunk/gs/src/gdevpdtd.c
===================================================================
--- trunk/gs/src/gdevpdtd.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gdevpdtd.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -18,6 +18,7 @@
#include "gx.h"
#include "gserrors.h"
#include "gsrect.h" /* for rect_merge */
+#include "gscencs.h"
#include "gdevpdfx.h"
#include "gdevpdfo.h" /* for object->written */
#include "gdevpdtb.h"
Modified: trunk/gs/src/gdevprn.c
===================================================================
--- trunk/gs/src/gdevprn.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gdevprn.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -277,7 +277,7 @@
memset(ppdev->skip, 0, sizeof(ppdev->skip));
size_ok = ppdev->printer_procs.buf_procs.size_buf_device
(&buf_space, pdev, NULL, pdev->height, false) >= 0;
- if (ppdev->page_uses_transparency)
+ if (ppdev->page_uses_transparency) {
if (new_height < max_ulong/(ESTIMATED_PDF14_ROW_SPACE(max(1, new_width)) >> 3))
pdf14_trans_buffer_size = new_height
* (ESTIMATED_PDF14_ROW_SPACE(new_width) >> 3);
@@ -285,6 +285,7 @@
size_ok = 0;
pdf14_trans_buffer_size = 0;
}
+ }
mem_space = buf_space.bits + buf_space.line_ptrs
+ pdf14_trans_buffer_size;
Modified: trunk/gs/src/genarch.c
===================================================================
--- trunk/gs/src/genarch.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/genarch.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -106,7 +106,6 @@
} sd;
long lm1 = -1;
long lr1 = lm1 >> 1, lr2 = lm1 >> 2;
- unsigned long um1 = ~(unsigned long)0;
int im1 = -1;
int ir1 = im1 >> 1, ir2 = im1 >> 2;
union {
@@ -114,7 +113,6 @@
char *p;
} pl0, pl1;
int ars;
- int lwidth = size_of(long) * 8;
union {
float f;
int i;
Modified: trunk/gs/src/gscdevn.c
===================================================================
--- trunk/gs/src/gscdevn.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gscdevn.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -375,7 +375,6 @@
code = cs_concretize_color(&cc, pacs, pconc, pis);
}
else {
- float ftemp;
int i;
for (i = pcs->params.device_n.num_components; --i >= 0;)
Modified: trunk/gs/src/gscie.c
===================================================================
--- trunk/gs/src/gscie.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gscie.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -1142,7 +1142,7 @@
/* If the current color space is a CIE space, or has a CIE base space, */
/* return a pointer to the common part of the space; otherwise return 0. */
-const gs_cie_common *
+static const gs_cie_common *
cie_cs_common_abc(const gs_color_space *pcs_orig, const gs_cie_abc **ppabc)
{
const gs_color_space *pcs = pcs_orig;
Modified: trunk/gs/src/gscsepr.c
===================================================================
--- trunk/gs/src/gscsepr.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gscsepr.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -310,7 +310,6 @@
gx_concretize_Separation(const gs_client_color *pc, const gs_color_space *pcs,
frac *pconc, const gs_imager_state *pis)
{
- float ftemp;
int code;
gs_client_color cc;
const gs_color_space *pacs = pcs->base_space;
Modified: trunk/gs/src/gsovrc.c
===================================================================
--- trunk/gs/src/gsovrc.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gsovrc.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -203,7 +203,7 @@
* Check for closing compositor.
*/
static int
-c_overprint_is_closing(const gs_composite_t *this, const gs_composite_t **ppcte, gx_device *dev)
+c_overprint_is_closing(const gs_composite_t *this, gs_composite_t **ppcte, gx_device *dev)
{
if (*ppcte != NULL && (*ppcte)->type->comp_id != GX_COMPOSITOR_OVERPRINT)
return 0;
Modified: trunk/gs/src/gstrans.c
===================================================================
--- trunk/gs/src/gstrans.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gstrans.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -443,7 +443,7 @@
* the tint transform function for DeviceN and Separation color spaces
* and convert spot colors into process colors.
*/
-int
+static int
get_num_pdf14_spot_colors(gs_state * pgs)
{
gx_device * dev = pgs->device;
Modified: trunk/gs/src/gxclmem.c
===================================================================
--- trunk/gs/src/gxclmem.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gxclmem.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -947,7 +947,7 @@
if (tot_cache_hits != 0) {
if_debug3(':', "[:]Cache hits=%ld, cache misses=%ld, swapouts=%ld\n",
tot_cache_hits,
- tot_cache_miss - (f->log_length / MEMFILE_DATA_SIZE),
+ (long)(tot_cache_miss - (f->log_length / MEMFILE_DATA_SIZE)),
tot_swap_out);
}
tot_raw = 0;
Modified: trunk/gs/src/gxclread.c
===================================================================
--- trunk/gs/src/gxclread.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gxclread.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -91,7 +91,6 @@
s_band_read_init_offset_map(gx_device_clist_reader *crdev, stream_state * st)
{
stream_band_read_state *const ss = (stream_band_read_state *) st;
- const clist_io_procs_t *io_procs = ss->page_info.io_procs;
if (gs_debug_c('L')) {
ss->offset_map_length = 0;
@@ -208,7 +207,7 @@
};
#ifdef DEBUG
-int
+static int
buffer_segment_index(const stream_band_read_state *ss, uint buffer_offset, uint *poffset0)
{
uint i, offset0, offset = 0;
Modified: trunk/gs/src/gxclutil.c
===================================================================
--- trunk/gs/src/gxclutil.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gxclutil.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -246,7 +246,7 @@
lprintf1("cmd_put_list_op error at 0x%lx\n", (ulong) pcl->tail);
}
#endif
- if_debug2('L', ", to id=%ld , offset=%ld", pcl->tail->id, pcl->tail->size);
+ if_debug2('L', ", to id=%ld , offset=%ld", pcl->tail->id, (long)pcl->tail->size);
pcl->tail->size += size;
} else {
/* Skip to an appropriate alignment boundary. */
Modified: trunk/gs/src/gxcomp.h
===================================================================
--- trunk/gs/src/gxcomp.h 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/gxcomp.h 2008-01-17 13:37:19 UTC (rev 8488)
@@ -119,7 +119,7 @@
* 3 - closing and replacing, 4 - replace one, 5 - drop queue.
*/
#define composite_is_closing_proc(proc)\
- int proc(const gs_composite_t *this, const gs_composite_t **pcte, gx_device *dev)
+ int proc(const gs_composite_t *this, gs_composite_t **pcte, gx_device *dev)
composite_is_closing_proc((*is_closing));
/*
Modified: trunk/gs/src/int.mak
===================================================================
--- trunk/gs/src/int.mak 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/int.mak 2008-01-17 13:37:19 UTC (rev 8488)
@@ -402,7 +402,7 @@
$(PSCC) $(PSO_)zsysvm.$(OBJ) $(C_) $(PSSRC)zsysvm.c
$(PSOBJ)ztoken.$(OBJ) : $(PSSRC)ztoken.c $(OP) $(string__h) $(stat__h)\
- $(gsstruct_h)\
+ $(gsstruct_h) $(gsutil_h)\
$(dstack_h) $(estack_h) $(files_h)\
$(idict_h) $(iname_h) $(iscan_h) $(itoken_h)\
$(sfilter_h) $(store_h) $(stream_h) $(strimpl_h)
Modified: trunk/gs/src/lib.mak
===================================================================
--- trunk/gs/src/lib.mak 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/lib.mak 2008-01-17 13:37:19 UTC (rev 8488)
@@ -2560,7 +2560,7 @@
$(GLCC) $(GLO_)gxblend.$(OBJ) $(C_) $(GLSRC)gxblend.c
$(GLOBJ)gdevp14.$(OBJ) : $(GLSRC)gdevp14.c $(GXERR) $(math__h) $(memory__h)\
- $(gscdefs_h) $(gxdevice_h) $(gsdevice_h) $(gsstruct_h) $(gxistate_h) $(gxdcolor_h)\
+ $(gscdefs_h) $(gxdevice_h) $(gsdevice_h) $(gsstruct_h) $(gscoord_h) $(gxistate_h) $(gxdcolor_h)\
$(gxiparam_h) $(gstparam_h) $(gxblend_h) $(gxtext_h) $(gsdfilt_h) $(gsimage_h)\
$(gsrect_h) $(gzstate_h) $(gdevdevn_h) $(gdevp14_h) $(gsovrc_h) $(gxcmap_h) $(gscolor1_h)\
$(gstrans_h) $(gsutil_h) $(gxcldev_h) $(gxclpath_h) $(gxdcconv_h) $(vdtrace_h)
Modified: trunk/gs/src/ztoken.c
===================================================================
--- trunk/gs/src/ztoken.c 2008-01-17 03:16:02 UTC (rev 8487)
+++ trunk/gs/src/ztoken.c 2008-01-17 13:37:19 UTC (rev 8488)
@@ -20,6 +20,7 @@
#include "dstack.h" /* for dict_find_name */
#include "estack.h"
#include "gsstruct.h" /* for iscan.h */
+#include "gsutil.h"
#include "stream.h"
#include "files.h"
#include "store.h"
More information about the gs-cvs
mailing list