From e701f9b67010279db02ceb51f7d08078cb34170a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 29 Apr 2012 15:47:02 +0000 Subject: style cleanup: whitespace / commas --- source/blender/avi/intern/avi.c | 16 ++++++++-------- source/blender/avi/intern/avirgb.c | 4 ++-- source/blender/avi/intern/codecs.c | 4 ++-- source/blender/avi/intern/endian.c | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'source/blender/avi') diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index 637d4be30fd..ea83afb16fb 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -638,7 +638,7 @@ AviError AVI_open_movie (const char *name, AviMovie *movie) return AVI_ERROR_FORMAT; } - movie->entries = (AviIndexEntry *) MEM_mallocN (movie->index_entries * sizeof(AviIndexEntry),"movieentries"); + movie->entries = (AviIndexEntry *) MEM_mallocN (movie->index_entries * sizeof(AviIndexEntry), "movieentries"); for (temp=0; temp < movie->index_entries; temp++) { movie->entries[temp].ChunkId = GET_FCC (movie->fp); @@ -701,7 +701,7 @@ void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int stream) fseek (movie->fp, movie->read_offset + movie->entries[i-1].Offset, SEEK_SET); temp = GET_FCC(movie->fp); - buffer = MEM_mallocN (temp,"readbuffer"); + buffer = MEM_mallocN (temp, "readbuffer"); if (fread (buffer, 1, temp, movie->fp) != temp) { MEM_freeN(buffer); @@ -755,14 +755,14 @@ AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) if (movie->fp == NULL) return AVI_ERROR_OPEN; - movie->offset_table = (int64_t *) MEM_mallocN ((1+streams*2) * sizeof (int64_t),"offsettable"); + movie->offset_table = (int64_t *) MEM_mallocN ((1+streams*2) * sizeof (int64_t), "offsettable"); for (i=0; i < 1 + streams*2; i++) movie->offset_table[i] = -1L; movie->entries = NULL; - movie->header = (AviMainHeader *) MEM_mallocN (sizeof(AviMainHeader),"movieheader"); + movie->header = (AviMainHeader *) MEM_mallocN (sizeof(AviMainHeader), "movieheader"); movie->header->fcc = FCC("avih"); movie->header->size = 56; @@ -781,7 +781,7 @@ AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) movie->header->Reserved[2] = 0; movie->header->Reserved[3] = 0; - movie->streams = (AviStreamRec *) MEM_mallocN (sizeof(AviStreamRec) * movie->header->Streams,"moviestreams"); + movie->streams = (AviStreamRec *) MEM_mallocN (sizeof(AviStreamRec) * movie->header->Streams, "moviestreams"); va_start (ap, streams); @@ -818,7 +818,7 @@ AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) #if 0 if (movie->streams[i].format == AVI_FORMAT_MJPEG) { movie->streams[i].sf = MEM_mallocN (sizeof(AviBitmapInfoHeader) - + sizeof(AviMJPEGUnknown),"moviestreamformatL"); + + sizeof(AviMJPEGUnknown), "moviestreamformatL"); movie->streams[i].sf_size = sizeof(AviBitmapInfoHeader) + sizeof(AviMJPEGUnknown); } else { @@ -952,7 +952,7 @@ AviError AVI_write_frame (AviMovie *movie, int frame_num, ...) if (frame_num+1 > movie->index_entries) { temp = (AviIndexEntry *) MEM_mallocN ((frame_num+1) * - (movie->header->Streams+1) * sizeof(AviIndexEntry),"newidxentry"); + (movie->header->Streams+1) * sizeof(AviIndexEntry), "newidxentry"); if (movie->entries != NULL) { memcpy (temp, movie->entries, movie->index_entries * (movie->header->Streams+1) * sizeof(AviIndexEntry)); @@ -1062,7 +1062,7 @@ AviError AVI_close_compress (AviMovie *movie) fseek (movie->fp, movie->movi_offset, SEEK_SET); - PUT_FCCN((movi_size-(movie->movi_offset+4L)),movie->fp); + PUT_FCCN((movi_size-(movie->movi_offset+4L)), movie->fp); fclose (movie->fp); diff --git a/source/blender/avi/intern/avirgb.c b/source/blender/avi/intern/avirgb.c index 8e5806c09cf..e06d0bbfa11 100644 --- a/source/blender/avi/intern/avirgb.c +++ b/source/blender/avi/intern/avirgb.c @@ -45,7 +45,7 @@ void *avi_converter_from_avi_rgb (AviMovie *movie, int stream, unsigned char *buffer, int *size) { - int x, y,i, rowstride; + int x, y, i, rowstride; unsigned char *buf; AviBitmapInfoHeader *bi; short bits= 32; @@ -127,7 +127,7 @@ void *avi_converter_to_avi_rgb (AviMovie *movie, int stream, unsigned char *buff *size= movie->header->Height * movie->header->Width * 3; if (movie->header->Width%2) *size+= movie->header->Height; - buf = MEM_mallocN (*size,"toavirgbbuf"); + buf = MEM_mallocN (*size, "toavirgbbuf"); rowstride = movie->header->Width*3; if (movie->header->Width%2) rowstride++; diff --git a/source/blender/avi/intern/codecs.c b/source/blender/avi/intern/codecs.c index 2c244177655..222900b6637 100644 --- a/source/blender/avi/intern/codecs.c +++ b/source/blender/avi/intern/codecs.c @@ -90,9 +90,9 @@ int avi_get_data_id (AviFormat format, int stream) char fcc[5]; if (avi_get_format_type (format) == FCC("vids")) - sprintf (fcc,"%2.2ddc",stream); + sprintf (fcc, "%2.2ddc", stream); else if (avi_get_format_type (format) == FCC("auds")) - sprintf (fcc,"%2.2ddc",stream); + sprintf (fcc, "%2.2ddc", stream); else return 0; diff --git a/source/blender/avi/intern/endian.c b/source/blender/avi/intern/endian.c index adcc7e8750a..eb9e586cfb0 100644 --- a/source/blender/avi/intern/endian.c +++ b/source/blender/avi/intern/endian.c @@ -49,7 +49,7 @@ #ifdef __BIG_ENDIAN__ static void invert (int *num) { - int new=0,i,j; + int new=0, i, j; for (j=0; j < 4; j++) { for (i=0; i<8; i++) { @@ -63,7 +63,7 @@ static void invert (int *num) static void sinvert (short int *num) { short int new=0; - int i,j; + int i, j; for (j=0; j < 2; j++) { for (i=0; i<8; i++) { -- cgit v1.2.3