diff options
| author | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-02 03:59:36 +0000 |
|---|---|---|
| committer | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-02 03:59:36 +0000 |
| commit | 9d9a15d18572d1450fd8fef495be3629bf85c995 (patch) | |
| tree | bfbc498db3d3ada10c8cfe64c9381bce66533419 /libvo/font_load_ft.c | |
| parent | 1ad9af38b5120af85129d3b74834c7ed9690e7f3 (diff) | |
| download | mpv-9d9a15d18572d1450fd8fef495be3629bf85c995.tar.bz2 mpv-9d9a15d18572d1450fd8fef495be3629bf85c995.tar.xz | |
rm unnecesary casts from void* - part 2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18883 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/font_load_ft.c')
| -rw-r--r-- | libvo/font_load_ft.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index e1d475f4a8..2dbd06173b 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -618,9 +618,9 @@ static int prepare_font(font_desc_t *desc, FT_Face face, float ppem, int pic_idx desc->faces[pic_idx] = face; - desc->pic_a[pic_idx] = (raw_file*)malloc(sizeof(raw_file)); + desc->pic_a[pic_idx] = malloc(sizeof(raw_file)); if (!desc->pic_a[pic_idx]) return -1; - desc->pic_b[pic_idx] = (raw_file*)malloc(sizeof(raw_file)); + desc->pic_b[pic_idx] = malloc(sizeof(raw_file)); if (!desc->pic_b[pic_idx]) return -1; desc->pic_a[pic_idx]->bmp = NULL; @@ -628,11 +628,11 @@ static int prepare_font(font_desc_t *desc, FT_Face face, float ppem, int pic_idx desc->pic_b[pic_idx]->bmp = NULL; desc->pic_b[pic_idx]->pal = NULL; - desc->pic_a[pic_idx]->pal = (unsigned char*)malloc(sizeof(unsigned char)*256*3); + desc->pic_a[pic_idx]->pal = malloc(sizeof(unsigned char)*256*3); if (!desc->pic_a[pic_idx]->pal) return -1; for (i = 0; i<768; ++i) desc->pic_a[pic_idx]->pal[i] = i/3; - desc->pic_b[pic_idx]->pal = (unsigned char*)malloc(sizeof(unsigned char)*256*3); + desc->pic_b[pic_idx]->pal = malloc(sizeof(unsigned char)*256*3); if (!desc->pic_b[pic_idx]->pal) return -1; for (i = 0; i<768; ++i) desc->pic_b[pic_idx]->pal[i] = i/3; @@ -673,13 +673,13 @@ int generate_tables(font_desc_t *desc, double thickness, double radius) // fprintf(stderr, "o_r = %d\n", desc->tables.o_r); if (desc->tables.g_r) { - desc->tables.g = (unsigned*)malloc(desc->tables.g_w * sizeof(unsigned)); - desc->tables.gt2 = (unsigned*)malloc(256 * desc->tables.g_w * sizeof(unsigned)); + desc->tables.g = malloc(desc->tables.g_w * sizeof(unsigned)); + desc->tables.gt2 = malloc(256 * desc->tables.g_w * sizeof(unsigned)); if (desc->tables.g==NULL || desc->tables.gt2==NULL) { return -1; } } - desc->tables.om = (unsigned*)malloc(desc->tables.o_w*desc->tables.o_w * sizeof(unsigned)); + desc->tables.om = malloc(desc->tables.o_w*desc->tables.o_w * sizeof(unsigned)); desc->tables.omt = malloc(desc->tables.o_size*256); omtp = desc->tables.omt; |