[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47632] trunk/blender/source/blender/ makesrna/intern/rna_sequencer_api.c: rna_SequenceElements_pop --> use memcpy instead of strcpy

Dan Eicher dan at trollwerks.org
Sat Jun 9 00:05:40 CEST 2012


Revision: 47632
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47632
Author:   dna
Date:     2012-06-08 22:05:26 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
rna_SequenceElements_pop --> use memcpy instead of strcpy

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c	2012-06-08 21:48:04 UTC (rev 47631)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c	2012-06-08 22:05:26 UTC (rev 47632)
@@ -339,7 +339,6 @@
 
 static void rna_SequenceElements_pop(ID *id, Sequence *seq, ReportList *reports, int index)
 {
-	int i;
 	Scene *scene = (Scene *)id;
 	StripElem *new_seq, *se;
 
@@ -361,13 +360,13 @@
 	new_seq = MEM_callocN(sizeof(StripElem) * (seq->len - 1), "SequenceElements_pop");
 	seq->len--;
 
-	/* TODO - simply use 2 memcpy calls */
-	for (i = 0, se = seq->strip->stripdata; i < seq->len; i++, se++) {
-		if (i == index)
-			se++;
-		BLI_strncpy(new_seq[i].name, se->name, sizeof(se->name));
-	}
+	se = seq->strip->stripdata;
+	if (index > 0)
+		memcpy(new_seq, se, sizeof(StripElem) * index);
 
+	if (index < seq->len)
+		memcpy(&new_seq[index], &se[index + 1], sizeof(StripElem) * (seq->len - index));
+
 	MEM_freeN(seq->strip->stripdata);
 	seq->strip->stripdata = new_seq;
 




More information about the Bf-blender-cvs mailing list