Revision: 42679
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42679
Author: campbellbarton
Date: 2011-12-17 00:52:36 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
style edit only - move parenthesis onto second line of function definition (in
keeping with most of blenders code)
also split some long lines in own code.
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/avi/intern/codecs.c
trunk/blender/source/blender/avi/intern/endian.c
trunk/blender/source/blender/avi/intern/mjpeg.c
trunk/blender/source/blender/avi/intern/options.c
trunk/blender/source/blender/avi/intern/rgb32.c
trunk/blender/source/blender/blenkernel/intern/boids.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/ocean.c
trunk/blender/source/blender/blenkernel/intern/suggestions.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenlib/BLI_ghash.h
trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c
trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
trunk/blender/source/blender/blenlib/intern/BLI_linklist.c
trunk/blender/source/blender/blenlib/intern/BLI_memarena.c
trunk/blender/source/blender/blenlib/intern/edgehash.c
trunk/blender/source/blender/blenlib/intern/rand.c
trunk/blender/source/blender/blenlib/intern/winstuff.c
trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
trunk/blender/source/blender/editors/physics/physics_pointcache.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/bmp.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/blender/python/mathutils/mathutils_geometry.c
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2011-12-17 00:22:15 UTC
(rev 42678)
+++ trunk/blender/source/blender/avi/intern/avi.c 2011-12-17 00:52:36 UTC
(rev 42679)
@@ -63,7 +63,8 @@
/* implemetation */
-unsigned int GET_FCC (FILE *fp) {
+unsigned int GET_FCC (FILE *fp)
+{
unsigned char tmp[4];
tmp[0] = getc(fp);
@@ -74,7 +75,8 @@
return FCC (tmp);
}
-unsigned int GET_TCC (FILE *fp) {
+unsigned int GET_TCC (FILE *fp)
+{
char tmp[5];
tmp[0] = getc(fp);
@@ -85,7 +87,8 @@
return FCC (tmp);
}
-char *fcc_to_char (unsigned int fcc) {
+char *fcc_to_char (unsigned int fcc)
+{
DEBUG_FCC[0]= (fcc)&127;
DEBUG_FCC[1]= (fcc>>8)&127;
DEBUG_FCC[2]= (fcc>>16)&127;
@@ -94,7 +97,8 @@
return DEBUG_FCC;
}
-char *tcc_to_char (unsigned int tcc) {
+char *tcc_to_char (unsigned int tcc)
+{
DEBUG_FCC[0]= (tcc)&127;
DEBUG_FCC[1]= (tcc>>8)&127;
DEBUG_FCC[2]= 0;
@@ -103,7 +107,8 @@
return DEBUG_FCC;
}
-int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num) {
+int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num)
+{
int cur_stream;
if (movie == NULL)
@@ -121,7 +126,8 @@
return -AVI_ERROR_FOUND;
}
-static int fcc_get_stream (int fcc) {
+static int fcc_get_stream (int fcc)
+{
char fccs[4];
fccs[0] = fcc;
@@ -132,7 +138,8 @@
return 10*(fccs[0]-'0') + (fccs[1]-'0');
}
-static int fcc_is_data (int fcc) {
+static int fcc_is_data (int fcc)
+{
char fccs[4];
fccs[0] = fcc;
@@ -148,7 +155,8 @@
return 1;
}
-AviError AVI_print_error (AviError in_error) {
+AviError AVI_print_error (AviError in_error)
+{
int error;
if ((int) in_error < 0)
@@ -190,12 +198,14 @@
return in_error;
}
/*
-void AVI_set_debug (int mode) {
+void AVI_set_debug (int mode)
+{
AVI_DEBUG= mode;
}
*/
/*
-int AVI_is_avi (char *name) {
+int AVI_is_avi (char *name)
+{
FILE *fp;
int ret;
@@ -216,7 +226,8 @@
}
*/
-int AVI_is_avi (const char *name) {
+int AVI_is_avi (const char *name)
+{
int temp, fcca, j;
AviMovie movie= {NULL};
AviMainHeader header;
@@ -407,7 +418,8 @@
}
-AviError AVI_open_movie (const char *name, AviMovie *movie) {
+AviError AVI_open_movie (const char *name, AviMovie *movie)
+{
int temp, fcca, size, j;
DEBUG_PRINT("opening movie\n");
@@ -619,7 +631,11 @@
movie->entries[temp].Offset = GET_FCC (movie->fp);
movie->entries[temp].Size = GET_FCC (movie->fp);
- if (AVI_DEBUG) printf ("Index entry %04d: ChunkId:%s
Flags:%d Offset:%d Size:%d\n", temp, fcc_to_char(movie->entries[temp].ChunkId),
movie->entries[temp].Flags, movie->entries[temp].Offset,
movie->entries[temp].Size);
+ if (AVI_DEBUG) {
+ printf("Index entry %04d: ChunkId:%s Flags:%d
Offset:%d Size:%d\n",
+ temp,
fcc_to_char(movie->entries[temp].ChunkId), movie->entries[temp].Flags,
+ movie->entries[temp].Offset,
movie->entries[temp].Size);
+ }
}
/* Some AVI's have offset entries in absolute coordinates
@@ -637,7 +653,8 @@
return AVI_ERROR_NONE;
}
-void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int
stream) {
+void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int stream)
+{
int cur_frame=-1, temp, i=0, rewind=1;
void *buffer;
@@ -681,7 +698,8 @@
return buffer;
}
-AviError AVI_close (AviMovie *movie) {
+AviError AVI_close (AviMovie *movie)
+{
int i;
fclose (movie->fp);
@@ -703,7 +721,8 @@
return AVI_ERROR_NONE;
}
-AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) {
+AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...)
+{
va_list ap;
AviList list;
AviChunk chunk;
@@ -892,7 +911,8 @@
return AVI_ERROR_NONE;
}
-AviError AVI_write_frame (AviMovie *movie, int frame_num, ...) {
+AviError AVI_write_frame (AviMovie *movie, int frame_num, ...)
+{
AviList list;
AviChunk chunk;
AviIndexEntry *temp;
@@ -999,7 +1019,8 @@
return AVI_ERROR_NONE;
}
-AviError AVI_close_compress (AviMovie *movie) {
+AviError AVI_close_compress (AviMovie *movie)
+{
int temp, movi_size, i;
fseek (movie->fp, 0L, SEEK_END);
Modified: trunk/blender/source/blender/avi/intern/codecs.c
===================================================================
--- trunk/blender/source/blender/avi/intern/codecs.c 2011-12-17 00:22:15 UTC
(rev 42678)
+++ trunk/blender/source/blender/avi/intern/codecs.c 2011-12-17 00:52:36 UTC
(rev 42679)
@@ -40,7 +40,8 @@
#include "mjpeg.h"
#include "rgb32.h"
-void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat
from, AviFormat to, int *size) {
+void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat
from, AviFormat to, int *size)
+{
if (from == to)
return buffer;
@@ -82,7 +83,8 @@
return buffer;
}
-int avi_get_data_id (AviFormat format, int stream) {
+int avi_get_data_id (AviFormat format, int stream)
+{
char fcc[5];
if (avi_get_format_type (format) == FCC("vids"))
@@ -95,7 +97,8 @@
return FCC(fcc);
}
-int avi_get_format_type (AviFormat format) {
+int avi_get_format_type (AviFormat format)
+{
switch (format) {
case AVI_FORMAT_RGB24:
case AVI_FORMAT_RGB32:
@@ -109,7 +112,8 @@
}
}
-int avi_get_format_fcc (AviFormat format) {
+int avi_get_format_fcc (AviFormat format)
+{
switch (format) {
case AVI_FORMAT_RGB24:
case AVI_FORMAT_RGB32:
@@ -125,7 +129,8 @@
}
}
-int avi_get_format_compression (AviFormat format) {
+int avi_get_format_compression (AviFormat format)
+{
switch (format) {
case AVI_FORMAT_RGB24:
case AVI_FORMAT_RGB32:
Modified: trunk/blender/source/blender/avi/intern/endian.c
===================================================================
--- trunk/blender/source/blender/avi/intern/endian.c 2011-12-17 00:22:15 UTC
(rev 42678)
+++ trunk/blender/source/blender/avi/intern/endian.c 2011-12-17 00:52:36 UTC
(rev 42679)
@@ -43,7 +43,8 @@
#include "avi_intern.h"
#ifdef __BIG_ENDIAN__
-static void invert (int *num) {
+static void invert (int *num)
+{
int new=0,i,j;
for (j=0; j < 4; j++) {
@@ -55,7 +56,8 @@
*num = new;
}
-static void sinvert (short int *num) {
+static void sinvert (short int *num)
+{
short int new=0;
int i,j;
@@ -68,20 +70,23 @@
*num = new;
}
-static void Ichunk (AviChunk *chunk) {
+static void Ichunk (AviChunk *chunk)
+{
invert (&chunk->fcc);
invert (&chunk->size);
}
#endif
#ifdef __BIG_ENDIAN__
-static void Ilist (AviList *list){
+static void Ilist (AviList *list)
+{
invert (&list->fcc);
invert (&list->size);
invert (&list->ids);
}
-static void Imainh (AviMainHeader *mainh) {
+static void Imainh (AviMainHeader *mainh)
+{
invert (&mainh->fcc);
invert (&mainh->size);
invert (&mainh->MicroSecPerFrame);
@@ -100,7 +105,8 @@
invert (&mainh->Reserved[3]);
}
-static void Istreamh (AviStreamHeader *streamh) {
+static void Istreamh (AviStreamHeader *streamh)
+{
invert (&streamh->fcc);
invert (&streamh->size);
invert (&streamh->Type);
@@ -122,7 +128,8 @@
sinvert (&streamh->bottom);
}
-static void Ibitmaph (AviBitmapInfoHeader *bitmaph) {
+static void Ibitmaph (AviBitmapInfoHeader *bitmaph)
+{
invert (&bitmaph->fcc);
invert (&bitmaph->size);
invert (&bitmaph->Size);
@@ -138,7 +145,8 @@
invert (&bitmaph->ClrImportant);
}
-static void Imjpegu (AviMJPEGUnknown *mjpgu) {
+static void Imjpegu (AviMJPEGUnknown *mjpgu)
+{
invert (&mjpgu->a);
invert (&mjpgu->b);
invert (&mjpgu->c);
@@ -148,7 +156,8 @@
invert (&mjpgu->g);
}
-static void Iindexe (AviIndexEntry *indexe) {
+static void Iindexe (AviIndexEntry *indexe)
+{
invert (&indexe->ChunkId);
invert (&indexe->Flags);
invert (&indexe->Offset);
@@ -156,7 +165,8 @@
}
#endif /* __BIG_ENDIAN__ */
-void awrite (AviMovie *movie, void *datain, int block, int size, FILE *fp, int
type) {
+void awrite (AviMovie *movie, void *datain, int block, int size, FILE *fp, int
type)
+{
#ifdef __BIG_ENDIAN__
void *data;
Modified: trunk/blender/source/blender/avi/intern/mjpeg.c
===================================================================
--- trunk/blender/source/blender/avi/intern/mjpeg.c 2011-12-17 00:22:15 UTC
(rev 42678)
+++ trunk/blender/source/blender/avi/intern/mjpeg.c 2011-12-17 00:52:36 UTC
(rev 42679)
@@ -50,7 +50,8 @@
static int numbytes;
-static void add_huff_table (j_decompress_ptr dinfo, JHUFF_TBL **htblptr, const
UINT8 *bits, const UINT8 *val) {
+static void add_huff_table (j_decompress_ptr dinfo, JHUFF_TBL **htblptr, const
UINT8 *bits, const UINT8 *val)
+{
if (*htblptr == NULL)
*htblptr = jpeg_alloc_huff_table((j_common_ptr) dinfo);
@@ -64,7 +65,8 @@
/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
/* IMPORTANT: these are only valid for 8-bit data precision! */
-static void std_huff_tables (j_decompress_ptr dinfo) {
+static void std_huff_tables (j_decompress_ptr dinfo)
+{
static const UINT8 bits_dc_luminance[17] =
{ /* 0-base */
0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
@@ -142,7 +144,8 @@
bits_ac_chrominance, val_ac_chrominance);
}
-static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer,
unsigned int width, unsigned int height, int bufsize) {
+static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer,
unsigned int width, unsigned int height, int bufsize)
+{
int rowstride;
unsigned int y;
struct jpeg_decompress_struct dinfo;
@@ -194,7 +197,8 @@
return 1;
}
-static void Compress_JPEG(int quality, unsigned char *outbuffer, unsigned char
*inBuffer, int width, int height, int bufsize) {
+static void Compress_JPEG(int quality, unsigned char *outbuffer, unsigned char
*inBuffer, int width, int height, int bufsize)
+{
int i, rowstride;
unsigned int y;
struct jpeg_compress_struct cinfo;
@@ -255,7 +259,8 @@
jpeg_destroy_compress(&cinfo);
}
-static void interlace(unsigned char *to, unsigned char *from, int width, int
height) {
+static void interlace(unsigned char *to, unsigned char *from, int width, int
height)
+{
int i, rowstride= width*3;
for (i=0; i<height; i++) {
@@ -266,7 +271,8 @@
}
}
-static void deinterlace(int odd, unsigned char *to, unsigned char *from, int
width, int height) {
+static void deinterlace(int odd, unsigned char *to, unsigned char *from, int
width, int height)
+{
int i, rowstride= width*3;
for (i=0; i<height; i++) {
@@ -277,7 +283,8 @@
}
}
-static int check_and_decode_jpeg(unsigned char *inbuf, unsigned char *outbuf,
int width, int height, int bufsize) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
