Replaced c-style casts with static_cast<>

Author: sdeming

kdtree.cpp

@@ -108,7 +108,7 @@ struct kdtree *kd_create(int k)
 {
 	struct kdtree *tree;
 
-	if(!(tree = (kdtree*)malloc(sizeof *tree))) {
+	if(!(tree = static_cast<kdtree*>(malloc(sizeof *tree)))) {
 		return 0;
 	}
 
@@ -165,10 +165,10 @@ static int insert_rec(struct kdnode **nptr, const double *pos, void *data, int d
 	struct kdnode *node;
 
 	if(!*nptr) {
-		if(!(node = (kdnode*)malloc(sizeof *node))) {
+		if(!(node = static_cast<kdnode*>(malloc(sizeof *node)))) {
 			return -1;
 		}
-		if(!(node->pos = (double*)malloc(dim * sizeof *node->pos))) {
+		if(!(node->pos = static_cast<double*>(malloc(dim * sizeof *node->pos)))) {
 			free(node);
 			return -1;
 		}
@@ -212,10 +212,10 @@ int kd_insertf(struct kdtree *tree, const float *pos, void *data)
 	if(dim > 16) {
 #ifndef NO_ALLOCA
 		if(dim <= 256)
-			bptr = buf = (double*)alloca(dim * sizeof *bptr);
+			bptr = buf = static_cast<double*>(alloca(dim * sizeof *bptr));
 		else
 #endif
-			if(!(bptr = buf = (double*)malloc(dim * sizeof *bptr))) {
+			if(!(bptr = buf = static_cast<double*>(malloc(dim * sizeof *bptr)))) {
 				return -1;
 			}
 	} else {
@@ -408,10 +408,10 @@ struct kdres *kd_nearest(struct kdtree *kd, const double *pos)
 	if (!kd->rect) return 0;
 
 	/* Allocate result set */
-	if(!(rset = (kdres*)malloc(sizeof *rset))) {
+	if(!(rset = static_cast<kdres*>(malloc(sizeof *rset)))) {
 		return 0;
 	}
-	if(!(rset->rlist = (res_node*)alloc_resnode())) {
+	if(!(rset->rlist = static_cast<res_node*>(alloc_resnode()))) {
 		free(rset);
 		return 0;
 	}
@@ -461,10 +461,10 @@ struct kdres *kd_nearestf(struct kdtree *tree, const float *pos)
 	if(dim > 16) {
 #ifndef NO_ALLOCA
 		if(dim <= 256)
-			bptr = buf = (double*)alloca(dim * sizeof *bptr);
+			bptr = buf = static_cast<double*>(alloca(dim * sizeof *bptr));
 		else
 #endif
-			if(!(bptr = buf = (double*)malloc(dim * sizeof *bptr))) {
+			if(!(bptr = buf = static_cast<double*>(malloc(dim * sizeof *bptr)))) {
 				return 0;
 			}
 	} else {
@@ -534,10 +534,10 @@ struct kdres *kd_nearest_range(struct kdtree *kd, const double *pos, double rang
 	int ret;
 	struct kdres *rset;
 
-	if(!(rset = (kdres*)malloc(sizeof *rset))) {
+	if(!(rset = static_cast<kdres*>(malloc(sizeof *rset)))) {
 		return 0;
 	}
-	if(!(rset->rlist = (res_node*)alloc_resnode())) {
+	if(!(rset->rlist = static_cast<res_node*>(alloc_resnode()))) {
 		free(rset);
 		return 0;
 	}
@@ -563,10 +563,10 @@ struct kdres *kd_nearest_rangef(struct kdtree *kd, const float *pos, float range
 	if(dim > 16) {
 #ifndef NO_ALLOCA
 		if(dim <= 256)
-			bptr = buf = (double*)alloca(dim * sizeof *bptr);
+			bptr = buf = static_cast<double*>(alloca(dim * sizeof *bptr));
 		else
 #endif
-			if(!(bptr = buf = (double*)malloc(dim * sizeof *bptr))) {
+			if(!(bptr = buf = static_cast<double*>(malloc(dim * sizeof *bptr)))) {
 				return 0;
 			}
 	} else {
@@ -689,16 +689,16 @@ static struct kdhyperrect* hyperrect_create(int dim, const double *min, const do
 	size_t size = dim * sizeof(double);
 	struct kdhyperrect* rect = 0;
 
-	if (!(rect = (kdhyperrect*)malloc(sizeof(struct kdhyperrect)))) {
+	if (!(rect = static_cast<kdhyperrect*>(malloc(sizeof(struct kdhyperrect))))) {
 		return 0;
 	}
 
 	rect->dim = dim;
-	if (!(rect->min = (double*)malloc(size))) {
+	if (!(rect->min = static_cast<double*>(malloc(size)))) {
 		free(rect);
 		return 0;
 	}
-	if (!(rect->max = (double*)malloc(size))) {
+	if (!(rect->max = static_cast<double*>(malloc(size)))) {
 		free(rect->min);
 		free(rect);
 		return 0;
@@ -806,7 +806,7 @@ static int rlist_insert(struct res_node *list, struct kdnode *item, double dist_
 {
 	struct res_node *rnode;
 
-	if(!(rnode = (res_node*)alloc_resnode())) {
+	if(!(rnode = static_cast<res_node*>(alloc_resnode()))) {
 		return -1;
 	}
 	rnode->item = item;