Changeset 12916

Timestamp:

08/06/12 15:50:00 (13 years ago)

Author:

jschierm

Message:

A couple more changes for the xNew and xDelete in the KML classes.

File:

• issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp

@@ -548 +548 @@
         char*   kstr;
         char*   ktok;
+        double* dval2=NULL;
         char    delim[]={' ',',','\f','\n','\r','\t','\v','\0'};
 
@@ -575 +576 @@
         xDelete<char>(kstr);
 
-//      if (!maxlen)
+        if (!maxlen)
+                dval2=xNew<double>(i+1);
+                memcpy(dval2,*pdval,(i+1)*sizeof(double));
+                xDelete<double>(*pdval);
+                *pdval=dval2;
+                dval2=NULL;
 //              *pdval=(double *) xrealloc(*pdval,(i+1)*sizeof(double));
 
@@ -608 +614 @@
         char*   kstr;
         char*   ktok;
+        double* dval2=NULL;
         char    delim[]={' ',',','\f','\n','\r','\t','\v','\0'};
 
@@ -636 +643 @@
         xDelete<char>(kstr);
 
-//      if (!maxlen)
+        if (!maxlen)
+                dval2=xNew<double>((i+1)*n);
+                memcpy(dval2,*pdval,((i+1)*n)*sizeof(double));
+                xDelete<double>(*pdval);
+                *pdval=dval2;
+                dval2=NULL;
 //              *pdval=(double *) xrealloc(*pdval,((i+1)*n)*sizeof(double));