Browse Source

really fix bamReader this time

David Rose 18 years ago
parent
commit
57cbc60935
1 changed files with 2 additions and 1 deletions
  1. 2 1
      panda/src/putil/bamReader.cxx

+ 2 - 1
panda/src/putil/bamReader.cxx

@@ -1072,6 +1072,7 @@ resolve_object_pointers(TypedWritable *object,
   bool is_complete = true;
   bool is_complete = true;
 
 
   vector_typedWritable references;
   vector_typedWritable references;
+  references.reserve(pref._objects.size());
 
 
   vector_int::const_iterator pi;
   vector_int::const_iterator pi;
   for (pi = pref._objects.begin(); 
   for (pi = pref._objects.begin(); 
@@ -1122,7 +1123,7 @@ resolve_object_pointers(TypedWritable *object,
     }
     }
     int num_completed = 0;
     int num_completed = 0;
     if (!references.empty()) {
     if (!references.empty()) {
-      object->complete_pointers(&references[0], this);
+      num_completed = object->complete_pointers(&references[0], this);
     }
     }
     if (num_completed != (int)references.size()) {
     if (num_completed != (int)references.size()) {
       bam_cat.warning()
       bam_cat.warning()