X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Farraylist.h;h=2fade202d754f5b8ce79ae627ec397366197e5c8;hb=refs%2Fheads%2Fmaster;hp=602557f53f38e3249595582f0ae4003c4b69c84b;hpb=0e6cf5b52d1ebce9272270144bcf43df4683507e;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/arraylist.h b/cinelerra-5.1/guicast/arraylist.h
index 602557f5..02a8aef8 100644
--- a/cinelerra-5.1/guicast/arraylist.h
+++ b/cinelerra-5.1/guicast/arraylist.h
@@ -1,3 +1,23 @@
+/*
+ * CINELERRA
+ * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ */
+
 #ifndef ARRAYLIST_H
 #define ARRAYLIST_H
 #include <stdio.h>
@@ -47,14 +67,14 @@ public:
 		remove();
 	}
 	void remove_block(int i, int n) {
-		if( i >= total ) return;
-		for( n+=i; n<total; ) values[i++] = values[n++];
+		if( i >= total || !n ) return;
+		for( n+=i; n<total; ++i,++n ) values[i] = values[n];
 		total = i;
 	}
 	void remove_object_block(int i, int n) {
-		if( i >= total ) return;
-		for( n+=i; n<total; ) { del_value(i); values[i++] = values[n++]; }
-		for( n=i; n<total; ++n ) del_value(n);
+		if( i >= total || !n ) return;
+		for( int j=i,k=n; --k>=0 && j<total; ++j ) del_value(j);
+		for( n+=i; n<total; ++i,++n ) values[i] = values[n];
 		total = i;
 	}
 	void remove(TYPE value) {