diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjpeg/cdjpeg.h | 10 | ||||
| -rw-r--r-- | third_party/libjpeg/fpdfapi_jerror.c | 2 | ||||
| -rw-r--r-- | third_party/libjpeg/fpdfapi_jmemmgr.c | 6 | ||||
| -rw-r--r-- | third_party/libjpeg/jinclude.h | 4 | ||||
| -rw-r--r-- | third_party/libjpeg/jmemsys.h | 2 | ||||
| -rw-r--r-- | third_party/libjpeg/jpeglib.h | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/third_party/libjpeg/cdjpeg.h b/third_party/libjpeg/cdjpeg.h index 3d728ee9c7..7ca7c66646 100644 --- a/third_party/libjpeg/cdjpeg.h +++ b/third_party/libjpeg/cdjpeg.h @@ -31,7 +31,7 @@ struct cjpeg_source_struct { JMETHOD(void, finish_input, (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)); - FXSYS_FILE *input_file; + FILE* input_file; JSAMPARRAY buffer; JDIMENSION buffer_height; @@ -59,7 +59,7 @@ struct djpeg_dest_struct { djpeg_dest_ptr dinfo)); /* Target file spec; filled in by djpeg.c after object is created. */ - FXSYS_FILE * output_file; + FILE* output_file; /* Output pixel-row buffer. Created by module init or start_output. * Width is cinfo->output_width * cinfo->output_components; @@ -138,7 +138,7 @@ EXTERN(boolean) set_sample_factors JPP((j_compress_ptr cinfo, char *arg)); /* djpeg support routines (in rdcolmap.c) */ -EXTERN(void) read_color_map JPP((j_decompress_ptr cinfo, FXSYS_FILE * infile)); +EXTERN(void) read_color_map JPP((j_decompress_ptr cinfo, FILE* infile)); /* common support routines (in cdjpeg.c) */ @@ -147,8 +147,8 @@ EXTERN(void) start_progress_monitor JPP((j_common_ptr cinfo, cd_progress_ptr progress)); EXTERN(void) end_progress_monitor JPP((j_common_ptr cinfo)); EXTERN(boolean) keymatch JPP((char * arg, const char * keyword, int minchars)); -EXTERN(FXSYS_FILE *) read_stdin JPP((void)); -EXTERN(FXSYS_FILE *) write_stdout JPP((void)); +EXTERN(FILE*) read_stdin JPP((void)); +EXTERN(FILE*) write_stdout JPP((void)); /* miscellaneous useful macros */ diff --git a/third_party/libjpeg/fpdfapi_jerror.c b/third_party/libjpeg/fpdfapi_jerror.c index adfb9fe19d..2d4f5ff185 100644 --- a/third_party/libjpeg/fpdfapi_jerror.c +++ b/third_party/libjpeg/fpdfapi_jerror.c @@ -94,7 +94,7 @@ output_message (j_common_ptr cinfo) (*cinfo->err->format_message) (cinfo, buffer); /* Send it to stderr, adding a newline */ - FXSYS_fprintf(stderr, "%s\n", buffer); + fprintf(stderr, "%s\n", buffer); } diff --git a/third_party/libjpeg/fpdfapi_jmemmgr.c b/third_party/libjpeg/fpdfapi_jmemmgr.c index 47ead48ac4..c4e589ab36 100644 --- a/third_party/libjpeg/fpdfapi_jmemmgr.c +++ b/third_party/libjpeg/fpdfapi_jmemmgr.c @@ -195,18 +195,18 @@ print_mem_stats (j_common_ptr cinfo, int pool_id) * fprintf directly rather than going through the trace message code. * This is helpful because message parm array can't handle longs. */ - FXSYS_fprintf(stderr, "Freeing pool %d, total space = %ld\n", + fprintf(stderr, "Freeing pool %d, total space = %ld\n", pool_id, mem->total_space_allocated); for (lhdr_ptr = mem->large_list[pool_id]; lhdr_ptr != NULL; lhdr_ptr = lhdr_ptr->hdr.next) { - FXSYS_fprintf(stderr, " Large chunk used %ld\n", + fprintf(stderr, " Large chunk used %ld\n", (long) lhdr_ptr->hdr.bytes_used); } for (shdr_ptr = mem->small_list[pool_id]; shdr_ptr != NULL; shdr_ptr = shdr_ptr->hdr.next) { - FXSYS_fprintf(stderr, " Small chunk used %ld free %ld\n", + fprintf(stderr, " Small chunk used %ld free %ld\n", (long) shdr_ptr->hdr.bytes_used, (long) shdr_ptr->hdr.bytes_left); } diff --git a/third_party/libjpeg/jinclude.h b/third_party/libjpeg/jinclude.h index 6f6a87c79e..56b04fbcc1 100644 --- a/third_party/libjpeg/jinclude.h +++ b/third_party/libjpeg/jinclude.h @@ -98,6 +98,6 @@ */ #define JFREAD(file,buf,sizeofbuf) \ - ((size_t) FXSYS_fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) + ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) #define JFWRITE(file,buf,sizeofbuf) \ - ((size_t) FXSYS_fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) + ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) diff --git a/third_party/libjpeg/jmemsys.h b/third_party/libjpeg/jmemsys.h index 896688181b..df697a062b 100644 --- a/third_party/libjpeg/jmemsys.h +++ b/third_party/libjpeg/jmemsys.h @@ -129,7 +129,7 @@ typedef struct backing_store_struct { /* Private fields for system-dependent backing-store management */ /* For a typical implementation with temp files, we need: */ - FXSYS_FILE * temp_file; /* stdio reference to temp file */ + FILE* temp_file; /* stdio reference to temp file */ char temp_name[TEMP_NAME_LENGTH]; /* name of temp file */ } backing_store_info; diff --git a/third_party/libjpeg/jpeglib.h b/third_party/libjpeg/jpeglib.h index f6af4f2b47..844620a97e 100644 --- a/third_party/libjpeg/jpeglib.h +++ b/third_party/libjpeg/jpeglib.h @@ -1010,8 +1010,8 @@ EXTERN(void) jpeg_destroy_decompress JPP((j_decompress_ptr cinfo)); #if 0 /* Standard data source and destination managers: stdio streams. */ /* Caller is responsible for opening the file before and closing after. */ -EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FXSYS_FILE * outfile)); -EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FXSYS_FILE * infile)); +EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FILE * outfile)); +EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FILE * infile)); #endif /* Default parameter setup for compression */ |