From df094888a7515b60c98d21b9f727fa2739553ff0 Mon Sep 17 00:00:00 2001 From: zicodxx Date: Thu, 14 Jun 2007 12:32:18 +0000 Subject: [PATCH] using size_t when it comes to integer to pointer conversions --- 2d/font.c | 33 ++++++++++++++++----------------- main/piggy.c | 8 ++++---- main/polyobj.c | 4 ++-- main/render.c | 22 +++++++++++++--------- mem/mem.c | 4 ++-- 5 files changed, 37 insertions(+), 34 deletions(-) diff --git a/2d/font.c b/2d/font.c index f09541ee..5a30444a 100644 --- a/2d/font.c +++ b/2d/font.c @@ -1364,10 +1364,10 @@ void grs_font_read(grs_font *gf, CFILE *fp) gf->ft_minchar = cfile_read_byte(fp); gf->ft_maxchar = cfile_read_byte(fp); gf->ft_bytewidth = cfile_read_short(fp); - gf->ft_data = (ubyte *)cfile_read_int(fp); - gf->ft_chars = (ubyte **)cfile_read_int(fp); - gf->ft_widths = (short *)cfile_read_int(fp); - gf->ft_kerndata = (ubyte *)cfile_read_int(fp); + gf->ft_data = (ubyte *)(size_t)cfile_read_int(fp); + gf->ft_chars = (ubyte **)(size_t)cfile_read_int(fp); + gf->ft_widths = (short *)(size_t)cfile_read_int(fp); + gf->ft_kerndata = (ubyte *)(size_t)cfile_read_int(fp); } #endif @@ -1425,16 +1425,16 @@ grs_font * gr_init_font( char * fontname ) open_font[fontnum].dataptr = font_data; // make these offsets relative to font_data - font->ft_data = (ubyte *)((int)font->ft_data - GRS_FONT_SIZE); - font->ft_widths = (short *)((int)font->ft_widths - GRS_FONT_SIZE); - font->ft_kerndata = (ubyte *)((int)font->ft_kerndata - GRS_FONT_SIZE); + font->ft_data = (ubyte *)((size_t)font->ft_data - GRS_FONT_SIZE); + font->ft_widths = (short *)((size_t)font->ft_widths - GRS_FONT_SIZE); + font->ft_kerndata = (ubyte *)((size_t)font->ft_kerndata - GRS_FONT_SIZE); nchars = font->ft_maxchar - font->ft_minchar + 1; if (font->ft_flags & FT_PROPORTIONAL) { - font->ft_widths = (short *) &font_data[(int)font->ft_widths]; - font->ft_data = (unsigned char *) &font_data[(int)font->ft_data]; + font->ft_widths = (short *) &font_data[(size_t)font->ft_widths]; + font->ft_data = (unsigned char *) &font_data[(size_t)font->ft_data]; font->ft_chars = (unsigned char **)d_malloc( nchars * sizeof(unsigned char *)); ptr = font->ft_data; @@ -1458,7 +1458,7 @@ grs_font * gr_init_font( char * fontname ) } if (font->ft_flags & FT_KERNED) - font->ft_kerndata = (unsigned char *) &font_data[(int)font->ft_kerndata]; + font->ft_kerndata = (unsigned char *) &font_data[(size_t)font->ft_kerndata]; if (font->ft_flags & FT_COLOR) { //remap palette ubyte palette[256*3]; @@ -1505,7 +1505,6 @@ grs_font * gr_init_font( char * fontname ) FONT = font; FG_COLOR = 0; BG_COLOR = 0; - { int x,y,aw; char tests[]="abcdefghij1234.A"; @@ -1552,16 +1551,16 @@ void gr_remap_font( grs_font *font, char * fontname, char *font_data ) cfread(font_data, 1, datasize, fontfile); //read raw data // make these offsets relative to font_data - font->ft_data = (ubyte *)((int)font->ft_data - GRS_FONT_SIZE); - font->ft_widths = (short *)((int)font->ft_widths - GRS_FONT_SIZE); - font->ft_kerndata = (ubyte *)((int)font->ft_kerndata - GRS_FONT_SIZE); + font->ft_data = (ubyte *)((size_t)font->ft_data - GRS_FONT_SIZE); + font->ft_widths = (short *)((size_t)font->ft_widths - GRS_FONT_SIZE); + font->ft_kerndata = (ubyte *)((size_t)font->ft_kerndata - GRS_FONT_SIZE); nchars = font->ft_maxchar - font->ft_minchar + 1; if (font->ft_flags & FT_PROPORTIONAL) { - font->ft_widths = (short *) &font_data[(int)font->ft_widths]; - font->ft_data = (unsigned char *) &font_data[(int)font->ft_data]; + font->ft_widths = (short *) &font_data[(size_t)font->ft_widths]; + font->ft_data = (unsigned char *) &font_data[(size_t)font->ft_data]; font->ft_chars = (unsigned char **)d_malloc( nchars * sizeof(unsigned char *)); ptr = font->ft_data; @@ -1585,7 +1584,7 @@ void gr_remap_font( grs_font *font, char * fontname, char *font_data ) } if (font->ft_flags & FT_KERNED) - font->ft_kerndata = (unsigned char *) &font_data[(int)font->ft_kerndata]; + font->ft_kerndata = (unsigned char *) &font_data[(size_t)font->ft_kerndata]; if (font->ft_flags & FT_COLOR) { //remap palette ubyte palette[256*3]; diff --git a/main/piggy.c b/main/piggy.c index 96dde094..b8bb4474 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -813,7 +813,7 @@ int read_hamfile() for (i=0; iavg_color = bmh.avg_color; - bm->bm_data = (ubyte *) bmh.offset; + bm->bm_data = (ubyte *) (size_t)bmh.offset; gr_set_bitmap_flags(bm, bmh.flags & BM_FLAGS_TO_COPY); @@ -1652,7 +1652,7 @@ void load_bitmap_replacements(char *level_name) for (i = 0; i < n_bitmaps; i++) { grs_bitmap *bm = &GameBitmaps[indices[i]]; - gr_set_bitmap_data(bm, Bitmap_replacement_data + (int) bm->bm_data); + gr_set_bitmap_data(bm, Bitmap_replacement_data + (size_t) bm->bm_data); } d_free(indices); diff --git a/main/polyobj.c b/main/polyobj.c index 64518503..d29eed25 100644 --- a/main/polyobj.c +++ b/main/polyobj.c @@ -912,7 +912,7 @@ extern void polymodel_read(polymodel *pm, CFILE *fp) pm->n_models = cfile_read_int(fp); pm->model_data_size = cfile_read_int(fp); - pm->model_data = (ubyte *)cfile_read_int(fp); // garbage, read it anyway just for consistency + pm->model_data = (ubyte *)(size_t)cfile_read_int(fp); // garbage, read it anyway just for consistency for (i = 0; i < MAX_SUBMODELS; i++) pm->submodel_ptrs[i] = cfile_read_int(fp); for (i = 0; i < MAX_SUBMODELS; i++) @@ -946,7 +946,7 @@ extern int polymodel_read_n(polymodel *pm, int n, CFILE *fp) for (i = 0; i < n; i++) { pm[i].n_models = cfile_read_int(fp); pm[i].model_data_size = cfile_read_int(fp); - pm->model_data = (ubyte *)cfile_read_int(fp); // garbage, read it anyway just for consistency + pm->model_data = (ubyte *)(size_t)cfile_read_int(fp); // garbage, read it anyway just for consistency for (j = 0; j < MAX_SUBMODELS; j++) pm[i].submodel_ptrs[j] = cfile_read_int(fp); for (j = 0; j < MAX_SUBMODELS; j++) diff --git a/main/render.c b/main/render.c index f626824a..2fa3c856 100644 --- a/main/render.c +++ b/main/render.c @@ -274,14 +274,16 @@ void render_face(int segnum, int sidenum, int nv, short *vp, int tmap1, int tmap #endif fix reflect; - uvl uvl_copy[8]; + g3s_uvl uvl_copy[8]; int i; - g3s_point *pointlist[8]; + g3s_point *pointlist[8]; Assert(nv <= 8); for (i=0; i>14) & 3); + g3_draw_tmap_2(nv,pointlist,uvl_copy,bm,bm2,((tmap2&0xC000)>>14) & 3); }else #endif - g3_draw_tmap(nv,pointlist,(g3s_uvl *) uvl_copy,bm); + g3_draw_tmap(nv,pointlist,uvl_copy,bm); #ifndef NDEBUG if (Outline_mode) draw_outline(nv, pointlist); @@ -398,7 +400,7 @@ void check_face(int segnum, int sidenum, int facenum, int nv, short *vp, int tma if (_search_mode) { int save_lighting; grs_bitmap *bm; - uvl uvl_copy[8]; + g3s_uvl uvl_copy[8]; g3s_point *pointlist[4]; if (tmap2 > 0 ) @@ -407,7 +409,9 @@ void check_face(int segnum, int sidenum, int facenum, int nv, short *vp, int tma bm = &GameBitmaps[Textures[tmap1].index]; for (i=0; icv_bitmap,_search_x,_search_y) == 1) { diff --git a/mem/mem.c b/mem/mem.c index b91bdb8d..13fc1043 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -522,7 +522,7 @@ void mem_init() void * mem_malloc( unsigned int size, char * var, char * filename, int line, int fill_zero ) { - unsigned int base; + size_t base; void *ptr; int * psize; @@ -565,7 +565,7 @@ void * mem_malloc( unsigned int size, char * var, char * filename, int line, int Int3(); } - base = (unsigned int)ptr; + base = (size_t)ptr; if ( base < SmallestAddress ) SmallestAddress = base; if ( (base+size) > LargestAddress ) LargestAddress = base+size; -- 2.39.2