[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58866] trunk/blender/source/blender/bmesh : correct invalid sizeof() use in bmesh (harmless in practice)

[Campbell Barton]

Revision: 58866
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58866
Author:   campbellbarton
Date:     2013-08-03 17:27:05 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
correct invalid sizeof() use in bmesh (harmless in practice)

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
    trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
    trunk/blender/source/blender/bmesh/operators/bmo_create.c
    trunk/blender/source/blender/bmesh/operators/bmo_wireframe.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c	2013-08-03 17:10:00 UTC (rev 58865)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c	2013-08-03 17:27:05 UTC (rev 58866)
@@ -523,7 +523,7 @@
 	/* --- */
 
 	/* create edges and find the winding (if faces are attached to any existing edges) */
-	vert_arr_map = MEM_mallocN(sizeof(BMVert **) * len, __func__);
+	vert_arr_map = MEM_mallocN(sizeof(BMVert *) * len, __func__);
 
 	for (i = 0; i < len; i++) {
 		vert_arr_map[i] = vert_arr[vang[i].index];

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2013-08-03 17:10:00 UTC (rev 58865)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2013-08-03 17:27:05 UTC (rev 58866)
@@ -507,13 +507,13 @@
 void *BMO_slot_as_arrayN(BMOpSlot slot_args[BMO_OP_MAX_SLOTS], const char *slot_name, int *len)
 {
 	BMOpSlot *slot = BMO_slot_get(slot_args, slot_name);
-	void *ret;
+	void **ret;
 
 	/* could add support for mapping type */
 	BLI_assert(slot->slot_type == BMO_OP_SLOT_ELEMENT_BUF);
 
-	ret = MEM_mallocN(sizeof(void **) * slot->len, __func__);
-	memcpy(ret, slot->data.buf, sizeof(void **) * slot->len);
+	ret = MEM_mallocN(sizeof(void *) * slot->len, __func__);
+	memcpy(ret, slot->data.buf, sizeof(void *) * slot->len);
 	*len = slot->len;
 	return ret;
 }

Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c	2013-08-03 17:10:00 UTC (rev 58865)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c	2013-08-03 17:27:05 UTC (rev 58866)
@@ -278,7 +278,7 @@
 		 * this connectivity could be used rather then treating
 		 * them as a bunch of isolated verts. */
 
-		BMVert **vert_arr = MEM_mallocN(sizeof(BMVert **) * totv, __func__);
+		BMVert **vert_arr = MEM_mallocN(sizeof(BMVert *) * totv, __func__);
 		BMFace *f;
 
 		BMO_iter_as_array(op->slots_in, "geom", BM_VERT, (void **)vert_arr, totv);

Modified: trunk/blender/source/blender/bmesh/operators/bmo_wireframe.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_wireframe.c	2013-08-03 17:10:00 UTC (rev 58865)
+++ trunk/blender/source/blender/bmesh/operators/bmo_wireframe.c	2013-08-03 17:27:05 UTC (rev 58866)
@@ -250,7 +250,7 @@
 		BM_mesh_elem_hflag_disable_all(bm, BM_VERT, BM_ELEM_TAG, false);
 	}
 
-	verts_loop = MEM_mallocN(sizeof(BMVert **) * verts_loop_tot, __func__);
+	verts_loop = MEM_mallocN(sizeof(BMVert *) * verts_loop_tot, __func__);
 	verts_loop_tot = 0; /* count up again */
 
 	BMO_ITER (f_src, &oiter, op->slots_in, "faces", BM_FACE) {