Changeset 0e3bb5 in git for kernel/GBEngine

Timestamp:

Nov 10, 2021, 10:40:57 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

44e1d6d6bd726ede0164014a5a50ac008bc42aad

Parents:

b992463aa28e647f5164c04e2f050ffc6772a29a

Message:

more omrealloc ->omreallocSize

File:

• kernel/GBEngine/tgb.cc (modified) (3 diffs)

kernel/GBEngine/tgb.cc

@@ -1413 +1413 @@
   }
 
-#define ENLARGE(pointer, type) pointer=(type*) omrealloc(pointer, c->array_lengths*sizeof(type))
+#define ENLARGE(pointer, type) pointer=(type*) omreallocSize(pointer, old*sizeof(type),c->array_lengths*sizeof(type))
 
 #define ENLARGE_ALIGN(pointer, type) {if(pointer)\
-         pointer=(type*)omReallocAligned(pointer, c->array_lengths*sizeof(type));\
+         pointer=(type*)omReallocSize(pointer, old*sizeof(type),c->array_lengths*sizeof(type));\
          else pointer=(type*)omAllocAligned(c->array_lengths*sizeof(type));}
 //  BOOLEAN corr=lenS_correct(c->strat);
@@ -1428 +1428 @@
     (sorted_pair_node **) omalloc (sizeof (sorted_pair_node *) * i);
   int spc = 0;
+  int old=c->array_lengths;
   if(c->n > c->array_lengths)
   {
@@ -4825 +4826 @@
       int i;
       for(i = 0; c->expandS[i]; i++) ;
-      c->expandS = (poly *) omrealloc (c->expandS, (i + 2) * sizeof (poly));
+      c->expandS = (poly *) omreallocSize (c->expandS, (i+1)*sizeof(poly),
+                                                       (i+2)*sizeof(poly));
       c->expandS[i] = erg.expand;
       c->expandS[i + 1] = NULL;