diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-01 15:26:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-01 15:42:28 +0300 |
commit | aab4f2b76253936d1ba09562f1b1a21661860bf7 (patch) | |
tree | e558b355cd2fc153c8e5d1ef94963eb1f18454f7 /source/blender/blenkernel | |
parent | 4bdd4aa63371bdd73f3a9484f92348f1bf13b4e5 (diff) |
cleanup: redundant casts & const cast correctness
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_idprop.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 9 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/nla.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 9 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/seqcache.c | 8 |
9 files changed, 28 insertions, 26 deletions
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index f33f3eba590..5b10d7ebc06 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -40,7 +40,7 @@ typedef union IDPropertyTemplate { float f; double d; struct { - char *str; + const char *str; int len; char subtype; } string; @@ -51,7 +51,7 @@ typedef union IDPropertyTemplate { } array; struct { int matvec_size; - float *example; + const float *example; } matrix_or_vector; } IDPropertyTemplate; diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index c1173cb2391..b066d537fdf 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -450,9 +450,9 @@ bPoseChannel *BKE_pose_channel_find_name(const bPose *pose, const char *name) return NULL; if (pose->chanhash) - return BLI_ghash_lookup(pose->chanhash, (void *)name); + return BLI_ghash_lookup(pose->chanhash, (const void *)name); - return BLI_findstring(&((bPose *)pose)->chanbase, name, offsetof(bPoseChannel, name)); + return BLI_findstring(&((const bPose *)pose)->chanbase, name, offsetof(bPoseChannel, name)); } /** diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 6ac85695570..a1bf255c239 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1052,7 +1052,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, } else { GPUBuffer *buffer = NULL; - const char *varray = NULL; + char *varray = NULL; int numdata = 0, elementsize = 0, offset; int start = 0, numfaces = 0 /* , prevdraw = 0 */ /* UNUSED */, curface = 0; int i; diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 68fc6e68ef2..b47d9d06132 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -1560,7 +1560,8 @@ static void *emDM_getTessFaceDataArray(DerivedMesh *dm, int type) if (type == CD_MTFACE || type == CD_MCOL) { const int type_from = (type == CD_MTFACE) ? CD_MTEXPOLY : CD_MLOOPCOL; int index; - const char *data, *bmdata; + const char *bmdata; + char *data; index = CustomData_get_layer_index(&bm->pdata, type_from); if (index != -1) { @@ -1585,11 +1586,11 @@ static void *emDM_getTessFaceDataArray(DerivedMesh *dm, int type) // bmdata = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); bmdata = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset); - ME_MTEXFACE_CPY(((MTFace *)data), ((MTexPoly *)bmdata)); + ME_MTEXFACE_CPY(((MTFace *)data), ((const MTexPoly *)bmdata)); for (j = 0; j < 3; j++) { // bmdata = CustomData_bmesh_get(&bm->ldata, looptris[i][j]->head.data, CD_MLOOPUV); bmdata = BM_ELEM_CD_GET_VOID_P(looptris[i][j], cd_loop_uv_offset); - copy_v2_v2(((MTFace *)data)->uv[j], ((MLoopUV *)bmdata)->uv); + copy_v2_v2(((MTFace *)data)->uv[j], ((const MLoopUV *)bmdata)->uv); } } } @@ -1599,7 +1600,7 @@ static void *emDM_getTessFaceDataArray(DerivedMesh *dm, int type) for (j = 0; j < 3; j++) { // bmdata = CustomData_bmesh_get(&bm->ldata, looptris[i][j]->head.data, CD_MLOOPCOL); bmdata = BM_ELEM_CD_GET_VOID_P(looptris[i][j], cd_loop_color_offset); - MESH_MLOOPCOL_TO_MCOL(((MLoopCol *)bmdata), (((MCol *)data) + j)); + MESH_MLOOPCOL_TO_MCOL(((const MLoopCol *)bmdata), (((MCol *)data) + j)); } } } diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 36cd7e69601..bb68f963c2e 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -117,21 +117,21 @@ typedef struct ImageCacheKey { static unsigned int imagecache_hashhash(const void *key_v) { - const ImageCacheKey *key = (ImageCacheKey *) key_v; + const ImageCacheKey *key = key_v; return key->index; } static bool imagecache_hashcmp(const void *a_v, const void *b_v) { - const ImageCacheKey *a = (ImageCacheKey *) a_v; - const ImageCacheKey *b = (ImageCacheKey *) b_v; + const ImageCacheKey *a = a_v; + const ImageCacheKey *b = b_v; return (a->index != b->index); } static void imagecache_keydata(void *userkey, int *framenr, int *proxy, int *render_flags) { - ImageCacheKey *key = (ImageCacheKey *)userkey; + ImageCacheKey *key = userkey; *framenr = IMA_INDEX_FRAME(key->index); *proxy = IMB_PROXY_NONE; diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 0e9a7ce45cf..fe38fedd7aa 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -388,7 +388,7 @@ static int user_frame_to_cache_frame(MovieClip *clip, int framenr) static void moviecache_keydata(void *userkey, int *framenr, int *proxy, int *render_flags) { - MovieClipImBufCacheKey *key = (MovieClipImBufCacheKey *)userkey; + const MovieClipImBufCacheKey *key = userkey; *framenr = key->framenr; *proxy = key->proxy; @@ -397,7 +397,7 @@ static void moviecache_keydata(void *userkey, int *framenr, int *proxy, int *ren static unsigned int moviecache_hashhash(const void *keyv) { - MovieClipImBufCacheKey *key = (MovieClipImBufCacheKey *)keyv; + const MovieClipImBufCacheKey *key = keyv; int rval = key->framenr; return rval; @@ -405,8 +405,8 @@ static unsigned int moviecache_hashhash(const void *keyv) static bool moviecache_hashcmp(const void *av, const void *bv) { - const MovieClipImBufCacheKey *a = (MovieClipImBufCacheKey *)av; - const MovieClipImBufCacheKey *b = (MovieClipImBufCacheKey *)bv; + const MovieClipImBufCacheKey *a = av; + const MovieClipImBufCacheKey *b = bv; return ((a->framenr != b->framenr) || (a->proxy != b->proxy) || diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index b4d63f8053b..8e9f86d7c19 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -1326,7 +1326,7 @@ void BKE_nlastrip_validate_fcurves(NlaStrip *strip) static bool nla_editbone_name_check(void *arg, const char *name) { - return BLI_ghash_haskey((GHash *)arg, (void *)name); + return BLI_ghash_haskey((GHash *)arg, (const void *)name); } /* Find (and set) a unique name for a strip from the whole AnimData block diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index d577293fccb..7c9e28afb3c 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1568,12 +1568,13 @@ void psys_interpolate_uvs(const MTFace *tface, int quad, const float w[4], float void psys_interpolate_mcol(const MCol *mcol, int quad, const float w[4], MCol *mc) { - char *cp, *cp1, *cp2, *cp3, *cp4; + const char *cp1, *cp2, *cp3, *cp4; + char *cp; cp = (char *)mc; - cp1 = (char *)&mcol[0]; - cp2 = (char *)&mcol[1]; - cp3 = (char *)&mcol[2]; + cp1 = (const char *)&mcol[0]; + cp2 = (const char *)&mcol[1]; + cp3 = (const char *)&mcol[2]; if (quad) { cp4 = (char *)&mcol[3]; diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index 4268b33cb14..a1135bfc54b 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -95,10 +95,10 @@ static unsigned int seq_hash_render_data(const SeqRenderData *a) static unsigned int seqcache_hashhash(const void *key_) { - const SeqCacheKey *key = (SeqCacheKey *) key_; + const SeqCacheKey *key = key_; unsigned int rval = seq_hash_render_data(&key->context); - rval ^= *(unsigned int *) &key->cfra; + rval ^= *(const unsigned int *) &key->cfra; rval += key->type; rval ^= ((intptr_t) key->seq) << 6; @@ -107,8 +107,8 @@ static unsigned int seqcache_hashhash(const void *key_) static bool seqcache_hashcmp(const void *a_, const void *b_) { - const SeqCacheKey *a = (SeqCacheKey *) a_; - const SeqCacheKey *b = (SeqCacheKey *) b_; + const SeqCacheKey *a = a_; + const SeqCacheKey *b = b_; return ((a->seq != b->seq) || (a->cfra != b->cfra) || |