From 7ca83a51c13bf8dac303f6e5a3ea80d01fe985de Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Thu, 6 Jan 2011 18:28:39 +0000 Subject: Remove unnecessary whitespace. --- apps/pdfapp.h | 2 +- fitz/filt_flate.c | 2 +- fitz/fitz.h | 86 +++++++++++++++++++++++++++---------------------------- mupdf/mupdf.h | 26 ++++++++--------- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/apps/pdfapp.h b/apps/pdfapp.h index 6d964689..321e8033 100644 --- a/apps/pdfapp.h +++ b/apps/pdfapp.h @@ -16,7 +16,7 @@ extern void winerror(pdfapp_t*, fz_error error); extern void wintitle(pdfapp_t*, char *title); extern void winresize(pdfapp_t*, int w, int h); extern void winrepaint(pdfapp_t*); -extern char* winpassword(pdfapp_t*, char *filename); +extern char *winpassword(pdfapp_t*, char *filename); extern void winopenuri(pdfapp_t*, char *s); extern void wincursor(pdfapp_t*, int curs); extern void windocopy(pdfapp_t*); diff --git a/fitz/filt_flate.c b/fitz/filt_flate.c index d5db9b05..e021b8fe 100644 --- a/fitz/filt_flate.c +++ b/fitz/filt_flate.c @@ -10,7 +10,7 @@ struct fz_flate_s z_stream z; }; -static void * zmalloc(void *opaque, unsigned int items, unsigned int size) +static void *zmalloc(void *opaque, unsigned int items, unsigned int size) { return fz_malloc(items * size); } diff --git a/fitz/fitz.h b/fitz/fitz.h index 265f6dbe..ca849f1d 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -152,7 +152,7 @@ int runetochar(char *str, int *rune); int runelen(int c); /* getopt */ -extern int fz_getopt(int nargc, char * const * nargv, const char *ostr); +extern int fz_getopt(int nargc, char * const *nargv, const char *ostr); extern int fz_optind; extern char *fz_optarg; @@ -162,7 +162,7 @@ extern char *fz_optarg; typedef struct fz_hashtable_s fz_hashtable; -fz_hashtable * fz_newhash(int initialsize, int keylen); +fz_hashtable *fz_newhash(int initialsize, int keylen); void fz_debughash(fz_hashtable *table); void fz_emptyhash(fz_hashtable *table); void fz_freehash(fz_hashtable *table); @@ -382,18 +382,18 @@ struct fz_obj_s } u; }; -fz_obj * fz_newnull(void); -fz_obj * fz_newbool(int b); -fz_obj * fz_newint(int i); -fz_obj * fz_newreal(float f); -fz_obj * fz_newname(char *str); -fz_obj * fz_newstring(char *str, int len); -fz_obj * fz_newindirect(int num, int gen, struct pdf_xref_s *xref); +fz_obj *fz_newnull(void); +fz_obj *fz_newbool(int b); +fz_obj *fz_newint(int i); +fz_obj *fz_newreal(float f); +fz_obj *fz_newname(char *str); +fz_obj *fz_newstring(char *str, int len); +fz_obj *fz_newindirect(int num, int gen, struct pdf_xref_s *xref); -fz_obj * fz_newarray(int initialcap); -fz_obj * fz_newdict(int initialcap); -fz_obj * fz_copyarray(fz_obj *array); -fz_obj * fz_copydict(fz_obj *dict); +fz_obj *fz_newarray(int initialcap); +fz_obj *fz_newdict(int initialcap); +fz_obj *fz_copyarray(fz_obj *array); +fz_obj *fz_copydict(fz_obj *dict); fz_obj *fz_keepobj(fz_obj *obj); void fz_dropobj(fz_obj *obj); @@ -461,7 +461,7 @@ struct fz_buffer_s int cap, len; }; -fz_buffer * fz_newbuffer(int size); +fz_buffer *fz_newbuffer(int size); fz_buffer *fz_keepbuffer(fz_buffer *buf); void fz_dropbuffer(fz_buffer *buf); @@ -533,19 +533,19 @@ static inline void fz_unreadbyte(fz_stream *stm) * Data filters. */ -fz_stream * fz_opencopy(fz_stream *chain); -fz_stream * fz_opennull(fz_stream *chain, int len); -fz_stream * fz_openarc4(fz_stream *chain, unsigned char *key, unsigned keylen); -fz_stream * fz_openaesd(fz_stream *chain, unsigned char *key, unsigned keylen); -fz_stream * fz_opena85d(fz_stream *chain); -fz_stream * fz_openahxd(fz_stream *chain); -fz_stream * fz_openrld(fz_stream *chain); -fz_stream * fz_opendctd(fz_stream *chain, fz_obj *param); -fz_stream * fz_openfaxd(fz_stream *chain, fz_obj *param); -fz_stream * fz_openflated(fz_stream *chain); -fz_stream * fz_openlzwd(fz_stream *chain, fz_obj *param); -fz_stream * fz_openpredict(fz_stream *chain, fz_obj *param); -fz_stream * fz_openjbig2d(fz_stream *chain, fz_buffer *global); +fz_stream *fz_opencopy(fz_stream *chain); +fz_stream *fz_opennull(fz_stream *chain, int len); +fz_stream *fz_openarc4(fz_stream *chain, unsigned char *key, unsigned keylen); +fz_stream *fz_openaesd(fz_stream *chain, unsigned char *key, unsigned keylen); +fz_stream *fz_opena85d(fz_stream *chain); +fz_stream *fz_openahxd(fz_stream *chain); +fz_stream *fz_openrld(fz_stream *chain); +fz_stream *fz_opendctd(fz_stream *chain, fz_obj *param); +fz_stream *fz_openfaxd(fz_stream *chain, fz_obj *param); +fz_stream *fz_openflated(fz_stream *chain); +fz_stream *fz_openlzwd(fz_stream *chain, fz_obj *param); +fz_stream *fz_openpredict(fz_stream *chain, fz_obj *param); +fz_stream *fz_openjbig2d(fz_stream *chain, fz_buffer *global); /* * Resources and other graphics related objects. @@ -598,8 +598,8 @@ struct fz_pixmap_s }; fz_pixmap *fz_newpixmapwithdata(fz_colorspace *colorspace, int x, int y, int w, int h, unsigned char *samples); -fz_pixmap * fz_newpixmapwithrect(fz_colorspace *, fz_bbox bbox); -fz_pixmap * fz_newpixmap(fz_colorspace *, int x, int y, int w, int h); +fz_pixmap *fz_newpixmapwithrect(fz_colorspace *, fz_bbox bbox); +fz_pixmap *fz_newpixmap(fz_colorspace *, int x, int y, int w, int h); fz_pixmap *fz_keeppixmap(fz_pixmap *pix); void fz_droppixmap(fz_pixmap *pix); void fz_clearpixmap(fz_pixmap *pix); @@ -607,8 +607,8 @@ void fz_clearpixmapwithcolor(fz_pixmap *pix, int value); fz_pixmap *fz_alphafromgray(fz_pixmap *gray, int luminosity); fz_bbox fz_boundpixmap(fz_pixmap *pix); -fz_pixmap * fz_scalepixmap(fz_pixmap *src, int xdenom, int ydenom); -fz_pixmap * fz_smoothscalepixmap(fz_pixmap *src, float x, float y, float w, float h); +fz_pixmap *fz_scalepixmap(fz_pixmap *src, int xdenom, int ydenom); +fz_pixmap *fz_smoothscalepixmap(fz_pixmap *src, float x, float y, float w, float h); fz_error fz_writepnm(fz_pixmap *pixmap, char *filename); fz_error fz_writepam(fz_pixmap *pixmap, char *filename, int savealpha); @@ -678,12 +678,12 @@ struct fz_font_s int *widthtable; }; -fz_font * fz_newtype3font(char *name, fz_matrix matrix); +fz_font *fz_newtype3font(char *name, fz_matrix matrix); fz_error fz_newfontfrombuffer(fz_font **fontp, unsigned char *data, int len, int index); fz_error fz_newfontfromfile(fz_font **fontp, char *path, int index); -fz_font * fz_keepfont(fz_font *font); +fz_font *fz_keepfont(fz_font *font); void fz_dropfont(fz_font *font); void fz_debugfont(fz_font *font); @@ -779,7 +779,7 @@ struct fz_text_s fz_textel *els; }; -fz_text * fz_newtext(fz_font *face, fz_matrix trm, int wmode); +fz_text *fz_newtext(fz_font *face, fz_matrix trm, int wmode); void fz_addtext(fz_text *text, int gid, int ucs, float x, float y); void fz_freetext(fz_text *text); void fz_debugtext(fz_text*, int indent); @@ -834,12 +834,12 @@ void fz_paintshade(fz_shade *shade, fz_matrix ctm, fz_pixmap *dest, fz_bbox bbox typedef struct fz_glyphcache_s fz_glyphcache; -fz_glyphcache * fz_newglyphcache(void); -fz_pixmap * fz_renderftglyph(fz_font *font, int cid, fz_matrix trm); -fz_pixmap * fz_rendert3glyph(fz_font *font, int cid, fz_matrix trm); -fz_pixmap * fz_renderftstrokedglyph(fz_font *font, int gid, fz_matrix trm, fz_matrix ctm, fz_strokestate *state); -fz_pixmap * fz_renderglyph(fz_glyphcache*, fz_font*, int, fz_matrix); -fz_pixmap * fz_renderstrokedglyph(fz_glyphcache*, fz_font*, int, fz_matrix, fz_matrix, fz_strokestate *stroke); +fz_glyphcache *fz_newglyphcache(void); +fz_pixmap *fz_renderftglyph(fz_font *font, int cid, fz_matrix trm); +fz_pixmap *fz_rendert3glyph(fz_font *font, int cid, fz_matrix trm); +fz_pixmap *fz_renderftstrokedglyph(fz_font *font, int gid, fz_matrix trm, fz_matrix ctm, fz_strokestate *state); +fz_pixmap *fz_renderglyph(fz_glyphcache*, fz_font*, int, fz_matrix); +fz_pixmap *fz_renderstrokedglyph(fz_glyphcache*, fz_font*, int, fz_matrix, fz_matrix, fz_strokestate *stroke); void fz_freeglyphcache(fz_glyphcache *); /* @@ -874,7 +874,7 @@ struct fz_ael_s fz_edge **edges; }; -fz_gel * fz_newgel(void); +fz_gel *fz_newgel(void); void fz_insertgel(fz_gel *gel, float x0, float y0, float x1, float y1); fz_bbox fz_boundgel(fz_gel *gel); void fz_resetgel(fz_gel *gel, fz_bbox clip); @@ -882,7 +882,7 @@ void fz_sortgel(fz_gel *gel); void fz_freegel(fz_gel *gel); int fz_isrectgel(fz_gel *gel); -fz_ael * fz_newael(void); +fz_ael *fz_newael(void); void fz_freeael(fz_ael *ael); fz_error fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, @@ -968,7 +968,7 @@ struct fz_textspan_s int eol; }; -fz_textspan * fz_newtextspan(void); +fz_textspan *fz_newtextspan(void); void fz_freetextspan(fz_textspan *line); void fz_debugtextspan(fz_textspan *line); void fz_debugtextspanxml(fz_textspan *span); diff --git a/mupdf/mupdf.h b/mupdf/mupdf.h index 05d9e106..5edd40c0 100644 --- a/mupdf/mupdf.h +++ b/mupdf/mupdf.h @@ -43,9 +43,9 @@ fz_error pdf_parseindobj(fz_obj **op, pdf_xref *xref, fz_stream *f, char *buf, i fz_rect pdf_torect(fz_obj *array); fz_matrix pdf_tomatrix(fz_obj *array); -char * pdf_toutf8(fz_obj *src); -unsigned short * pdf_toucs2(fz_obj *src); -fz_obj * pdf_toutf8name(fz_obj *src); +char *pdf_toutf8(fz_obj *src); +unsigned short *pdf_toucs2(fz_obj *src); +fz_obj *pdf_toutf8name(fz_obj *src); /* * Encryption @@ -105,7 +105,7 @@ fz_error pdf_newcrypt(pdf_crypt **cp, fz_obj *enc, fz_obj *id); void pdf_freecrypt(pdf_crypt *crypt); fz_error pdf_parsecryptfilter(pdf_cryptfilter *cf, fz_obj *dict, int defaultlength); -fz_stream * pdf_opencrypt(fz_stream *chain, pdf_crypt *crypt, pdf_cryptfilter *cf, int num, int gen); +fz_stream *pdf_opencrypt(fz_stream *chain, pdf_crypt *crypt, pdf_cryptfilter *cf, int num, int gen); void pdf_cryptobj(pdf_crypt *crypt, fz_obj *obj, int num, int gen); int pdf_needspassword(pdf_xref *xref); @@ -155,7 +155,7 @@ fz_error pdf_loadobject(fz_obj **objp, pdf_xref *, int num, int gen); void pdf_updateobject( pdf_xref *xref, int num, int gen, fz_obj *newobj); int pdf_isstream(pdf_xref *xref, int num, int gen); -fz_stream * pdf_openinlinestream(fz_stream *chain, pdf_xref *xref, fz_obj *stmobj, int length); +fz_stream *pdf_openinlinestream(fz_stream *chain, pdf_xref *xref, fz_obj *stmobj, int length); fz_error pdf_loadrawstream(fz_buffer **bufp, pdf_xref *xref, int num, int gen); fz_error pdf_loadstream(fz_buffer **bufp, pdf_xref *xref, int num, int gen); fz_error pdf_openrawstream(fz_stream **stmp, pdf_xref *, int num, int gen); @@ -178,7 +178,7 @@ void pdf_resizexref(pdf_xref *xref, int newcap); typedef struct pdf_store_s pdf_store; -pdf_store * pdf_newstore(void); +pdf_store *pdf_newstore(void); void pdf_freestore(pdf_store *store); void pdf_debugstore(pdf_store *store); @@ -327,7 +327,7 @@ int pdf_lookupcmap(pdf_cmap *cmap, int cpt); int pdf_lookupcmapfull(pdf_cmap *cmap, int cpt, int *out); unsigned char *pdf_decodecmap(pdf_cmap *cmap, unsigned char *s, int *cpt); -pdf_cmap * pdf_newidentitycmap(int wmode, int bytes); +pdf_cmap *pdf_newidentitycmap(int wmode, int bytes); fz_error pdf_parsecmap(pdf_cmap **cmapp, fz_stream *file); fz_error pdf_loadembeddedcmap(pdf_cmap **cmapp, pdf_xref *xref, fz_obj *ref); fz_error pdf_loadsystemcmap(pdf_cmap **cmapp, char *name); @@ -436,8 +436,8 @@ fz_error pdf_loadtype3font(pdf_fontdesc **fontp, pdf_xref *xref, fz_obj *rdb, fz int pdf_fontcidtogid(pdf_fontdesc *fontdesc, int cid); fz_error pdf_loadfontdescriptor(pdf_fontdesc *font, pdf_xref *xref, fz_obj *desc, char *collection, char *basefont); fz_error pdf_loadfont(pdf_fontdesc **fontp, pdf_xref *xref, fz_obj *rdb, fz_obj *obj); -pdf_fontdesc * pdf_newfontdesc(void); -pdf_fontdesc * pdf_keepfont(pdf_fontdesc *fontdesc); +pdf_fontdesc *pdf_newfontdesc(void); +pdf_fontdesc *pdf_keepfont(pdf_fontdesc *fontdesc); void pdf_dropfont(pdf_fontdesc *font); void pdf_debugfont(pdf_fontdesc *fontdesc); @@ -517,8 +517,8 @@ struct pdf_page_s /* pagetree.c */ fz_error pdf_loadpagetree(pdf_xref *xref); int pdf_getpagecount(pdf_xref *xref); -fz_obj * pdf_getpageobject(pdf_xref *xref, int p); -fz_obj * pdf_getpageref(pdf_xref *xref, int p); +fz_obj *pdf_getpageobject(pdf_xref *xref, int p); +fz_obj *pdf_getpageref(pdf_xref *xref, int p); int pdf_findpageobject(pdf_xref *xref, fz_obj *pageobj); /* page.c */ @@ -635,7 +635,7 @@ fz_error pdf_runxobject(pdf_csi *csi, fz_obj *resources, pdf_xobject *xobj); fz_error pdf_runpage(pdf_xref *xref, pdf_page *page, fz_device *dev, fz_matrix ctm); fz_error pdf_runglyph(pdf_xref *xref, fz_obj *resources, fz_buffer *contents, fz_device *dev, fz_matrix ctm); -pdf_material * pdf_keepmaterial(pdf_material *mat); -pdf_material * pdf_dropmaterial(pdf_material *mat); +pdf_material *pdf_keepmaterial(pdf_material *mat); +pdf_material *pdf_dropmaterial(pdf_material *mat); #endif -- cgit v1.2.3