[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11332] trunk/blender/source/blender/src/ editipo.c: Just a few little code cleanups for IPO cleaning code:
Joshua Leung
aligorith at gmail.com
Sun Jul 22 12:54:00 CEST 2007
Revision: 11332
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11332
Author: aligorith
Date: 2007-07-22 12:54:00 +0200 (Sun, 22 Jul 2007)
Log Message:
-----------
Just a few little code cleanups for IPO cleaning code:
* Replaced magic numbers (3rd argument for memcpy functions) with sizeof(float)*2 just to be safe, in case some weirdo compiler out there doesn't like them.
* Made a few comments a bit more descriptive
Modified Paths:
--------------
trunk/blender/source/blender/src/editipo.c
Modified: trunk/blender/source/blender/src/editipo.c
===================================================================
--- trunk/blender/source/blender/src/editipo.c 2007-07-21 23:36:33 UTC (rev 11331)
+++ trunk/blender/source/blender/src/editipo.c 2007-07-22 10:54:00 UTC (rev 11332)
@@ -3196,7 +3196,7 @@
thresh= G.scene->toolsettings->clean_thresh;
/* add first keyframe and setup tempolary array of beztriples */
- newb = newbs = MEM_callocN(sizeof(BezTriple)*totCount, "NewBeztriples");
+ newb = newbs = MEM_callocN(sizeof(BezTriple)*totCount, "NewBezTriples");
bezt= icu->bezt;
*newb= *bezt;
bezt++;
@@ -3206,12 +3206,12 @@
float prev[2], cur[2], next[2];
/* get references for quicker access */
- memcpy(prev, newb->vec[1], 8);
- memcpy(cur, bezt->vec[1], 8);
+ memcpy(prev, newb->vec[1], sizeof(float)*2);
+ memcpy(cur, bezt->vec[1], sizeof(float)*2);
if (i < (totCount - 1)) {
beztn = (bezt + 1);
- memcpy(next, beztn->vec[1], 8);
+ memcpy(next, beztn->vec[1], sizeof(float)*2);
}
else {
beztn = NULL;
@@ -3222,10 +3222,10 @@
if ((cur[0] - prev[0]) <= thresh) {
/* only add if values are a considerable distance apart */
if (IS_EQT(cur[1], prev[1], thresh) == 0) {
- /* add new keyframe */
- newCount++;
- newb++;
- *newb = *bezt;
+ /* add new keyframe */
+ newCount++;
+ newb++;
+ *newb = *bezt;
}
}
else {
@@ -3261,18 +3261,18 @@
if (totCount != newCount) {
BezTriple *newbz;
- /* make better sized list */
+ /* make a copy of the array which uses only as much memory as is needed */
newbz= MEM_callocN(sizeof(BezTriple)*newCount, "BezTriples");
memcpy(newbz, newbs, sizeof(BezTriple)*newCount);
- /* free and assign new */
+ /* free old arrays and assign new */
MEM_freeN(icu->bezt);
MEM_freeN(newbs);
icu->bezt= newbz;
icu->totvert= newCount;
}
else {
- /* free memory we used */
+ /* free temporary memory we used */
MEM_freeN(newbs);
}
More information about the Bf-blender-cvs
mailing list