Changeset 37563 for branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/AstromOffsetMapUtils.c

Timestamp:

Nov 6, 2014, 8:18:01 PM (12 years ago)

Author:

eugene

Message:

adding starpar parameters for measures

File:

• branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/AstromOffsetMapUtils.c (modified) (3 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/AstromOffsetMapUtils.c

@@ -24 +24 @@
 }
 
+AstromOffsetMap *AstromOffsetMapInit (int Nx, int Ny) {
+
+  AstromOffsetMap *map = NULL;
+  ALLOCATE (map, AstromOffsetMap, 1);
+
+  map->dX = NAN; 
+  map->dY = NAN; 
+  map->Nx = Nx; // output map size
+  map->Ny = Ny; // output map size
+ 
+  ALLOCATE (map->dXv, float *, map->Nx);
+  ALLOCATE (map->dYv, float *, map->Nx);
+
+  int j, k;
+  for (j = 0; j < map->Nx; j++) {
+    ALLOCATE (map->dXv[j], float, map->Ny);
+    ALLOCATE (map->dYv[j], float, map->Ny);
+
+    for (k = 0; k < map->Ny; k++) {
+      map->dXv[j][k] = 0.0;
+      map->dYv[j][k] = 0.0;
+    }
+  }
+
+  return map;
+}
+
+void AstromOffsetMapFree (AstromOffsetMap *map) {
+
+  if (!map) return;
+
+  int j;
+  for (j = 0; j < map->Nx; j++) {
+    if (map->dXv) free (map->dXv[j]);
+    if (map->dYv) free (map->dYv[j]);
+  }
+
+  free (map->dXv);
+  free (map->dYv);
+
+  free (map);
+
+  return;
+}
+
 int AstromOffsetTableNewMap (AstromOffsetTable *table, int order, Image *image) {
 
@@ -46 +91 @@
   table->IDtoSeq[image->imageID] = Nmap;
   
-  ALLOCATE (table->map[Nmap], AstromOffsetMap, 1);
-  table->map[Nmap][0].Nx      = Nx;
-  table->map[Nmap][0].Ny      = Ny;
+  table->map[Nmap] = AstromOffsetMapInit (Nx, Ny);
 
   table->MaxTableID ++;
@@ -57 +100 @@
   table->map[Nmap][0].dY = Ny / (float) image->NY;
 
-  ALLOCATE (table->map[Nmap][0].dXv, float *, Nx);
-  ALLOCATE (table->map[Nmap][0].dYv, float *, Nx);
-
-  int j, k;
-  for (j = 0; j < Nx; j++) {
-    ALLOCATE (table->map[Nmap][0].dXv[j], float, Ny);
-    ALLOCATE (table->map[Nmap][0].dYv[j], float, Ny);
-
-    for (k = 0; k < Ny; k++) {
-      table->map[Nmap][0].dXv[j][k] = 0.0;
-      table->map[Nmap][0].dYv[j][k] = 0.0;
-    }
-  }
   image[0].coords.offsetMap = table->map[Nmap];
   return TRUE;