diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-18 03:21:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-18 03:21:11 +0400 |
commit | 5fe5a8c2838edc62585e0ed72da23fbeb08ae5e1 (patch) | |
tree | 88e9e8828a78f49624a47a6485c634f0e12a28db /source/blender/imbuf/intern | |
parent | c0bd076bfd27fab3f2d468c85206b59d1c7ab29e (diff) |
style cleanup: function definitions
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/cineon_dpx.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/moviecache.c | 5 | ||||
-rw-r--r-- | source/blender/imbuf/intern/png.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/scaling.c | 11 | ||||
-rw-r--r-- | source/blender/imbuf/intern/targa.c | 3 |
6 files changed, 19 insertions, 13 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index d8efdc3b870..a0856533335 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -261,7 +261,8 @@ void IMB_close_anim_proxies(struct anim *anim) IMB_free_indices(anim); } -struct anim *IMB_open_anim(const char *name, int ib_flags, int streamindex){ +struct anim *IMB_open_anim(const char *name, int ib_flags, int streamindex) +{ struct anim *anim; anim = (struct anim *)MEM_callocN(sizeof(struct anim), "anim struct"); @@ -1159,7 +1160,7 @@ static void free_anim_redcode(struct anim *anim) /* Geen plaatje, probeer dan volgende animatie te openen */ /* gelukt, haal dan eerste plaatje van animatie */ -static struct ImBuf *anim_getnew(struct anim *anim) +static ImBuf *anim_getnew(struct anim *anim) { struct ImBuf *ibuf = NULL; @@ -1222,7 +1223,8 @@ static struct ImBuf *anim_getnew(struct anim *anim) return(ibuf); } -struct ImBuf *IMB_anim_previewframe(struct anim *anim){ +struct ImBuf *IMB_anim_previewframe(struct anim *anim) +{ struct ImBuf *ibuf = NULL; int position = 0; diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c index a7d168d42a2..8e996b97622 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.c +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c @@ -63,7 +63,7 @@ static void cineon_conversion_parameters(LogImageByteConversionParameters *param } #endif -static struct ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int size, int flags) +static ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int size, int flags) { ImBuf *ibuf; LogImageFile *image; diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index ee358f6e4ba..2992e4a0aa7 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -198,8 +198,9 @@ void IMB_moviecache_destruct(void) delete_MEM_CacheLimiter(limitor); } -struct MovieCache *IMB_moviecache_create(int keysize, GHashHashFP hashfp, GHashCmpFP cmpfp, - MovieCacheGetKeyDataFP getdatafp){ +MovieCache *IMB_moviecache_create(int keysize, GHashHashFP hashfp, GHashCmpFP cmpfp, + MovieCacheGetKeyDataFP getdatafp) +{ MovieCache *cache; cache = MEM_callocN(sizeof(MovieCache), "MovieCache"); diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index 35a44635727..2aed1485700 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -301,7 +301,8 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags) return(1); } -struct ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags){ +ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags) +{ struct ImBuf *ibuf = NULL; png_structp png_ptr; png_infop info_ptr; diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 5a652a50cbb..ef057784a28 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -343,7 +343,8 @@ void imb_onehalf_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1) } -struct ImBuf *IMB_onehalf(struct ImBuf *ibuf1){ +ImBuf *IMB_onehalf(struct ImBuf *ibuf1) +{ struct ImBuf *ibuf2; if (ibuf1 == NULL) return (NULL); @@ -810,7 +811,7 @@ static int q_scale_linear_interpolation( return TRUE; } -static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx) +static ImBuf *scaledownx(struct ImBuf *ibuf, int newx) { const int do_rect = (ibuf->rect != NULL); const int do_float = (ibuf->rect_float != NULL); @@ -940,7 +941,7 @@ static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx) } -static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy) +static ImBuf *scaledowny(struct ImBuf *ibuf, int newy) { const int do_rect = (ibuf->rect != NULL); const int do_float = (ibuf->rect_float != NULL); @@ -1071,7 +1072,7 @@ static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy) } -static struct ImBuf *scaleupx(struct ImBuf *ibuf, int newx) +static ImBuf *scaleupx(struct ImBuf *ibuf, int newx) { uchar *rect, *_newrect = NULL, *newrect; float *rectf, *_newrectf = NULL, *newrectf; @@ -1238,7 +1239,7 @@ static struct ImBuf *scaleupx(struct ImBuf *ibuf, int newx) return(ibuf); } -static struct ImBuf *scaleupy(struct ImBuf *ibuf, int newy) +static ImBuf *scaleupy(struct ImBuf *ibuf, int newy) { uchar *rect, *_newrect = NULL, *newrect; float *rectf, *_newrectf = NULL, *newrectf; diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index c690995d28a..bf75995fd9c 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -544,7 +544,8 @@ partial_load: } -struct ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags){ +ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags) +{ TARGA tga; struct ImBuf *ibuf; int col, count, size; |