[gs-cvs] rev 7779 - trunk/gs/src
leonardo at ghostscript.com
leonardo at ghostscript.com
Sun Mar 11 06:46:56 PDT 2007
Author: leonardo
Date: 2007-03-11 06:46:54 -0700 (Sun, 11 Mar 2007)
New Revision: 7779
Modified:
trunk/gs/src/gdevpdfi.c
trunk/gs/src/gsipar3x.h
trunk/gs/src/gsiparam.h
trunk/gs/src/gsiparm3.h
trunk/gs/src/gsiparm4.h
trunk/gs/src/gxclrast.c
trunk/gs/src/gxcmap.c
trunk/gs/src/gximag3x.c
trunk/gs/src/gximage.c
trunk/gs/src/gximage1.c
trunk/gs/src/gximage3.c
trunk/gs/src/gximage4.c
trunk/gs/src/gxiparam.h
trunk/gs/src/iimage.h
trunk/gs/src/zimage.c
Log:
Fix : MSVC compiler warnings.
DETAILS :
The patch
http://ghostscript.com/pipermail/gs-cvs/2007-March/007345.html
is incomplete.
More const qualifiers are now removed.
EXPECTED DIFFERENCES :
None.
Modified: trunk/gs/src/gdevpdfi.c
===================================================================
--- trunk/gs/src/gdevpdfi.c 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gdevpdfi.c 2007-03-11 13:46:54 UTC (rev 7779)
@@ -324,7 +324,7 @@
const pdf_color_space_names_t *names;
bool convert_to_process_colors = false;
gs_color_space *pcs_device = NULL;
- const gs_color_space *pcs_orig = NULL;
+ gs_color_space *pcs_orig = NULL;
pdf_lcvd_t *cvd = NULL;
/*
Modified: trunk/gs/src/gsipar3x.h
===================================================================
--- trunk/gs/src/gsipar3x.h 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gsipar3x.h 2007-03-11 13:46:54 UTC (rev 7779)
@@ -63,6 +63,6 @@
/*
* Initialize an ImageType 3x image.
*/
-void gs_image3x_t_init(gs_image3x_t *pim, const gs_color_space *color_space);
+void gs_image3x_t_init(gs_image3x_t *pim, gs_color_space *color_space);
#endif /* gsipar3x_INCLUDED */
Modified: trunk/gs/src/gsiparam.h
===================================================================
--- trunk/gs/src/gsiparam.h 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gsiparam.h 2007-03-11 13:46:54 UTC (rev 7779)
@@ -260,7 +260,7 @@
* (Decode is not initialized).
*/
gs_pixel_image_t_init(gs_pixel_image_t * pim,
- const gs_color_space * color_space);
+ gs_color_space * color_space);
/*
* Initialize an ImageType 1 image (or imagemask). Also sets ImageMask,
@@ -274,7 +274,7 @@
* Note that for init and init_adjust, adjust is only relevant if
* pim->ImageMask is true.
*/
-void gs_image_t_init_adjust(gs_image_t * pim, const gs_color_space * pcs,
+void gs_image_t_init_adjust(gs_image_t * pim, gs_color_space * pcs,
bool adjust);
#define gs_image_t_init(pim, pcs)\
gs_image_t_init_adjust(pim, pcs, true)
Modified: trunk/gs/src/gsiparm3.h
===================================================================
--- trunk/gs/src/gsiparm3.h 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gsiparm3.h 2007-03-11 13:46:54 UTC (rev 7779)
@@ -49,7 +49,7 @@
/*
* Initialize an ImageType 3 image.
*/
-void gs_image3_t_init(gs_image3_t * pim, const gs_color_space * color_space,
+void gs_image3_t_init(gs_image3_t * pim, gs_color_space * color_space,
gs_image3_interleave_type_t interleave_type);
#endif /* gsiparm3_INCLUDED */
Modified: trunk/gs/src/gsiparm4.h
===================================================================
--- trunk/gs/src/gsiparm4.h 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gsiparm4.h 2007-03-11 13:46:54 UTC (rev 7779)
@@ -48,6 +48,6 @@
* Initialize an ImageType 4 image. Defaults:
* MaskColor_is_range = false
*/
-void gs_image4_t_init(gs_image4_t * pim, const gs_color_space * color_space);
+void gs_image4_t_init(gs_image4_t * pim, gs_color_space * color_space);
#endif /* gsiparm4_INCLUDED */
Modified: trunk/gs/src/gxclrast.c
===================================================================
--- trunk/gs/src/gxclrast.c 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gxclrast.c 2007-03-11 13:46:54 UTC (rev 7779)
@@ -198,7 +198,7 @@
gs_color_space **ppcs,
gs_memory_t *mem);
private int read_begin_image(command_buf_t *pcb, gs_image_common_t *pic,
- const gs_color_space *pcs);
+ gs_color_space *pcs);
private int read_put_params(command_buf_t *pcb, gs_imager_state *pis,
gx_device_clist_reader *cdev,
gs_memory_t *mem);
@@ -1941,7 +1941,7 @@
private int
read_begin_image(command_buf_t *pcb, gs_image_common_t *pic,
- const gs_color_space *pcs)
+ gs_color_space *pcs)
{
uint index = *(pcb->ptr)++;
const gx_image_type_t *image_type = gx_image_type_table[index];
Modified: trunk/gs/src/gxcmap.c
===================================================================
--- trunk/gs/src/gxcmap.c 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gxcmap.c 2007-03-11 13:46:54 UTC (rev 7779)
@@ -574,7 +574,7 @@
gs_color_select_t select)
{
frac conc[GS_CLIENT_COLOR_MAX_COMPONENTS];
- gs_color_space *pconcs;
+ const gs_color_space *pconcs;
int i = pcs->type->num_components(pcs);
int code = (*pcs->type->concretize_color)(pcc, pcs, conc, pis);
Modified: trunk/gs/src/gximag3x.c
===================================================================
--- trunk/gs/src/gximag3x.c 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gximag3x.c 2007-03-11 13:46:54 UTC (rev 7779)
@@ -61,7 +61,7 @@
pimm->MaskDict.BitsPerComponent = 0; /* not supplied */
}
void
-gs_image3x_t_init(gs_image3x_t * pim, const gs_color_space * color_space)
+gs_image3x_t_init(gs_image3x_t * pim, gs_color_space * color_space)
{
gs_pixel_image_t_init((gs_pixel_image_t *) pim, color_space);
pim->type = &gs_image_type_3x;
Modified: trunk/gs/src/gximage.c
===================================================================
--- trunk/gs/src/gximage.c 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gximage.c 2007-03-11 13:46:54 UTC (rev 7779)
@@ -55,7 +55,7 @@
}
void
gs_pixel_image_t_init(gs_pixel_image_t * pim,
- const gs_color_space * color_space)
+ gs_color_space * color_space)
{
int num_components;
@@ -225,7 +225,7 @@
int
gx_image_no_sget(gs_image_common_t *pic, stream *s,
- const gs_color_space *pcs)
+ gs_color_space *pcs)
{
return_error(gs_error_rangecheck);
}
@@ -439,7 +439,7 @@
*/
int
gx_pixel_image_sget(gs_pixel_image_t *pim, stream *s,
- const gs_color_space *pcs)
+ gs_color_space *pcs)
{
uint control;
float decode_default_1 = 1;
Modified: trunk/gs/src/gximage1.c
===================================================================
--- trunk/gs/src/gximage1.c 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gximage1.c 2007-03-11 13:46:54 UTC (rev 7779)
@@ -47,7 +47,7 @@
/* Define the procedures for initializing gs_image_ts to default values. */
void
-gs_image_t_init_adjust(gs_image_t * pim, const gs_color_space * color_space,
+gs_image_t_init_adjust(gs_image_t * pim, gs_color_space * color_space,
bool adjust)
{
gs_pixel_image_t_init((gs_pixel_image_t *) pim, color_space);
@@ -111,7 +111,7 @@
private int
gx_image1_sget(gs_image_common_t *pic, stream *s,
- const gs_color_space *pcs)
+ gs_color_space *pcs)
{
gs_image1_t *const pim = (gs_image1_t *)pic;
int code = gx_pixel_image_sget((gs_pixel_image_t *)pim, s, pcs);
@@ -171,7 +171,7 @@
private int
gx_image1_mask_sget(gs_image_common_t *pic, stream *s,
- const gs_color_space *ignore_pcs)
+ gs_color_space *ignore_pcs)
{
gs_image1_t *const pim = (gs_image1_t *)pic;
int code;
Modified: trunk/gs/src/gximage3.c
===================================================================
--- trunk/gs/src/gximage3.c 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gximage3.c 2007-03-11 13:46:54 UTC (rev 7779)
@@ -48,7 +48,7 @@
/* Initialize an ImageType 3 image. */
void
-gs_image3_t_init(gs_image3_t * pim, const gs_color_space * color_space,
+gs_image3_t_init(gs_image3_t * pim, gs_color_space * color_space,
gs_image3_interleave_type_t interleave_type)
{
gs_pixel_image_t_init((gs_pixel_image_t *) pim, color_space);
Modified: trunk/gs/src/gximage4.c
===================================================================
--- trunk/gs/src/gximage4.c 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gximage4.c 2007-03-11 13:46:54 UTC (rev 7779)
@@ -48,7 +48,7 @@
/* Initialize an ImageType 4 image. */
void
-gs_image4_t_init(gs_image4_t * pim, const gs_color_space * color_space)
+gs_image4_t_init(gs_image4_t * pim, gs_color_space * color_space)
{
gs_pixel_image_t_init((gs_pixel_image_t *) pim, color_space);
pim->type = &gs_image_type_4;
@@ -131,7 +131,7 @@
private int
gx_image4_sget(gs_image_common_t *pic, stream *s,
- const gs_color_space *pcs)
+ gs_color_space *pcs)
{
gs_image4_t *const pim = (gs_image4_t *)pic;
int num_values;
Modified: trunk/gs/src/gxiparam.h
===================================================================
--- trunk/gs/src/gxiparam.h 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/gxiparam.h 2007-03-11 13:46:54 UTC (rev 7779)
@@ -75,7 +75,7 @@
* use pcs.
*/
#define image_proc_sget(proc)\
- int proc(gs_image_common_t *pic, stream *s, const gs_color_space *pcs)
+ int proc(gs_image_common_t *pic, stream *s, gs_color_space *pcs)
image_proc_sget((*sget));
@@ -114,7 +114,7 @@
int gx_pixel_image_sput(const gs_pixel_image_t *pic, stream *s,
const gs_color_space **ppcs, int extra);
int gx_pixel_image_sget(gs_pixel_image_t *pic, stream *s,
- const gs_color_space *pcs);
+ gs_color_space *pcs);
void gx_pixel_image_release(gs_pixel_image_t *pic, gs_memory_t *mem);
/* Internal procedures for use in sput/sget implementations. */
Modified: trunk/gs/src/iimage.h
===================================================================
--- trunk/gs/src/iimage.h 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/iimage.h 2007-03-11 13:46:54 UTC (rev 7779)
@@ -39,7 +39,7 @@
int pixel_image_params(i_ctx_t *i_ctx_p, const ref *op,
gs_pixel_image_t *pim, image_params * pip,
int max_bits_per_component, bool has_alpha,
- const gs_color_space *csp);
+ gs_color_space *csp);
/* Exported for zimage3.c and ztrans.c */
int zimage_setup(i_ctx_t *i_ctx_p, const gs_pixel_image_t * pim,
Modified: trunk/gs/src/zimage.c
===================================================================
--- trunk/gs/src/zimage.c 2007-03-11 09:10:05 UTC (rev 7778)
+++ trunk/gs/src/zimage.c 2007-03-11 13:46:54 UTC (rev 7779)
@@ -117,7 +117,7 @@
int
pixel_image_params(i_ctx_t *i_ctx_p, const ref *op, gs_pixel_image_t *pim,
image_params *pip, int max_bits_per_component,
- bool has_alpha, const gs_color_space *csp)
+ bool has_alpha, gs_color_space *csp)
{
int num_components =
gs_color_space_num_components(csp);
@@ -162,7 +162,7 @@
gs_image_t image;
image_params ip;
int code;
- const gs_color_space *csp = gs_currentcolorspace(igs);
+ gs_color_space *csp = gs_currentcolorspace(igs);
extern bool CPSI_mode;
/* Adobe interpreters accept sampled images when the current color
@@ -172,7 +172,7 @@
* triggering a rangecheck error.
*/
if (CPSI_mode && gs_color_space_num_components(csp) < 1) {
- const gs_color_space *bsp = csp->base_space;
+ gs_color_space *bsp = csp->base_space;
if (bsp)
csp = bsp;
}
More information about the gs-cvs
mailing list