|
Line
Link Here
|
| 0 |
-- xine-lib-1.2.0-orig/src/xine-engine/osd.c |
0 |
++ xine-lib-1.2.0/src/xine-engine/osd.c |
|
Lines 846-852
Link Here
|
| 846 |
osd->display_y = y; |
846 |
osd->display_y = y; |
| 847 |
} |
847 |
} |
| 848 |
|
848 |
|
| 849 |
static uint16_t gzread_i16(gzFile *fp) { |
849 |
static uint16_t gzread_i16(gzFile fp) { |
| 850 |
uint16_t ret; |
850 |
uint16_t ret; |
| 851 |
ret = gzgetc(fp); |
851 |
ret = gzgetc(fp); |
| 852 |
ret |= (gzgetc(fp)<<8); |
852 |
ret |= (gzgetc(fp)<<8); |
|
Lines 859-865
Link Here
|
| 859 |
|
859 |
|
| 860 |
static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { |
860 |
static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { |
| 861 |
|
861 |
|
| 862 |
gzFile *fp; |
862 |
gzFile fp; |
| 863 |
osd_font_t *font = NULL; |
863 |
osd_font_t *font = NULL; |
| 864 |
int i, ret = 0; |
864 |
int i, ret = 0; |
| 865 |
|
865 |
|
| 866 |
-- xine-lib-1.2.0-orig/misc/xine-fontconv.c |
866 |
++ xine-lib-1.2.0/misc/xine-fontconv.c |
|
Lines 109-115
Link Here
|
| 109 |
osd_font_t font; |
109 |
osd_font_t font; |
| 110 |
|
110 |
|
| 111 |
|
111 |
|
| 112 |
static int gzwrite_i16(gzFile *fp, uint16_t number) { |
112 |
static int gzwrite_i16(gzFile fp, uint16_t number) { |
| 113 |
return gzputc(fp, number & 0xFF) != -1 && |
113 |
return gzputc(fp, number & 0xFF) != -1 && |
| 114 |
gzputc(fp, (number >> 8) & 0xFF) != -1; |
114 |
gzputc(fp, (number >> 8) & 0xFF) != -1; |
| 115 |
} |
115 |
} |
|
Lines 341-347
Link Here
|
| 341 |
|
341 |
|
| 342 |
char filename[1024]; |
342 |
char filename[1024]; |
| 343 |
FT_Bitmap *out_bitmap; |
343 |
FT_Bitmap *out_bitmap; |
| 344 |
gzFile *fp; |
344 |
gzFile fp; |
| 345 |
int error; |
345 |
int error; |
| 346 |
int error_counter; |
346 |
int error_counter; |
| 347 |
int glyph_index; |
347 |
int glyph_index; |
