Changeset 12356

Timestamp:

06/04/12 11:06:03 (13 years ago)

Author:

utke

Message:

rename to IssmDouble and use the memcpy wrapper

File:

• issm/trunk-jpl/src/c/objects/Contour.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/objects/Contour.cpp

@@ -24 +24 @@
 }
 /*}}}*/
-/*FUNCTION Contour::Contour(int pid, int nods, double* x, double* y,bool closed) {{{1*/
-Contour::Contour(int pid,int pnods, double* px, double* py,bool pclosed){
+/*FUNCTION Contour::Contour(int pid, int nods, IssmDouble* x, IssmDouble* y,bool closed) {{{1*/
+Contour::Contour(int pid,int pnods, IssmDouble* px, IssmDouble* py,bool pclosed){
         
         this->id=pid;
@@ -31 +31 @@
         this->closed=pclosed;
         if(nods){
-                this->x=(double*)xmalloc(nods*sizeof(double));
-                memcpy(this->x,px,nods*sizeof(double));
-                this->y=(double*)xmalloc(nods*sizeof(double));
-                memcpy(this->y,py,nods*sizeof(double));
+                this->x=xNew<IssmDouble>(nods);
+                xMemCpy<IssmDouble>(this->x,px,nods);
+                this->y=xNew<IssmDouble>(nods);
+                xMemCpy<IssmDouble>(this->y,py,nods);
         }
 }
@@ -40 +40 @@
 /*FUNCTION Contour::Contour() default constructor {{{1*/
 Contour::~Contour(){
-        xfree((void**)&this->x);
-        xfree((void**)&this->y);
+        xDelete<IssmDouble>(this->x);
+        xDelete<IssmDouble>(this->y);
 }
 /*}}}*/