style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Sat, 20 Oct 2012 18:46:57 +0000 (18:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 20 Oct 2012 18:46:57 +0000 (18:46 +0000)
24 files changed:
extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
intern/smoke/intern/spectrum.cpp
intern/smoke/intern/spectrum.h
release/windows/contrib/vfapi/vfapi-plugin.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenlib/BLI_scanfill.h
source/blender/blenlib/intern/freetypefont.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_decimate.c
source/blender/collada/AnimationImporter.h
source/blender/collada/DocumentExporter.h
source/blender/quicktime/apple/qtkit_export.m
source/blender/quicktime/apple/qtkit_import.m
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/imagetexture.c
source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
source/gameengine/Ketsji/KX_NavMeshObject.cpp
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp

index 130c08ec3694f1edcdf573e2d17039f71b706951..b52da597675cf3c67d035c2b49ba5bfe1c93d6ea 100644 (file)
@@ -1015,7 +1015,7 @@ bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompa
                maxhh = rcMax(maxhh, ymax-ymin);
        }
        
-       hp.data = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxhw*maxhh, RC_ALLOC_TEMP);
+       hp.data = (unsigned short *)rcAlloc(sizeof(unsigned short)*maxhw*maxhh, RC_ALLOC_TEMP);
        if (!hp.data)
        {
                ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'hp.data' (%d).", maxhw*maxhh);
index 359f3ab73a90d11b4f8b15d2f45b9aee827e7a60..30433451ac2bdcfb54fefa94f3e90088816ee682 100644 (file)
@@ -385,7 +385,7 @@ static void lms_to_xyz(double l, double m, double s, double* x, double *y, doubl
        *z = s;
 }
 
-void spectrum(double t1, double t2, int N, unsigned chard)
+void spectrum(double t1, double t2, int N, unsigned char *d)
 {
        int i,j,dj;
        double X,Y,Z,R,G,B,L,M,S, Lw, Mw, Sw;
index 9edd9ad887c508372a5062cf7805fb365859a536..3ffd41f95170a1613f5a38348040b11a439bb5fd 100644 (file)
@@ -1,6 +1,6 @@
 #ifndef __SPECTRUM_H
 #define __SPECTRUM_H
 
-void spectrum(double t1, double t2, int n, unsigned chard);
+void spectrum(double t1, double t2, int n, unsigned char *d);
 
 #endif
index 0af96d14d6fe7ecb605e70bc9aaf2c1503362124..99ca6c64e80f409e9cc0e1a3d84b969b3f4e0bf3 100644 (file)
@@ -382,7 +382,7 @@ HRESULT __stdcall VF_ReadDataFunc_Blen(
 
        my_gets(s_in, buf, 256); /* 255 */
 
-       framebuf = (unsigned char*) v->lpData;
+       framebuf = (unsigned char *) v->lpData;
 
        for (y = 0; y < height; y++) {
                unsigned char *p = framebuf + v->lPitch * y;
index 154c8cca75d0f97dda0c56248adb1e2a8f08315d..af8bfd048366a2cd4665ed0ff2ad013335d78905 100644 (file)
@@ -973,8 +973,8 @@ static void *distribute_threads_exec_cb(void *data)
 static int *COMPARE_ORIG_INDEX = NULL;
 static int distribute_compare_orig_index(const void *p1, const void *p2)
 {
-       int index1 = COMPARE_ORIG_INDEX[*(const int*)p1];
-       int index2 = COMPARE_ORIG_INDEX[*(const int*)p2];
+       int index1 = COMPARE_ORIG_INDEX[*(const int *)p1];
+       int index2 = COMPARE_ORIG_INDEX[*(const int *)p2];
 
        if (index1 < index2)
                return -1;
index 84301972ddf3286852d5c87c29bae2698cb90f37..d1b1d99439aac5bc09265104529243192686cdae 100644 (file)
@@ -705,25 +705,25 @@ static int ptcache_smoke_read(PTCacheFile *pf, void *smoke_v)
                smoke_export(sds->fluid, &dt, &dx, &dens, &react, &flame, &fuel, &heat, &heatold, &vx, &vy, &vz, &r, &g, &b, &obstacles);
 
                ptcache_file_compressed_read(pf, (unsigned char *)sds->shadow, out_len);
-               ptcache_file_compressed_read(pf, (unsigned char*)dens, out_len);
+               ptcache_file_compressed_read(pf, (unsigned char *)dens, out_len);
                if (cache_fields & SM_ACTIVE_HEAT) {
-                       ptcache_file_compressed_read(pf, (unsigned char*)heat, out_len);
-                       ptcache_file_compressed_read(pf, (unsigned char*)heatold, out_len);
+                       ptcache_file_compressed_read(pf, (unsigned char *)heat, out_len);
+                       ptcache_file_compressed_read(pf, (unsigned char *)heatold, out_len);
                }
                if (cache_fields & SM_ACTIVE_FIRE) {
-                       ptcache_file_compressed_read(pf, (unsigned char*)flame, out_len);
-                       ptcache_file_compressed_read(pf, (unsigned char*)fuel, out_len);
-                       ptcache_file_compressed_read(pf, (unsigned char*)react, out_len);
+                       ptcache_file_compressed_read(pf, (unsigned char *)flame, out_len);
+                       ptcache_file_compressed_read(pf, (unsigned char *)fuel, out_len);
+                       ptcache_file_compressed_read(pf, (unsigned char *)react, out_len);
                }
                if (cache_fields & SM_ACTIVE_COLORS) {
-                       ptcache_file_compressed_read(pf, (unsigned char*)r, out_len);
-                       ptcache_file_compressed_read(pf, (unsigned char*)g, out_len);
-                       ptcache_file_compressed_read(pf, (unsigned char*)b, out_len);
-               }
-               ptcache_file_compressed_read(pf, (unsigned char*)vx, out_len);
-               ptcache_file_compressed_read(pf, (unsigned char*)vy, out_len);
-               ptcache_file_compressed_read(pf, (unsigned char*)vz, out_len);
-               ptcache_file_compressed_read(pf, (unsigned char*)obstacles, (unsigned int)res);
+                       ptcache_file_compressed_read(pf, (unsigned char *)r, out_len);
+                       ptcache_file_compressed_read(pf, (unsigned char *)g, out_len);
+                       ptcache_file_compressed_read(pf, (unsigned char *)b, out_len);
+               }
+               ptcache_file_compressed_read(pf, (unsigned char *)vx, out_len);
+               ptcache_file_compressed_read(pf, (unsigned char *)vy, out_len);
+               ptcache_file_compressed_read(pf, (unsigned char *)vz, out_len);
+               ptcache_file_compressed_read(pf, (unsigned char *)obstacles, (unsigned int)res);
                ptcache_file_read(pf, &dt, 1, sizeof(float));
                ptcache_file_read(pf, &dx, 1, sizeof(float));
                ptcache_file_read(pf, &sds->p0, 3, sizeof(float));
@@ -751,20 +751,20 @@ static int ptcache_smoke_read(PTCacheFile *pf, void *smoke_v)
 
                        smoke_turbulence_export(sds->wt, &dens, &react, &flame, &fuel, &r, &g, &b, &tcu, &tcv, &tcw);
 
-                       ptcache_file_compressed_read(pf, (unsigned char*)dens, out_len_big);
+                       ptcache_file_compressed_read(pf, (unsigned char *)dens, out_len_big);
                        if (cache_fields & SM_ACTIVE_FIRE) {
-                               ptcache_file_compressed_read(pf, (unsigned char*)flame, out_len_big);
-                               ptcache_file_compressed_read(pf, (unsigned char*)fuel, out_len_big);
+                               ptcache_file_compressed_read(pf, (unsigned char *)flame, out_len_big);
+                               ptcache_file_compressed_read(pf, (unsigned char *)fuel, out_len_big);
                        }
                        if (cache_fields & SM_ACTIVE_COLORS) {
-                               ptcache_file_compressed_read(pf, (unsigned char*)r, out_len_big);
-                               ptcache_file_compressed_read(pf, (unsigned char*)g, out_len_big);
-                               ptcache_file_compressed_read(pf, (unsigned char*)b, out_len_big);
+                               ptcache_file_compressed_read(pf, (unsigned char *)r, out_len_big);
+                               ptcache_file_compressed_read(pf, (unsigned char *)g, out_len_big);
+                               ptcache_file_compressed_read(pf, (unsigned char *)b, out_len_big);
                        }
 
-                       ptcache_file_compressed_read(pf, (unsigned char*)tcu, out_len);
-                       ptcache_file_compressed_read(pf, (unsigned char*)tcv, out_len);
-                       ptcache_file_compressed_read(pf, (unsigned char*)tcw, out_len);
+                       ptcache_file_compressed_read(pf, (unsigned char *)tcu, out_len);
+                       ptcache_file_compressed_read(pf, (unsigned char *)tcv, out_len);
+                       ptcache_file_compressed_read(pf, (unsigned char *)tcw, out_len);
                }
 
        return 1;
@@ -859,7 +859,7 @@ static int ptcache_dynamicpaint_read(PTCacheFile *pf, void *dp_v)
                        return 0;
                }
 
-               ptcache_file_compressed_read(pf, (unsigned char*)surface->data->type_data, data_len*surface->data->total_points);
+               ptcache_file_compressed_read(pf, (unsigned char *)surface->data->type_data, data_len*surface->data->total_points);
 
        }
        return 1;
@@ -1699,7 +1699,7 @@ static PTCacheMem *ptcache_disk_frame_to_mem(PTCacheID *pid, int cfra)
                        for (i=0; i<BPHYS_TOT_DATA; i++) {
                                unsigned int out_len = pm->totpoint*ptcache_data_size[i];
                                if (pf->data_types & (1<<i))
-                                       ptcache_file_compressed_read(pf, (unsigned char*)(pm->data[i]), out_len);
+                                       ptcache_file_compressed_read(pf, (unsigned char *)(pm->data[i]), out_len);
                        }
                }
                else {
@@ -1730,7 +1730,7 @@ static PTCacheMem *ptcache_disk_frame_to_mem(PTCacheID *pid, int cfra)
                        extra->data = MEM_callocN(extra->totdata * ptcache_extra_datasize[extra->type], "Pointcache extradata->data");
 
                        if (pf->flag & PTCACHE_TYPEFLAG_COMPRESS)
-                               ptcache_file_compressed_read(pf, (unsigned char*)(extra->data), extra->totdata*ptcache_extra_datasize[extra->type]);
+                               ptcache_file_compressed_read(pf, (unsigned char *)(extra->data), extra->totdata*ptcache_extra_datasize[extra->type]);
                        else
                                ptcache_file_read(pf, extra->data, extra->totdata, ptcache_extra_datasize[extra->type]);
 
@@ -1787,7 +1787,7 @@ static int ptcache_mem_frame_to_disk(PTCacheID *pid, PTCacheMem *pm)
                                if (pm->data[i]) {
                                        unsigned int in_len = pm->totpoint*ptcache_data_size[i];
                                        unsigned char *out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len)*4, "pointcache_lzo_buffer");
-                                       ptcache_file_compressed_write(pf, (unsigned char*)(pm->data[i]), in_len, out, pid->cache->compression);
+                                       ptcache_file_compressed_write(pf, (unsigned char *)(pm->data[i]), in_len, out, pid->cache->compression);
                                        MEM_freeN(out);
                                }
                        }
@@ -1820,7 +1820,7 @@ static int ptcache_mem_frame_to_disk(PTCacheID *pid, PTCacheMem *pm)
                        if (pid->cache->compression) {
                                unsigned int in_len = extra->totdata * ptcache_extra_datasize[extra->type];
                                unsigned char *out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len)*4, "pointcache_lzo_buffer");
-                               ptcache_file_compressed_write(pf, (unsigned char*)(extra->data), in_len, out, pid->cache->compression);
+                               ptcache_file_compressed_write(pf, (unsigned char *)(extra->data), in_len, out, pid->cache->compression);
                                MEM_freeN(out);
                        }
                        else {
index 33519483843b9890e08859486f23880e6e5593e9..22b5c180259303c2857d401e6c00aadb575d4ae5 100644 (file)
@@ -62,14 +62,14 @@ static void slice_get_byte_buffers(const SeqRenderData *context, const ImBuf *ib
 {
        int offset = 4 * start_line * context->rectx;
 
-       *rect1 = (unsigned char*) ibuf1->rect + offset;
-       *rect_out = (unsigned char*) out->rect + offset;
+       *rect1 = (unsigned char *)ibuf1->rect + offset;
+       *rect_out = (unsigned char *)out->rect + offset;
 
        if (ibuf2)
-               *rect2 = (unsigned char*) ibuf2->rect + offset;
+               *rect2 = (unsigned char *)ibuf2->rect + offset;
 
        if (ibuf3)
-               *rect3 = (unsigned char*) ibuf3->rect + offset;
+               *rect3 = (unsigned char *)ibuf3->rect + offset;
 }
 
 static void slice_get_float_buffers(const SeqRenderData *context, const ImBuf *ibuf1, const ImBuf *ibuf2,
index a6b1943cb4d3ff17493d92004b10705beafe94c5..892afdd0b27385eac86bd0ed49c6b54b89e5ca5b 100644 (file)
@@ -103,7 +103,7 @@ void BLI_scanfill_end(ScanFillContext *sf_ctx);
 /* These callbacks are needed to make the lib finction properly */
 
 /**
- * Set a function taking a char* as argument to flag errors. If the
+ * Set a function taking a (char *) as argument to flag errors. If the
  * callback is not set, the error is discarded.
  * \param f The function to use as callback
  * \attention used in creator.c
index daedd39d693c3f16aeeab85f291a214cb120ac0f..51e4ab0f47a2ad2cf7d7284cac03613790bf6df7 100644 (file)
@@ -521,13 +521,13 @@ int BLI_vfontchar_from_freetypefont(VFont *vfont, unsigned long character)
 // Freetype2 Outline struct
 
 typedef struct  FT_Outline_
-  {
+{
        short       n_contours;      /* number of contours in glyph        */
        short       n_points;        /* number of points in the glyph      */
 
-       FT_Vector*  points;          /* the outline's points               */
-       char*       tags;            /* the points flags                   */
-       short*      contours;        /* the contour end points             */
+       FT_Vector  *points;          /* the outline's points               */
+       char       *tags;            /* the points flags                   */
+       short      *contours;        /* the contour end points             */
 
        int         flags;           /* outline masks                      */
 } FT_Outline;
index ea0a711788ebe0af0ee4b156166a554715dc49ed..42c90a6c0e5b0b467f67a23d48ef8fd30eecf693 100644 (file)
@@ -818,7 +818,7 @@ static void decode_blender_header(FileData *fd)
                        /* is the file saved in a different endian
                         * than we need ?
                         */
-                       if (((((char*)&remove_this_endian_test)[0]==1)?L_ENDIAN:B_ENDIAN) != ((header[8]=='v')?L_ENDIAN:B_ENDIAN)) {
+                       if (((((char *)&remove_this_endian_test)[0] == 1) ? L_ENDIAN : B_ENDIAN) != ((header[8] == 'v') ? L_ENDIAN : B_ENDIAN)) {
                                fd->flags |= FD_FLAGS_SWITCH_ENDIAN;
                        }
                        
@@ -940,7 +940,7 @@ static int fd_read_from_memfile(FileData *filedata, void *buffer, unsigned int s
                        if (chunkoffset+readsize > chunk->size)
                                readsize= chunk->size-chunkoffset;
                        
-                       memcpy((char*)buffer + totread, chunk->buf + chunkoffset, readsize);
+                       memcpy((char *)buffer + totread, chunk->buf + chunkoffset, readsize);
                        totread += readsize;
                        filedata->seek += readsize;
                        seek += readsize;
index d8333e7c8f410b10edc0dbd2f08c791c1d711b59..8a56e3c2ab86918e816cc905d28fa192a40882a6 100644 (file)
@@ -1237,7 +1237,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
                                        TFace *tf = &((TFace*) me->tface)[i];
 
                                        for (j = 0; j < 4; j++) {
-                                               char *col = (char*) &tf->col[j];
+                                               char *col = (char *) &tf->col[j];
 
                                                col[0] = 255;
                                        }
index 274762679fee9c658e484fd80f8a36b9f8ccd5b0..281cc4d01c3e7a7282803689737f4431592f1dcf 100644 (file)
@@ -1241,7 +1241,7 @@ static void write_constraints(WriteData *wd, ListBase *conlist)
                                        break;
                                case CONSTRAINT_TYPE_SPLINEIK: 
                                {
-                                       bSplineIKConstraint *data= (bSplineIKConstraint*)con->data;
+                                       bSplineIKConstraint *data = (bSplineIKConstraint *)con->data;
                                        
                                        /* write points array */
                                        writedata(wd, DATA, sizeof(float)*(data->numpoints), data->points);
index 81edc727ad3b5aa581655e0b80eb13d27d52f43a..9847d6dcffa56b22b9c69e2aec5324591ffa5513 100644 (file)
@@ -401,8 +401,8 @@ static void bm_edge_collapse_loop_customdata(BMesh *bm, BMLoop *l, BMVert *v_cle
                        /* ok. we have a loop. now be smart with it! */
                        for (i = 0; i < bm->ldata.totlayer; i++) {
                                if (CustomData_layer_has_math(&bm->ldata, i)) {
-                                       int offset = bm->ldata.layers[i].offset;
-                                       int type = bm->ldata.layers[i].type;
+                                       const int offset = bm->ldata.layers[i].offset;
+                                       const int type = bm->ldata.layers[i].type;
                                        void *cd_src, *cd_iter;
 
                                        /* todo, make nicer macros for this */
@@ -423,14 +423,6 @@ static void bm_edge_collapse_loop_customdata(BMesh *bm, BMLoop *l, BMVert *v_cle
                        }
                }
        }
-
-       /* first walk around the fan until we hit a seam */
-
-
-
-       /* last, interpolate ourselves */
-
-
 }
 #endif  /* USE_CUSTOMDATA */
 
@@ -661,7 +653,6 @@ static void bm_decim_edge_collapse(BMesh *bm, BMEdge *e,
 
                                bm_decim_build_edge_cost_single(e_iter, vquadrics, eheap, eheap_table);
                        } while ((e_iter = bmesh_disk_edge_next(e_iter, v)) != e_first);
-
                }
        }
 }
index db61692484b3b39a9a1dfcb3a161d61c45b69072..293b992f219fdd132f2059999e8d93a3a2b4d43a 100644 (file)
@@ -169,7 +169,7 @@ public:
 
        int setAnimType ( const COLLADAFW::Animatable * prop, int type, int addition);
        
-       void modify_fcurve(std::vector<FCurve*>* curves, const charrna_path, int array_index );
+       void modify_fcurve(std::vector<FCurve*>* curves, const char *rna_path, int array_index );
        void unused_fcurve(std::vector<FCurve*>* curves );
        // prerequisites:
        // animlist_map - map animlist id -> animlist
index 05620087d76afbc2ef494021206e33e22be7faad..84c0610282ea09118399d6117de91103a9da5017 100644 (file)
@@ -40,7 +40,7 @@ class DocumentExporter
  public:
        DocumentExporter(const ExportSettings *export_settings);
        void exportCurrentScene(Scene *sce);
-       void exportScenes(const charfilename);
+       void exportScenes(const char *filename);
 private:
        const ExportSettings *export_settings;
 };
index bb87fe21c49f5fdb79f6f8ec716ae0c6f80e65db..7b2e03ded6e8927f8c08dfa3c7f40f42598e86a9 100644 (file)
@@ -212,7 +212,7 @@ static NSString *stringWithCodecType(int codecType)
 {
        char str[5];
        
-       *((int*)str) = EndianU32_NtoB(codecType);
+       *((int *)str) = EndianU32_NtoB(codecType);
        str[4] = 0;
        
        return [NSString stringWithCString:str encoding:NSASCIIStringEncoding];
@@ -624,8 +624,8 @@ int append_qt(struct RenderData *rd, int start_frame, int frame, int *pixels, in
                return 0;
        }
        
-       from_Ptr = (unsigned char*)pixels;
-       to_Ptr = (unsigned char*)[blBitmapFormatImage bitmapData];
+       from_Ptr = (unsigned char *)pixels;
+       to_Ptr = (unsigned char *)[blBitmapFormatImage bitmapData];
        for (y = 0; y < recty; y++) {
                to_i = (recty-y-1)*rectx;
                from_i = y*rectx;
index 75b9056de1b0c2cd2f58800f657dafd0a41e4f28..090c938fd7cc030e80ef5e2d215c80712ac0cbd6 100644 (file)
@@ -172,8 +172,8 @@ static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height)
        if (([bitmapImage bitsPerPixel] == 32) && (([bitmapImage bitmapFormat] & 0x5) == 0)
                && ![bitmapImage isPlanar]) {
                /* Try a fast copy if the image is a meshed RGBA 32bit bitmap*/
-               toIBuf = (uchar*)ibuf->rect;
-               rasterRGB = (uchar*)[bitmapImage bitmapData];
+               toIBuf = (uchar *)ibuf->rect;
+               rasterRGB = (uchar *)[bitmapImage bitmapData];
                for (y = 0; y < height; y++) {
                        to_i = (height-y-1)*width;
                        from_i = y*width;
@@ -207,7 +207,7 @@ static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height)
                [bitmapImage draw];
                [NSGraphicsContext restoreGraphicsState];
                
-               rasterRGB = (uchar*)[blBitmapFormatImageRGB bitmapData];
+               rasterRGB = (uchar *)[blBitmapFormatImageRGB bitmapData];
                if (rasterRGB == NULL) {
                        [blBitmapFormatImageRGB release];
                        return NULL;
@@ -228,7 +228,7 @@ static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height)
                [bitmapImage draw];
                [NSGraphicsContext restoreGraphicsState];
                
-               rasterRGBA = (uchar*)[blBitmapFormatImageRGBA bitmapData];
+               rasterRGBA = (uchar *)[blBitmapFormatImageRGBA bitmapData];
                if (rasterRGBA == NULL) {
                        [blBitmapFormatImageRGB release];
                        [blBitmapFormatImageRGBA release];
@@ -236,7 +236,7 @@ static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height)
                }
 
                /*Copy the image to ibuf, flipping it vertically*/
-               toIBuf = (uchar*)ibuf->rect;
+               toIBuf = (uchar *)ibuf->rect;
                for (y = 0; y < height; y++) {
                        for (x = 0; x < width; x++) {
                                to_i = (height-y-1)*width + x;
@@ -486,7 +486,7 @@ ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags)
                [bitmapImage draw];
                [NSGraphicsContext restoreGraphicsState];
                
-               rasterRGB = (uchar*)[blBitmapFormatImageRGB bitmapData];
+               rasterRGB = (uchar *)[blBitmapFormatImageRGB bitmapData];
                if (rasterRGB == NULL) {
                        [bitmapImage release];
                        [blBitmapFormatImageRGB release];
@@ -509,7 +509,7 @@ ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags)
                [bitmapImage draw];
                [NSGraphicsContext restoreGraphicsState];
                
-               rasterRGBA = (uchar*)[blBitmapFormatImageRGBA bitmapData];
+               rasterRGBA = (uchar *)[blBitmapFormatImageRGBA bitmapData];
                if (rasterRGBA == NULL) {
                        [bitmapImage release];
                        [blBitmapFormatImageRGB release];
@@ -519,7 +519,7 @@ ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags)
                }
                
                /*Copy the image to ibuf, flipping it vertically*/
-               toIBuf = (uchar*)ibuf->rect;
+               toIBuf = (uchar *)ibuf->rect;
                for (x = 0; x < bitmapSize.width; x++) {
                        for (y = 0; y < bitmapSize.height; y++) {
                                to_i = (bitmapSize.height-y-1)*bitmapSize.width + x;
index c7a8bfeec1d7984d0e680947b46897742fa3ad96..a29994a430d8da5b275a6271eb3029fbdf9301e6 100644 (file)
@@ -235,7 +235,7 @@ void RE_MergeFullSample(struct Render *re, struct Main *bmain, struct Scene *sce
 
 /* ancient stars function... go away! */
 void RE_make_stars(struct Render *re, struct Scene *scenev3d, void (*initfunc)(void),
-                   void (*vertexfunc)(float*),  void (*termfunc)(void));
+                   void (*vertexfunc)(float *),  void (*termfunc)(void));
 
 /* display and event callbacks */
 void RE_display_init_cb        (struct Render *re, void *handle, void (*f)(void *handle, RenderResult *rr));
index f23bc44d21f9346409b64b7b68a390d5049ddf56..50d2515169b1a7557f6688858e83acc1a0422027 100644 (file)
@@ -156,7 +156,7 @@ static HaloRen *initstar(Render *re, ObjectRen *obr, const float vec[3], float h
  */
 
 void RE_make_stars(Render *re, Scene *scenev3d, void (*initfunc)(void),
-                                  void (*vertexfunc)(float*),  void (*termfunc)(void))
+                   void (*vertexfunc)(float*),  void (*termfunc)(void))
 {
        extern unsigned char hash[512];
        ObjectRen *obr= NULL;
@@ -5336,7 +5336,7 @@ static float *calculate_strandsurface_speedvectors(Render *re, ObjectInstanceRen
                        calculate_speedvector(vec, 1, winsq, winroot, mesh->co[a], ho, winspeed[a]);
                }
 
-               return (float*)winspeed;
+               return (float *)winspeed;
        }
 
        return NULL;
index 154292a3065109d900e587be2119dc696c2941f3..e491b00ae854088f7c7f61116d6b114f6abdecca 100644 (file)
@@ -693,7 +693,7 @@ static int ibuf_get_color_clip(float col[4], ImBuf *ibuf, int x, int y, int extf
                }
        }
        else {
-               char* rect = (char*)(ibuf->rect + x + y*ibuf->x);
+               char *rect = (char *)(ibuf->rect + x + y*ibuf->x);
                col[0] = rect[0]*(1.f/255.f);
                col[1] = rect[1]*(1.f/255.f);
                col[2] = rect[2]*(1.f/255.f);
index 1afa5d3d07b6c68dc9479167f40dc0baa147d9f5..346d2017ef06c4103ed190d4b550905b50307e4a 100644 (file)
@@ -46,7 +46,7 @@ m_frame_rect(rect)
        m_area_left = ar->winrct.xmin;
        m_area_top = ar->winrct.ymax;
 
-       glGetIntegerv(GL_VIEWPORT, (GLint*)m_viewport);
+       glGetIntegerv(GL_VIEWPORT, (GLint *)m_viewport);
 }
 
 KX_BlenderCanvas::~KX_BlenderCanvas()
index 85b76d7c676bcd917de750c190c8b96cc34153e9..96cc84879c16948a6ea6715954045b1aa7cfc76e 100644 (file)
@@ -58,7 +58,7 @@ unsigned int KX_BlenderRenderTools::m_numgllights;
 
 KX_BlenderRenderTools::KX_BlenderRenderTools()
 {
-       glGetIntegerv(GL_MAX_LIGHTS, (GLint*) &m_numgllights);
+       glGetIntegerv(GL_MAX_LIGHTS, (GLint *) &m_numgllights);
        if (m_numgllights < 8)
                m_numgllights = 8;
 }
index a05292f268ab46a1d46004c2b0c6d27b8d769a1a..b722c660d65e7acb92440d0fe6ae7704e71c28b6 100644 (file)
@@ -249,7 +249,7 @@ bool KX_NavMeshObject::BuildVertIndArrays(float *&vertices, int& nverts,
                }
 
                //create tris
-               polys = (unsigned short*)MEM_callocN(sizeof(unsigned short)*3*2*npolys, "BuildVertIndArrays polys");
+               polys = (unsigned short *)MEM_callocN(sizeof(unsigned short)*3*2*npolys, "BuildVertIndArrays polys");
                memset(polys, 0xff, sizeof(unsigned short)*3*2*npolys);
                unsigned short *poly = polys;
                RAS_Polygon* raspoly;
index 82a60e756d71098786eb50f67e5e333a110254ed..6ba03606bf229941c7f0bb339aaba2db8051766a 100644 (file)
@@ -1078,7 +1078,7 @@ static bool GetHitTriangle(btCollisionShape* shape, CcdShapeConstructionInfo* sh
        const btVector3& meshScaling = shape->getLocalScaling();
        for (int j=2;j>=0;j--)
        {
-               int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
+               int graphicsindex = (indicestype == PHY_SHORT) ? ((unsigned short *)gfxbase)[j] : gfxbase[j];
 
                btScalar* graphicsbase = (btScalar*)(vertexbase+graphicsindex*stride);