From aab4f2b76253936d1ba09562f1b1a21661860bf7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 1 Jan 2015 23:26:03 +1100 Subject: cleanup: redundant casts & const cast correctness --- source/blender/blenkernel/BKE_idprop.h | 4 +-- source/blender/blenkernel/intern/action.c | 4 +-- source/blender/blenkernel/intern/cdderivedmesh.c | 2 +- source/blender/blenkernel/intern/editderivedmesh.c | 9 +++--- source/blender/blenkernel/intern/image.c | 8 +++--- source/blender/blenkernel/intern/movieclip.c | 8 +++--- source/blender/blenkernel/intern/nla.c | 2 +- source/blender/blenkernel/intern/particle.c | 9 +++--- source/blender/blenkernel/intern/seqcache.c | 8 +++--- source/blender/blenlib/intern/boxpack2d.c | 4 +-- source/blender/blenlib/intern/fileops.c | 8 +++--- source/blender/blenlib/intern/hash_mm2a.c | 2 +- source/blender/blenlib/intern/scanfill_utils.c | 4 +-- source/blender/blenlib/intern/string_utf8.c | 6 ++-- source/blender/blenloader/intern/readfile.c | 6 ++-- source/blender/blenloader/intern/writefile.c | 2 +- source/blender/bmesh/intern/bmesh_queries.c | 10 +++---- source/blender/bmesh/intern/bmesh_queries.h | 8 +++--- source/blender/bmesh/operators/bmo_removedoubles.c | 2 +- source/blender/datatoc/datatoc_icon.c | 3 +- .../editors/animation/anim_channels_defines.c | 2 +- source/blender/editors/armature/pose_group.c | 4 +-- source/blender/editors/curve/editfont.c | 4 +-- source/blender/editors/include/ED_anim_api.h | 2 +- source/blender/editors/interface/interface_icons.c | 12 ++++---- .../blender/editors/interface/interface_intern.h | 2 +- .../blender/editors/interface/interface_layout.c | 6 ++-- .../editors/interface/interface_templates.c | 2 +- source/blender/editors/interface/resources.c | 2 +- source/blender/editors/interface/view2d.c | 4 +-- source/blender/editors/mesh/editmesh_knife.c | 4 +-- source/blender/editors/mesh/editmesh_select.c | 4 +-- source/blender/editors/sculpt_paint/sculpt_uv.c | 6 ++-- source/blender/editors/space_nla/nla_draw.c | 2 +- source/blender/editors/space_nla/nla_intern.h | 2 +- source/blender/editors/space_nla/space_nla.c | 2 +- source/blender/editors/space_node/node_add.c | 9 +++--- .../editors/space_sequencer/sequencer_scopes.c | 32 +++++++++++----------- .../blender/editors/uvedit/uvedit_parametrizer.c | 4 +-- .../blender/editors/uvedit/uvedit_smart_stitch.c | 11 ++++---- source/blender/gpu/intern/gpu_codegen.c | 2 +- source/blender/imbuf/intern/cineon/cineonlib.c | 2 +- source/blender/imbuf/intern/cineon/dpxlib.c | 2 +- source/blender/imbuf/intern/colormanagement.c | 6 ++-- source/blender/imbuf/intern/moviecache.c | 12 ++++---- source/blender/makesdna/intern/makesdna.c | 2 +- source/blender/makesrna/intern/rna_access.c | 6 ++-- source/blender/makesrna/intern/rna_object.c | 2 +- source/blender/makesrna/intern/rna_pose.c | 2 +- source/blender/modifiers/intern/MOD_array.c | 4 +-- .../blender/python/bmesh/bmesh_py_types_meshdata.c | 2 +- .../blender/python/generic/bpy_internal_import.c | 2 +- source/blender/python/generic/idprop_py_api.c | 2 +- source/blender/render/intern/source/bake.c | 4 +-- source/blender/render/intern/source/sunsky.c | 3 +- 55 files changed, 140 insertions(+), 138 deletions(-) (limited to 'source') 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) || diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c index 91495ce3c9c..bae56444f37 100644 --- a/source/blender/blenlib/intern/boxpack2d.c +++ b/source/blender/blenlib/intern/boxpack2d.c @@ -236,8 +236,8 @@ static int vertex_sort(const void *p1, const void *p2) BoxVert *v1, *v2; float a1, a2; - v1 = vertarray + ((int *)p1)[0]; - v2 = vertarray + ((int *)p2)[0]; + v1 = vertarray + ((const int *)p1)[0]; + v2 = vertarray + ((const int *)p2)[0]; #ifdef USE_FREE_STRIP /* push free verts to the end so we can strip */ diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index f6bbd3273f9..99b9f7931d8 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -896,7 +896,7 @@ int BLI_move(const char *file, const char *to) } #endif -static char *check_destination(const char *file, const char *to) +static const char *check_destination(const char *file, const char *to) { struct stat st; @@ -927,18 +927,18 @@ static char *check_destination(const char *file, const char *to) } } - return (char *)to; + return to; } int BLI_copy(const char *file, const char *to) { - char *actual_to = check_destination(file, to); + const char *actual_to = check_destination(file, to); int ret; ret = recursive_operation(file, actual_to, copy_callback_pre, copy_single_file, NULL); if (actual_to != to) - MEM_freeN(actual_to); + MEM_freeN((void *)actual_to); return ret; } diff --git a/source/blender/blenlib/intern/hash_mm2a.c b/source/blender/blenlib/intern/hash_mm2a.c index 8b4242fa5be..bae098ae96b 100644 --- a/source/blender/blenlib/intern/hash_mm2a.c +++ b/source/blender/blenlib/intern/hash_mm2a.c @@ -81,7 +81,7 @@ void BLI_hash_mm2a_add(BLI_HashMurmur2A *mm2, const unsigned char *data, size_t mm2a_mix_tail(mm2, &data, &len); for (; len >= 4; data += 4, len -= 4) { - uint32_t k = *(uint32_t *)data; + uint32_t k = *(const uint32_t *)data; MM2A_MIX(mm2->hash, k); } diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c index 6ddea300404..a606ac41aa1 100644 --- a/source/blender/blenlib/intern/scanfill_utils.c +++ b/source/blender/blenlib/intern/scanfill_utils.c @@ -136,8 +136,8 @@ static int edge_isect_ls_sort_cb(void *thunk, const void *def_a_ptr, const void { const float *co = thunk; - const ScanFillIsect *i_a = ((LinkData *)def_a_ptr)->data; - const ScanFillIsect *i_b = ((LinkData *)def_b_ptr)->data; + const ScanFillIsect *i_a = ((const LinkData *)def_a_ptr)->data; + const ScanFillIsect *i_b = ((const LinkData *)def_b_ptr)->data; const float a = len_squared_v2v2(co, i_a->co); const float b = len_squared_v2v2(co, i_b->co); diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c index ef0fcc7f1e3..f2930044204 100644 --- a/source/blender/blenlib/intern/string_utf8.c +++ b/source/blender/blenlib/intern/string_utf8.c @@ -69,11 +69,11 @@ static const char trailingBytesForUTF8[256] = { int BLI_utf8_invalid_byte(const char *str, int length) { - const unsigned char *p, *pend = (unsigned char *)str + length; + const unsigned char *p, *pend = (const unsigned char *)str + length; unsigned char c; int ab; - for (p = (unsigned char *)str; p < pend; p++) { + for (p = (const unsigned char *)str; p < pend; p++) { c = *p; if (c < 128) continue; @@ -130,7 +130,7 @@ int BLI_utf8_invalid_byte(const char *str, int length) utf8_error: - return (int)((char *)p - (char *)str) - 1; + return (int)((const char *)p - (const char *)str) - 1; } int BLI_utf8_invalid_strip(char *str, int length) diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index a6001e6716f..c4ce60b08a9 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3123,14 +3123,14 @@ static void lib_link_key(FileData *fd, Main *main) static void switch_endian_keyblock(Key *key, KeyBlock *kb) { int elemsize, a, b; - const char *data, *poin, *cp; + char *data; elemsize = key->elemsize; data = kb->data; for (a = 0; a < kb->totelem; a++) { - cp = key->elemstr; - poin = data; + const char *cp = key->elemstr; + char *poin = data; while (cp[0]) { /* cp[0] == amount */ switch (cp[1]) { /* cp[1] = type */ diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index bf82a4fa551..b32460d39f9 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1448,7 +1448,7 @@ static void write_pose(WriteData *wd, bPose *pose) /* write IK param */ if (pose->ikparam) { - const char *structname = (char *)BKE_pose_ikparam_get_name(pose); + const char *structname = BKE_pose_ikparam_get_name(pose); if (structname) writestruct(wd, DATA, structname, 1, pose->ikparam); } diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 901b96c3ae0..308fa98843b 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -744,17 +744,17 @@ bool BM_vert_is_edge_pair(BMVert *v) /** * Returns the number of edges around this vertex. */ -int BM_vert_edge_count(BMVert *v) +int BM_vert_edge_count(const BMVert *v) { return bmesh_disk_count(v); } -int BM_vert_edge_count_nonwire(BMVert *v) +int BM_vert_edge_count_nonwire(const BMVert *v) { int count = 0; BMIter eiter; BMEdge *edge; - BM_ITER_ELEM (edge, &eiter, v, BM_EDGES_OF_VERT) { + BM_ITER_ELEM (edge, &eiter, (BMVert *)v, BM_EDGES_OF_VERT) { if (edge->l) { count++; } @@ -764,7 +764,7 @@ int BM_vert_edge_count_nonwire(BMVert *v) /** * Returns the number of faces around this edge */ -int BM_edge_face_count(BMEdge *e) +int BM_edge_face_count(const BMEdge *e) { int count = 0; @@ -786,7 +786,7 @@ int BM_edge_face_count(BMEdge *e) * Returns the number of faces around this vert * length matches #BM_LOOPS_OF_VERT iterator */ -int BM_vert_face_count(BMVert *v) +int BM_vert_face_count(const BMVert *v) { return bmesh_disk_facevert_count(v); } diff --git a/source/blender/bmesh/intern/bmesh_queries.h b/source/blender/bmesh/intern/bmesh_queries.h index 3dee4540c4c..9d598f865d0 100644 --- a/source/blender/bmesh/intern/bmesh_queries.h +++ b/source/blender/bmesh/intern/bmesh_queries.h @@ -64,10 +64,10 @@ BMFace *BM_vert_pair_share_face_by_angle( BMLoop **r_l_a, BMLoop **r_l_b, const bool allow_adjacent) ATTR_NONNULL(); -int BM_vert_edge_count_nonwire(BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -int BM_vert_edge_count(BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -int BM_edge_face_count(BMEdge *e) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -int BM_vert_face_count(BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +int BM_vert_edge_count_nonwire(const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +int BM_vert_edge_count(const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +int BM_edge_face_count(const BMEdge *e) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +int BM_vert_face_count(const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); BMEdge *BM_vert_other_disk_edge(BMVert *v, BMEdge *e) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); bool BM_vert_is_edge_pair(BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 75f9feef413..9c8b9ca160d 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -238,7 +238,7 @@ void bmo_weld_verts_exec(BMesh *bm, BMOperator *op) static int vergaverco(const void *e1, const void *e2) { - const BMVert *v1 = *(void **)e1, *v2 = *(void **)e2; + const BMVert *v1 = *(const void **)e1, *v2 = *(const void **)e2; float x1 = v1->co[0] + v1->co[1] + v1->co[2]; float x2 = v2->co[0] + v2->co[1] + v2->co[2]; diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c index 7df9269a4a8..92048f32a28 100644 --- a/source/blender/datatoc/datatoc_icon.c +++ b/source/blender/datatoc/datatoc_icon.c @@ -166,7 +166,8 @@ static bool write_png(const char *name, const unsigned int *pixels, /* set the individual row-pointers to point at the correct offsets */ for (i = 0; i < height; i++) { row_pointers[height - 1 - i] = (png_bytep) - (((unsigned char *)pixels) + (i * width) * bytesperpixel * sizeof(unsigned char)); + (((const unsigned char *)pixels) + + (i * width) * bytesperpixel * sizeof(unsigned char)); } /* write out the entire image data in one call */ diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 9f992e1063a..d76eba93640 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -3909,7 +3909,7 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann } /* Draw UI widgets the given channel */ -void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale, uiBlock *block, float yminc, float ymaxc, size_t channel_index) +void ANIM_channel_draw_widgets(const bContext *C, bAnimContext *ac, bAnimListElem *ale, uiBlock *block, float yminc, float ymaxc, size_t channel_index) { bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); View2D *v2d = &ac->ar->v2d; diff --git a/source/blender/editors/armature/pose_group.c b/source/blender/editors/armature/pose_group.c index 9c27fe5218a..413a74d24b5 100644 --- a/source/blender/editors/armature/pose_group.c +++ b/source/blender/editors/armature/pose_group.c @@ -365,8 +365,8 @@ typedef struct tSortActionGroup { /* compare bone groups by name */ static int compare_agroup(const void *sgrp_a_ptr, const void *sgrp_b_ptr) { - tSortActionGroup *sgrp_a = (tSortActionGroup *)sgrp_a_ptr; - tSortActionGroup *sgrp_b = (tSortActionGroup *)sgrp_b_ptr; + const tSortActionGroup *sgrp_a = sgrp_a_ptr; + const tSortActionGroup *sgrp_b = sgrp_b_ptr; return strcmp(sgrp_a->agrp->name, sgrp_b->agrp->name); } diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 108166109b8..1a4b0c0d6a2 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -1884,8 +1884,8 @@ static void undoFont_to_editFont(void *strv, void *ecu, void *UNUSED(obdata)) EditFont *ef = cu->editfont; const char *str = strv; - ef->pos = *((short *)str); - ef->len = *((short *)(str + 2)); + ef->pos = *((const short *)str); + ef->len = *((const short *)(str + 2)); memcpy(ef->textbuf, str + 4, (ef->len + 1) * sizeof(wchar_t)); memcpy(ef->textbufinfo, str + 4 + (ef->len + 1) * sizeof(wchar_t), ef->len * sizeof(CharInfo)); diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index cd0cfeb7e7f..50581429700 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -458,7 +458,7 @@ void ANIM_channel_debug_print_info(bAnimListElem *ale, short indent_level); /* Draw the given channel */ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc); /* Draw the widgets for the given channel */ -void ANIM_channel_draw_widgets(struct bContext *C, bAnimContext *ac, bAnimListElem *ale, struct uiBlock *block, float yminc, float ymaxc, size_t channel_index); +void ANIM_channel_draw_widgets(const struct bContext *C, bAnimContext *ac, bAnimListElem *ale, struct uiBlock *block, float yminc, float ymaxc, size_t channel_index); /* ------------------------ Editing API -------------------------- */ diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 517b8b61ac1..a54ced53e5e 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -931,7 +931,7 @@ static void icon_create_rect(struct PreviewImage *prv_img, enum eIconSizes size) /* only called when icon has changed */ /* only call with valid pointer from UI_icon_draw */ -static void icon_set_image(bContext *C, ID *id, PreviewImage *prv_img, enum eIconSizes size) +static void icon_set_image(const bContext *C, ID *id, PreviewImage *prv_img, enum eIconSizes size) { if (!prv_img) { if (G.debug & G_DEBUG) @@ -1149,7 +1149,7 @@ static void icon_draw_size(float x, float y, int icon_id, float aspect, float al } } -static void ui_id_preview_image_render_size(bContext *C, ID *id, PreviewImage *pi, int size) +static void ui_id_preview_image_render_size(const bContext *C, ID *id, PreviewImage *pi, int size) { if ((pi->changed[size] || !pi->rect[size])) { /* changed only ever set by dynamic icons */ /* create the rect if necessary */ @@ -1159,7 +1159,7 @@ static void ui_id_preview_image_render_size(bContext *C, ID *id, PreviewImage *p } } -static void ui_id_icon_render(bContext *C, ID *id, const bool big) +static void ui_id_icon_render(const bContext *C, ID *id, const bool big) { PreviewImage *pi = BKE_previewimg_get(id); @@ -1171,7 +1171,7 @@ static void ui_id_icon_render(bContext *C, ID *id, const bool big) } } -static void ui_id_brush_render(bContext *C, ID *id) +static void ui_id_brush_render(const bContext *C, ID *id) { PreviewImage *pi = BKE_previewimg_get(id); enum eIconSizes i; @@ -1190,7 +1190,7 @@ static void ui_id_brush_render(bContext *C, ID *id) } -static int ui_id_brush_get_icon(bContext *C, ID *id) +static int ui_id_brush_get_icon(const bContext *C, ID *id) { Brush *br = (Brush *)id; @@ -1243,7 +1243,7 @@ static int ui_id_brush_get_icon(bContext *C, ID *id) return id->icon_id; } -int ui_id_icon_get(bContext *C, ID *id, const bool big) +int ui_id_icon_get(const bContext *C, ID *id, const bool big) { int iconid = 0; diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 2c3a239b2a2..7a217e5ff10 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -659,7 +659,7 @@ void ui_draw_preview_item(struct uiFontStyle *fstyle, rcti *rect, const char *na void uiStyleInit(void); /* interface_icons.c */ -int ui_id_icon_get(struct bContext *C, struct ID *id, const bool big); +int ui_id_icon_get(const struct bContext *C, struct ID *id, const bool big); /* resources.c */ void init_userdef_do_versions(void); diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 7a8d2afb68e..d316360a1ab 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1450,8 +1450,8 @@ typedef struct CollItemSearch { static int sort_search_items_list(const void *a, const void *b) { - CollItemSearch *cis1 = (CollItemSearch *)a; - CollItemSearch *cis2 = (CollItemSearch *)b; + const CollItemSearch *cis1 = (CollItemSearch *)a; + const CollItemSearch *cis2 = (CollItemSearch *)b; if (BLI_strcasecmp(cis1->name, cis2->name) > 0) return 1; @@ -1492,7 +1492,7 @@ static void rna_search_cb(const struct bContext *C, void *arg_but, const char *s BLI_strncpy(name_ui, id->name + 2, sizeof(name_ui)); #endif name = BLI_strdup(name_ui); - iconid = ui_id_icon_get((bContext *)C, id, false); + iconid = ui_id_icon_get(C, id, false); } else { name = RNA_struct_name_get_alloc(&itemptr, NULL, 0, NULL); /* could use the string length here */ diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 9d96513095e..214fcfa2389 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -154,7 +154,7 @@ static void id_search_cb(const bContext *C, void *arg_template, const char *str, char name_ui[MAX_ID_NAME + 1]; name_uiprefix_id(name_ui, id); - iconid = ui_id_icon_get((bContext *)C, id, template->preview); + iconid = ui_id_icon_get(C, id, template->preview); if (false == UI_search_item_add(items, name_ui, id, iconid)) break; diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index a0af914e0bc..c7915d450e8 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -664,7 +664,7 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo } } - return (unsigned char *)cp; + return (const unsigned char *)cp; } /* use this call to init new bone color sets in Theme */ diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index f42e35945d7..de46d47e5a3 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -2305,7 +2305,7 @@ void UI_view2d_text_cache_add(View2D *v2d, float x, float y, BLI_LINKS_PREPEND(g_v2d_strings, v2s); - v2s->col.pack = *((int *)col); + v2s->col.pack = *((const int *)col); memset(&v2s->rect, 0, sizeof(v2s->rect)); @@ -2336,7 +2336,7 @@ void UI_view2d_text_cache_add_rectf(View2D *v2d, const rctf *rect_view, BLI_LINKS_PREPEND(g_v2d_strings, v2s); - v2s->col.pack = *((int *)col); + v2s->col.pack = *((const int *)col); v2s->rect = rect; diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 9cb0fc6e8ae..7f20970cfb9 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -2025,8 +2025,8 @@ static int knife_update_active(KnifeTool_OpData *kcd) static int sort_verts_by_dist_cb(void *co_p, const void *cur_a_p, const void *cur_b_p) { - KnifeVert *cur_a = ((Ref *)cur_a_p)->ref; - KnifeVert *cur_b = ((Ref *)cur_b_p)->ref; + const KnifeVert *cur_a = ((const Ref *)cur_a_p)->ref; + const KnifeVert *cur_b = ((const Ref *)cur_b_p)->ref; const float *co = co_p; const float a_sq = len_squared_v3v3(co, cur_a->co); const float b_sq = len_squared_v3v3(co, cur_b->co); diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index bd17631b7cd..d3073d519f6 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -3362,8 +3362,8 @@ static int loop_find_region(BMLoop *l, int flag, static int verg_radial(const void *va, const void *vb) { - BMEdge *e_a = *((BMEdge **)va); - BMEdge *e_b = *((BMEdge **)vb); + const BMEdge *e_a = *((const BMEdge **)va); + const BMEdge *e_b = *((const BMEdge **)vb); int a, b; a = BM_edge_face_count(e_a); diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index 92a9112b6e5..23bc4a483d3 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -557,15 +557,15 @@ static int uv_element_offset_from_face_get(UvElementMap *map, BMFace *efa, BMLoo static unsigned int uv_edge_hash(const void *key) { - UvEdge *edge = (UvEdge *)key; + const UvEdge *edge = key; return (BLI_ghashutil_uinthash(edge->uv2) + BLI_ghashutil_uinthash(edge->uv1)); } static bool uv_edge_compare(const void *a, const void *b) { - UvEdge *edge1 = (UvEdge *)a; - UvEdge *edge2 = (UvEdge *)b; + const UvEdge *edge1 = a; + const UvEdge *edge2 = b; if ((edge1->uv1 == edge2->uv1) && (edge1->uv2 == edge2->uv2)) { return 0; diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index c5105fd9724..ef3c3504a85 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -618,7 +618,7 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar) /* *********************************************** */ /* Channel List */ -void draw_nla_channel_list(bContext *C, bAnimContext *ac, ARegion *ar) +void draw_nla_channel_list(const bContext *C, bAnimContext *ac, ARegion *ar) { ListBase anim_data = {NULL, NULL}; bAnimListElem *ale; diff --git a/source/blender/editors/space_nla/nla_intern.h b/source/blender/editors/space_nla/nla_intern.h index 766ae28da6f..bd96b5a4de5 100644 --- a/source/blender/editors/space_nla/nla_intern.h +++ b/source/blender/editors/space_nla/nla_intern.h @@ -50,7 +50,7 @@ void NLA_OT_properties(wmOperatorType *ot); /* nla_draw.c */ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar); -void draw_nla_channel_list(bContext *C, bAnimContext *ac, ARegion *ar); +void draw_nla_channel_list(const bContext *C, bAnimContext *ac, ARegion *ar); /* **************************************** */ /* nla_select.c */ diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index cc1d6002134..ec584525aeb 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -236,7 +236,7 @@ static void nla_channel_area_draw(const bContext *C, ARegion *ar) /* data */ if (ANIM_animdata_get_context(C, &ac)) { - draw_nla_channel_list((bContext *)C, &ac, ar); + draw_nla_channel_list(C, &ac, ar); } /* reset view matrix */ diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c index 83015228b78..f046670f387 100644 --- a/source/blender/editors/space_node/node_add.c +++ b/source/blender/editors/space_node/node_add.c @@ -453,8 +453,8 @@ static int new_node_tree_exec(bContext *C, wmOperator *op) PointerRNA ptr, idptr; PropertyRNA *prop; const char *idname; - char _treename[MAX_ID_NAME - 2]; - char *treename = _treename; + char treename_buf[MAX_ID_NAME - 2]; + const char *treename; if (RNA_struct_property_is_set(op->ptr, "type")) { prop = RNA_struct_find_property(op->ptr, "type"); @@ -466,10 +466,11 @@ static int new_node_tree_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; if (RNA_struct_property_is_set(op->ptr, "name")) { - RNA_string_get(op->ptr, "name", treename); + RNA_string_get(op->ptr, "name", treename_buf); + treename = treename_buf; } else { - treename = (char *)DATA_("NodeTree"); + treename = DATA_("NodeTree"); } if (!ntreeTypeFind(idname)) { diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index 9b3b9f23036..24b3776da6d 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -55,7 +55,7 @@ static void rgb_to_yuv_normalized(const float rgb[3], float yuv[3]) static void scope_put_pixel(unsigned char *table, unsigned char *pos) { - char newval = table[*pos]; + unsigned char newval = table[*pos]; pos[0] = pos[1] = pos[2] = newval; pos[3] = 255; } @@ -148,8 +148,8 @@ static ImBuf *make_waveform_view_from_ibuf_byte(ImBuf *ibuf) { ImBuf *rval = IMB_allocImBuf(ibuf->x + 3, 515, 32, IB_rect); int x, y; - unsigned char *src = (unsigned char *) ibuf->rect; - unsigned char *tgt = (unsigned char *) rval->rect; + const unsigned char *src = (unsigned char *)ibuf->rect; + unsigned char *tgt = (unsigned char *)rval->rect; int w = ibuf->x + 3; int h = 515; float waveform_gamma = 0.2; @@ -166,7 +166,7 @@ static ImBuf *make_waveform_view_from_ibuf_byte(ImBuf *ibuf) unsigned char *last_p = NULL; for (x = 0; x < ibuf->x; x++) { - unsigned char *rgb = src + 4 * (ibuf->x * y + x); + const unsigned char *rgb = src + 4 * (ibuf->x * y + x); float v = (float)rgb_to_luma_byte(rgb) / 255.0f; unsigned char *p = tgt; p += 4 * (w * ((int) (v * (h - 3)) + 1) + x + 1); @@ -189,7 +189,7 @@ static ImBuf *make_waveform_view_from_ibuf_float(ImBuf *ibuf) { ImBuf *rval = IMB_allocImBuf(ibuf->x + 3, 515, 32, IB_rect); int x, y; - float *src = ibuf->rect_float; + const float *src = ibuf->rect_float; unsigned char *tgt = (unsigned char *) rval->rect; int w = ibuf->x + 3; int h = 515; @@ -245,8 +245,8 @@ static ImBuf *make_sep_waveform_view_from_ibuf_byte(ImBuf *ibuf) { ImBuf *rval = IMB_allocImBuf(ibuf->x + 3, 515, 32, IB_rect); int x, y; - unsigned char *src = (unsigned char *) ibuf->rect; - unsigned char *tgt = (unsigned char *) rval->rect; + const unsigned char *src = (const unsigned char *)ibuf->rect; + unsigned char *tgt = (unsigned char *)rval->rect; int w = ibuf->x + 3; int sw = ibuf->x / 3; int h = 515; @@ -264,7 +264,7 @@ static ImBuf *make_sep_waveform_view_from_ibuf_byte(ImBuf *ibuf) for (x = 0; x < ibuf->x; x++) { int c; - unsigned char *rgb = src + 4 * (ibuf->x * y + x); + const unsigned char *rgb = src + 4 * (ibuf->x * y + x); for (c = 0; c < 3; c++) { unsigned char *p = tgt; p += 4 * (w * ((rgb[c] * (h - 3)) / 255 + 1) + c * sw + x / 3 + 1); @@ -290,8 +290,8 @@ static ImBuf *make_sep_waveform_view_from_ibuf_float(ImBuf *ibuf) { ImBuf *rval = IMB_allocImBuf(ibuf->x + 3, 515, 32, IB_rect); int x, y; - float *src = ibuf->rect_float; - unsigned char *tgt = (unsigned char *) rval->rect; + const float *src = ibuf->rect_float; + unsigned char *tgt = (unsigned char *)rval->rect; int w = ibuf->x + 3; int sw = ibuf->x / 3; int h = 515; @@ -455,7 +455,7 @@ static ImBuf *make_histogram_view_from_ibuf_byte(ImBuf *ibuf) ImBuf *rval = IMB_allocImBuf(515, 128, 32, IB_rect); int x, y; unsigned int nr, ng, nb; - unsigned char *src = (unsigned char *) ibuf->rect; + const unsigned char *src = (unsigned char *)ibuf->rect; unsigned int bins[3][HIS_STEPS]; @@ -468,7 +468,7 @@ static ImBuf *make_histogram_view_from_ibuf_byte(ImBuf *ibuf) memset(cur_bins, 0, sizeof(cur_bins)); for (x = 0; x < ibuf->x; x++) { - unsigned char *pixel = src + (y * ibuf->x + x) * 4; + const unsigned char *pixel = src + (y * ibuf->x + x) * 4; cur_bins[0][pixel[0]]++; cur_bins[1][pixel[1]]++; @@ -532,7 +532,7 @@ static ImBuf *make_histogram_view_from_ibuf_float(ImBuf *ibuf) { ImBuf *rval = IMB_allocImBuf(515, 128, 32, IB_rect); int nr, ng, nb, x, y; - float *src = ibuf->rect_float; + const float *src = ibuf->rect_float; unsigned int bins[3][HIS_STEPS]; @@ -635,7 +635,7 @@ static ImBuf *make_vectorscope_view_from_ibuf_byte(ImBuf *ibuf) { ImBuf *rval = IMB_allocImBuf(515, 515, 32, IB_rect); int x, y; - char *src = (char *) ibuf->rect; + const char *src = (const char *) ibuf->rect; char *tgt = (char *) rval->rect; float rgb[3], yuv[3]; int w = 515; @@ -659,7 +659,7 @@ static ImBuf *make_vectorscope_view_from_ibuf_byte(ImBuf *ibuf) for (y = 0; y < ibuf->y; y++) { for (x = 0; x < ibuf->x; x++) { const char *src1 = src + 4 * (ibuf->x * y + x); - const char *p; + char *p; rgb[0] = (float)src1[0] / 255.0f; rgb[1] = (float)src1[1] / 255.0f; @@ -681,7 +681,7 @@ static ImBuf *make_vectorscope_view_from_ibuf_float(ImBuf *ibuf) { ImBuf *rval = IMB_allocImBuf(515, 515, 32, IB_rect); int x, y; - float *src = ibuf->rect_float; + const float *src = ibuf->rect_float; char *tgt = (char *) rval->rect; float rgb[3], yuv[3]; int w = 515; diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index d054ccc1a85..c51a192b109 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -3402,8 +3402,8 @@ static void p_chart_stretch_minimize(PChart *chart, RNG *rng) static int p_compare_geometric_uv(const void *a, const void *b) { - PVert *v1 = *(PVert **)a; - PVert *v2 = *(PVert **)b; + const PVert *v1 = *(const PVert **)a; + const PVert *v2 = *(const PVert **)b; if (v1->uv[0] < v2->uv[0]) return -1; diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index eab3d5965f6..c5931cf2943 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -1354,16 +1354,15 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final) /* Stitch hash initialization functions */ static unsigned int uv_edge_hash(const void *key) { - UvEdge *edge = (UvEdge *)key; - return - BLI_ghashutil_uinthash(edge->uv2) + - BLI_ghashutil_uinthash(edge->uv1); + const UvEdge *edge = key; + return (BLI_ghashutil_uinthash(edge->uv2) + + BLI_ghashutil_uinthash(edge->uv1)); } static bool uv_edge_compare(const void *a, const void *b) { - UvEdge *edge1 = (UvEdge *)a; - UvEdge *edge2 = (UvEdge *)b; + const UvEdge *edge1 = a; + const UvEdge *edge2 = b; if ((edge1->uv1 == edge2->uv1) && (edge1->uv2 == edge2->uv2)) { return 0; diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index e29d955407c..1f9efdcbefd 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -238,7 +238,7 @@ GPUFunction *GPU_lookup_function(const char *name) gpu_parse_functions_string(FUNCTION_HASH, glsl_material_library); } - return (GPUFunction*)BLI_ghash_lookup(FUNCTION_HASH, (void *)name); + return BLI_ghash_lookup(FUNCTION_HASH, (const void *)name); } void gpu_codegen_init(void) diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index 880df0ce5c3..0e71206517e 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -135,7 +135,7 @@ LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t { CineonMainHeader header; LogImageFile *cineon = (LogImageFile *)MEM_mallocN(sizeof(LogImageFile), __func__); - char *filename = (char *)byteStuff; + const char *filename = (const char *)byteStuff; int i; unsigned int dataOffset; diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index 626d05b05c5..e561101ecb3 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -134,7 +134,7 @@ LogImageFile *dpxOpen(const unsigned char *byteStuff, int fromMemory, size_t buf { DpxMainHeader header; LogImageFile *dpx = (LogImageFile *)MEM_mallocN(sizeof(LogImageFile), __func__); - char *filename = (char *)byteStuff; + const char *filename = (const char *)byteStuff; int i; if (dpx == NULL) { diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 43b766f161b..049d8bdcff1 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -243,7 +243,7 @@ static ColormnaageCacheData *colormanage_cachedata_get(const ImBuf *ibuf) static unsigned int colormanage_hashhash(const void *key_v) { - ColormanageCacheKey *key = (ColormanageCacheKey *)key_v; + const ColormanageCacheKey *key = key_v; unsigned int rval = (key->display << 16) | (key->view % 0xffff); @@ -252,8 +252,8 @@ static unsigned int colormanage_hashhash(const void *key_v) static bool colormanage_hashcmp(const void *av, const void *bv) { - const ColormanageCacheKey *a = (ColormanageCacheKey *) av; - const ColormanageCacheKey *b = (ColormanageCacheKey *) bv; + const ColormanageCacheKey *a = av; + const ColormanageCacheKey *b = bv; return ((a->view != b->view) || (a->display != b->display)); diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index 1641bd3089b..8589ce09b9e 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -99,22 +99,22 @@ typedef struct MovieCacheItem { static unsigned int moviecache_hashhash(const void *keyv) { - MovieCacheKey *key = (MovieCacheKey *)keyv; + const MovieCacheKey *key = keyv; return key->cache_owner->hashfp(key->userkey); } static bool moviecache_hashcmp(const void *av, const void *bv) { - const MovieCacheKey *a = (MovieCacheKey *)av; - const MovieCacheKey *b = (MovieCacheKey *)bv; + const MovieCacheKey *a = av; + const MovieCacheKey *b = bv; return a->cache_owner->cmpfp(a->userkey, b->userkey); } static void moviecache_keyfree(void *val) { - MovieCacheKey *key = (MovieCacheKey *)val; + MovieCacheKey *key = val; BLI_mempool_free(key->cache_owner->userkeys_pool, key->userkey); @@ -167,8 +167,8 @@ static void check_unused_keys(MovieCache *cache) static int compare_int(const void *av, const void *bv) { - const int *a = (int *)av; - const int *b = (int *)bv; + const int *a = av; + const int *b = bv; return *a - *b; } diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 51a0c5a7b0f..ca8f56289ca 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -909,7 +909,7 @@ static void dna_write(FILE *file, const void *pntr, const int size) int i; const char *data; - data = (char *) pntr; + data = (const char *)pntr; for (i = 0; i < size; i++) { fprintf(file, "%d, ", data[i]); diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index e681552103b..09b970fe7fd 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -466,7 +466,7 @@ static const char *rna_ensure_property_identifier(const PropertyRNA *prop) if (prop->magic == RNA_MAGIC) return prop->identifier; else - return ((IDProperty *)prop)->name; + return ((const IDProperty *)prop)->name; } static const char *rna_ensure_property_description(PropertyRNA *prop) @@ -499,7 +499,7 @@ static const char *rna_ensure_property_name(const PropertyRNA *prop) if (prop->magic == RNA_MAGIC) name = prop->name; else - name = ((IDProperty *)prop)->name; + name = ((const IDProperty *)prop)->name; return name; } @@ -4284,7 +4284,7 @@ char *RNA_path_append(const char *path, PointerRNA *UNUSED(ptr), PropertyRNA *pr /* add .identifier */ if (path) { - BLI_dynstr_append(dynstr, (char *)path); + BLI_dynstr_append(dynstr, path); if (*path) BLI_dynstr_append(dynstr, "."); } diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 6c421c82195..34d05f61561 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -777,7 +777,7 @@ static void rna_Object_rotation_axis_angle_set(PointerRNA *ptr, const float *val /* for now, assume that rotation mode is axis-angle */ ob->rotAngle = value[0]; - copy_v3_v3(ob->rotAxis, (float *)&value[1]); + copy_v3_v3(ob->rotAxis, &value[1]); /* TODO: validate axis? */ } diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index f72f97b1681..07dac63f3fe 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -258,7 +258,7 @@ static void rna_PoseChannel_rotation_axis_angle_set(PointerRNA *ptr, const float /* for now, assume that rotation mode is axis-angle */ pchan->rotAngle = value[0]; - copy_v3_v3(pchan->rotAxis, (float *)&value[1]); + copy_v3_v3(pchan->rotAxis, &value[1]); /* TODO: validate axis? */ } diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 6046de2cf61..1066f859f7e 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -167,8 +167,8 @@ typedef struct SortVertsElem { static int svert_sum_cmp(const void *e1, const void *e2) { - const SortVertsElem *sv1 = (SortVertsElem *)e1; - const SortVertsElem *sv2 = (SortVertsElem *)e2; + const SortVertsElem *sv1 = e1; + const SortVertsElem *sv2 = e2; if (sv1->sum_co > sv2->sum_co) return 1; else if (sv1->sum_co < sv2->sum_co) return -1; diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 3512dc76cef..4fa5d0f755c 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -369,7 +369,7 @@ PyObject *BPy_BMVertSkin_CreatePyObject(struct MVertSkin *mvertskin) static void mloopcol_to_float(const MLoopCol *mloopcol, float r_col[3]) { - rgb_uchar_to_float(r_col, (unsigned char *)&mloopcol->r); + rgb_uchar_to_float(r_col, (const unsigned char *)&mloopcol->r); } static void mloopcol_from_float(MLoopCol *mloopcol, const float col[3]) diff --git a/source/blender/python/generic/bpy_internal_import.c b/source/blender/python/generic/bpy_internal_import.c index 2d19fdb87b3..b0539607bdc 100644 --- a/source/blender/python/generic/bpy_internal_import.c +++ b/source/blender/python/generic/bpy_internal_import.c @@ -265,7 +265,7 @@ PyObject *bpy_text_reimport(PyObject *module, int *found) } /* make into a module */ - return PyImport_ExecCodeModule((char *)name, text->compiled); + return PyImport_ExecCodeModule(name, text->compiled); } diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index 7fe282b2d71..be2782e90d6 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -376,7 +376,7 @@ bool BPy_IDProperty_Map_ValidateAndCreate(PyObject *name_obj, IDProperty *group, else if (PyUnicode_Check(ob)) { #ifdef USE_STRING_COERCE PyObject *value_coerce = NULL; - val.string.str = (char *)PyC_UnicodeAsByte(ob, &value_coerce); + val.string.str = PyC_UnicodeAsByte(ob, &value_coerce); val.string.subtype = IDP_STRING_SUB_UTF8; prop = IDP_New(IDP_STRING, &val, name); Py_XDECREF(value_coerce); diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c index dfec286e4ab..4aa2f4e919e 100644 --- a/source/blender/render/intern/source/bake.c +++ b/source/blender/render/intern/source/bake.c @@ -372,8 +372,8 @@ static void bake_displacement(void *handle, ShadeInput *UNUSED(shi), float dist, bs->vcol->b = col[2]; } else { - const char *imcol = (char *)(bs->rect + bs->rectx * y + x); - copy_v4_v4_char((char *)imcol, (char *)col); + char *imcol = (char *)(bs->rect + bs->rectx * y + x); + copy_v4_v4_char(imcol, (char *)col); } } if (bs->rect_mask) { diff --git a/source/blender/render/intern/source/sunsky.c b/source/blender/render/intern/source/sunsky.c index 1836b3f48a7..6078989f9f6 100644 --- a/source/blender/render/intern/source/sunsky.c +++ b/source/blender/render/intern/source/sunsky.c @@ -299,8 +299,7 @@ void GetSkyXYZRadiancef(struct SunSky *sunsky, const float varg[3], float color_ float theta, phi; float v[3]; - copy_v3_v3(v, (float *)varg); - normalize_v3(v); + normalize_v3_v3(v, varg); if (v[2] < 0.001f) { v[2] = 0.001f; -- cgit v1.2.3