Changeset 3140 in orxonox.OLD for orxonox/trunk/importer/array.cc

Timestamp:

Dec 10, 2004, 7:44:36 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/images back into the trunk.
merged with command: svn merge bensches/images/ trunk/ -r 3084:HEAD

Conflicts in configure/.ac

resolved in favor of branches/images (newer)

Mayor differences:

1. Image-Importing capability.
2. configure remade for usage with sdl-image/jpeglib and so on.
3. Absolutely no change in the trunk/src

File:

• orxonox/trunk/importer/array.cc (modified) (1 diff)

orxonox/trunk/importer/array.cc

@@ -33 +33 @@
     printf("deleting array\n");
   Entry* walker = firstEntry;
-  Entry* last;
-  while (walker != NULL)
+  Entry* previous;
+  while (walker)
     {
-      last = walker;
+      previous = walker;
       walker = walker->next;
-      delete last;
+      delete previous;
     }
   if (finalized)
-    delete [] array;
+    delete []array;
 }