diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-29 21:11:40 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-29 21:11:40 +0400 |
commit | 343edf2722a9e114b98944c1147676e630e699b7 (patch) | |
tree | 7b969239ccab922b6390e040f85e96afa956932a /source/blender/imbuf/intern | |
parent | b6c1850fd35c040c9d489eb42c2190f38564d381 (diff) |
style cleanup: function calls & whitespace.
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/indexer.c | 6 | ||||
-rw-r--r-- | source/blender/imbuf/intern/jpeg.c | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/png.c | 10 | ||||
-rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index cf1a4df1cf9..9f3ed6797be 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -255,7 +255,7 @@ 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; diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index b566d975f5b..c38599028f8 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -69,7 +69,7 @@ anim_index_builder * IMB_index_builder_create(const char * name) { anim_index_builder * rv - = MEM_callocN( sizeof(struct anim_index_builder), + = MEM_callocN(sizeof(struct anim_index_builder), "index builder"); fprintf(stderr, "Starting work on index: %s\n", name); @@ -176,7 +176,7 @@ struct anim_index * IMB_indexer_open(const char * name) return NULL; } - idx = MEM_callocN( sizeof(struct anim_index), "anim_index"); + idx = MEM_callocN(sizeof(struct anim_index), "anim_index"); BLI_strncpy(idx->name, name, sizeof(idx->name)); @@ -191,7 +191,7 @@ struct anim_index * IMB_indexer_open(const char * name) fseek(fp, 12, SEEK_SET); - idx->entries = MEM_callocN( sizeof(struct anim_index_entry) + idx->entries = MEM_callocN(sizeof(struct anim_index_entry) * idx->num_entries, "anim_index_entries"); for (i = 0; i < idx->num_entries; i++) { diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index 87e56bffb41..f3a382eaa56 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -230,7 +230,7 @@ static void memory_source(j_decompress_ptr cinfo, unsigned char *buffer, size_t * If must suspend, take the specified action (typically "return FALSE"). */ #define INPUT_BYTE(cinfo,V,action) \ - MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \ + MAKESTMT(MAKE_BYTE_AVAIL(cinfo,action); \ bytes_in_buffer--; \ V = GETJOCTET(*next_input_byte++); ) @@ -238,7 +238,7 @@ static void memory_source(j_decompress_ptr cinfo, unsigned char *buffer, size_t * V should be declared unsigned int or perhaps INT32. */ #define INPUT_2BYTES(cinfo,V,action) \ - MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \ + MAKESTMT(MAKE_BYTE_AVAIL(cinfo,action); \ bytes_in_buffer--; \ V = ((unsigned int) GETJOCTET(*next_input_byte++)) << 8; \ MAKE_BYTE_AVAIL(cinfo,action); \ diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index 513fcb9b6dc..0a19bf1280b 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -51,9 +51,9 @@ typedef struct PNGReadStruct { unsigned int seek; } PNGReadStruct; -static void ReadData( png_structp png_ptr, png_bytep data, png_size_t length); -static void WriteData( png_structp png_ptr, png_bytep data, png_size_t length); -static void Flush( png_structp png_ptr); +static void ReadData(png_structp png_ptr, png_bytep data, png_size_t length); +static void WriteData(png_structp png_ptr, png_bytep data, png_size_t length); +static void Flush(png_structp png_ptr); int imb_is_a_png(unsigned char *mem) { @@ -68,7 +68,7 @@ static void Flush(png_structp png_ptr) (void)png_ptr; } -static void WriteData( png_structp png_ptr, png_bytep data, png_size_t length) +static void WriteData(png_structp png_ptr, png_bytep data, png_size_t length) { ImBuf *ibuf = (ImBuf *) png_get_io_ptr(png_ptr); @@ -81,7 +81,7 @@ static void WriteData( png_structp png_ptr, png_bytep data, png_size_t length) ibuf->encodedsize += length; } -static void ReadData( png_structp png_ptr, png_bytep data, png_size_t length) +static void ReadData(png_structp png_ptr, png_bytep data, png_size_t length) { PNGReadStruct *rs= (PNGReadStruct *) png_get_io_ptr(png_ptr); diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index 23080aee7ab..8507cb71543 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -218,7 +218,7 @@ static void thumbname_from_uri(const char* uri, char* thumb, const int thumb_len char hexdigest[33]; unsigned char digest[16]; - md5_buffer( uri, strlen(uri), digest); + md5_buffer(uri, strlen(uri), digest); hexdigest[0] = '\0'; to_hex_char(hexdigest, digest, 16); hexdigest[32] = '\0'; |