diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:24:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:24:53 +0400 |
commit | 5a90ea77bc1333efe4e1e54984a080550ed3f707 (patch) | |
tree | 8ba5f94ddcd2c57440197a910305daae5e913554 /source/blender/avi | |
parent | 69e6894b15271884623ea6f56ead06db83acbe99 (diff) |
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
Diffstat (limited to 'source/blender/avi')
-rw-r--r-- | source/blender/avi/intern/avi.c | 44 | ||||
-rw-r--r-- | source/blender/avi/intern/avirgb.c | 3 | ||||
-rw-r--r-- | source/blender/avi/intern/mjpeg.c | 17 | ||||
-rw-r--r-- | source/blender/avi/intern/rgb32.c | 2 |
4 files changed, 42 insertions, 24 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index cc4d6b41f98..a58189c6018 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -216,7 +216,8 @@ int AVI_is_avi (char *name) !GET_FCC (fp) || GET_FCC (fp) != FCC("AVI ")) { ret = 0; - } else { + } + else { ret = 1; } @@ -312,9 +313,11 @@ int AVI_is_avi (const char *name) fcca == FCC ("RAW ") || fcca == 0) { movie.streams[temp].format = AVI_FORMAT_AVI_RGB; - } else if (fcca == FCC ("mjpg")||fcca == FCC ("MJPG")) { + } + else if (fcca == FCC ("mjpg")||fcca == FCC ("MJPG")) { movie.streams[temp].format = AVI_FORMAT_MJPEG; - } else { + } + else { MEM_freeN(movie.streams); fclose(movie.fp); return 0; @@ -379,10 +382,12 @@ int AVI_is_avi (const char *name) fcca == FCC ("rgb ") || fcca == FCC ("RAW ") || fcca == 0 ) { - } else if ( fcca == FCC ("mjpg") || + } + else if ( fcca == FCC ("mjpg") || fcca == FCC ("MJPG")) { movie.streams[temp].format = AVI_FORMAT_MJPEG; - } else { + } + else { MEM_freeN(movie.streams); fclose(movie.fp); return 0; @@ -391,7 +396,8 @@ int AVI_is_avi (const char *name) } if (j > 0) fseek (movie.fp, j, SEEK_CUR); - } else fseek (movie.fp, movie.streams[temp].sf_size, SEEK_CUR); + } + else fseek (movie.fp, movie.streams[temp].sf_size, SEEK_CUR); /* Walk to the next LIST */ while (GET_FCC (movie.fp) != FCC("LIST")) { @@ -495,9 +501,11 @@ AviError AVI_open_movie (const char *name, AviMovie *movie) fcca == FCC ("RAW ") || fcca == 0) { movie->streams[temp].format = AVI_FORMAT_AVI_RGB; - } else if (fcca == FCC ("mjpg")||fcca == FCC ("MJPG")) { + } + else if (fcca == FCC ("mjpg")||fcca == FCC ("MJPG")) { movie->streams[temp].format = AVI_FORMAT_MJPEG; - } else { + } + else { return AVI_ERROR_COMPRESSION; } } @@ -558,17 +566,20 @@ AviError AVI_open_movie (const char *name, AviMovie *movie) fcca == FCC ("rgb ") || fcca == FCC ("RAW ") || fcca == 0 ) { - } else if ( fcca == FCC ("mjpg") || + } + else if ( fcca == FCC ("mjpg") || fcca == FCC ("MJPG")) { movie->streams[temp].format = AVI_FORMAT_MJPEG; - } else { + } + else { return AVI_ERROR_COMPRESSION; } } } if (j > 0) fseek (movie->fp, j, SEEK_CUR); - } else fseek (movie->fp, movie->streams[temp].sf_size, SEEK_CUR); + } + else fseek (movie->fp, movie->streams[temp].sf_size, SEEK_CUR); /* Walk to the next LIST */ while (GET_FCC (movie->fp) != FCC("LIST")) { @@ -595,7 +606,8 @@ AviError AVI_open_movie (const char *name, AviMovie *movie) break; else fseek (movie->fp, size-4, SEEK_CUR); - } else { + } + else { fseek (movie->fp, size, SEEK_CUR); } if (ftell(movie->fp) > movie->size) { @@ -659,7 +671,7 @@ void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int stream) /* Retrieve the record number of the desired frame in the index * If a chunk has Size 0 we need to rewind to previous frame */ - while(rewind && frame > -1) { + while (rewind && frame > -1) { i=0; cur_frame=-1; rewind = 0; @@ -670,7 +682,8 @@ void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int stream) if ((cur_frame == frame -1) && (movie->entries[i].Size == 0)) { rewind = 1; frame = frame -1; - } else { + } + else { cur_frame++; } } @@ -802,7 +815,8 @@ AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) movie->streams[i].sf = MEM_mallocN (sizeof(AviBitmapInfoHeader) + sizeof(AviMJPEGUnknown),"moviestreamformatL"); movie->streams[i].sf_size = sizeof(AviBitmapInfoHeader) + sizeof(AviMJPEGUnknown); - } else { + } + else { #endif movie->streams[i].sf = MEM_mallocN (sizeof(AviBitmapInfoHeader), "moviestreamformatS"); movie->streams[i].sf_size = sizeof(AviBitmapInfoHeader); diff --git a/source/blender/avi/intern/avirgb.c b/source/blender/avi/intern/avirgb.c index 42a094b1e1c..8e5806c09cf 100644 --- a/source/blender/avi/intern/avirgb.c +++ b/source/blender/avi/intern/avirgb.c @@ -94,7 +94,8 @@ void *avi_converter_from_avi_rgb (AviMovie *movie, int stream, unsigned char *bu MEM_freeN (buffer); return buf; - } else { + } + else { buf = MEM_mallocN (movie->header->Height * movie->header->Width * 3, "fromavirgbbuf"); rowstride = movie->header->Width*3; diff --git a/source/blender/avi/intern/mjpeg.c b/source/blender/avi/intern/mjpeg.c index dab0b213d95..f6ebcab2aeb 100644 --- a/source/blender/avi/intern/mjpeg.c +++ b/source/blender/avi/intern/mjpeg.c @@ -159,7 +159,7 @@ static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsign jpeg_create_decompress(&dinfo); jpegmemsrcmgr_build(&dinfo, inBuffer, bufsize); jpeg_read_header(&dinfo, TRUE); - if (dinfo.dc_huff_tbl_ptrs[0] == NULL){ + if (dinfo.dc_huff_tbl_ptrs[0] == NULL) { std_huff_tables(&dinfo); } dinfo.out_color_space = JCS_RGB; @@ -181,13 +181,13 @@ static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsign numbytes= 0; jpeg_read_header(&dinfo, TRUE); - if (dinfo.dc_huff_tbl_ptrs[0] == NULL){ + if (dinfo.dc_huff_tbl_ptrs[0] == NULL) { std_huff_tables(&dinfo); } jpeg_start_decompress(&dinfo); rowstride= dinfo.output_width*dinfo.output_components; - for (y= 0; y<dinfo.output_height; y++){ + for (y= 0; y<dinfo.output_height; y++) { jpeg_read_scanlines(&dinfo, (JSAMPARRAY) &outBuffer, 1); outBuffer += rowstride; } @@ -251,7 +251,7 @@ static void Compress_JPEG(int quality, unsigned char *outbuffer, unsigned char * jpeg_write_marker (&cinfo, JPEG_COM, marker, 60); rowstride= cinfo.image_width*cinfo.input_components; - for (y = 0; y < cinfo.image_height; y++){ + for (y = 0; y < cinfo.image_height; y++) { jpeg_write_scanlines(&cinfo, (JSAMPARRAY) &inBuffer, 1); inBuffer += rowstride; } @@ -301,7 +301,8 @@ static int check_and_decode_jpeg(unsigned char *inbuf, unsigned char *outbuf, in MEM_freeN(tmpbuf); return ret; - } else { + } + else { return Decode_JPEG(inbuf, outbuf, width, height, bufsize); } } @@ -329,7 +330,8 @@ static void check_and_compress_jpeg(int quality, unsigned char *outbuf, unsigned Compress_JPEG(quality, outbuf, tmpbuf, jwidth, jheight, bufsize); MEM_freeN(tmpbuf); - } else { + } + else { Compress_JPEG(quality, outbuf, inbuf, width, height, bufsize); } } @@ -369,7 +371,8 @@ void *avi_converter_to_mjpeg (AviMovie *movie, int stream, unsigned char *buffer buf = MEM_mallocN (movie->header->Height * movie->header->Width * 3, "avi.avi_converter_to_mjpeg 1"); if (!movie->interlace) { check_and_compress_jpeg(movie->streams[stream].sh.Quality/100, buf, buffer, movie->header->Width, movie->header->Height, bufsize); - } else { + } + else { deinterlace (movie->odd_fields, buf, buffer, movie->header->Width, movie->header->Height); MEM_freeN (buffer); diff --git a/source/blender/avi/intern/rgb32.c b/source/blender/avi/intern/rgb32.c index e3be082cca6..c6830d9666a 100644 --- a/source/blender/avi/intern/rgb32.c +++ b/source/blender/avi/intern/rgb32.c @@ -82,7 +82,7 @@ void *avi_converter_to_rgb32 (AviMovie *movie, int stream, unsigned char *buffer to= buf; from= buffer; i=movie->header->Height*movie->header->Width; - while(i--) { + while (i--) { memcpy(to, from, 3); to+=4; from+=3; } |