Changeset 37377 for branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/ImageMetadata.c

Timestamp:

Sep 8, 2014, 2:43:46 PM (12 years ago)

Author:

eugene

Message:

i am making image.coords.mosaic and image.parent pointers to the parent (PHU) coord and image strutures; BuildChipMatch sets these values and we do not need to call FindMosaicForImage

File:

• branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/ImageMetadata.c (modified) (1 diff)

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

@@ -156 +156 @@
   // assign the storage arrays
   for (i = 0; i < Nimage; i++) {
-    int Nmosaic = FindMosaicForImage (image, Nimage, i);
-    if (!Nmosaic) continue;
-    Nmosaic --;
+    if (!image[i].coords.mosaic) continue;
     imageID[i]  = image[i].imageID;
     externID[i] = image[i].externID;
-    crval1[i]   = image[Nmosaic].coords.crval1;
-    crval2[i]   = image[Nmosaic].coords.crval2;
-
-    theta[i]    = DEG_RAD*atan2(image[Nmosaic].coords.pc1_2, image[Nmosaic].coords.pc1_1);
+    Coords *mosaic = image[i].coords.mosaic;
+
+    crval1[i]   = mosaic->crval1;
+    crval2[i]   = mosaic->crval2;
+
+    theta[i]    = DEG_RAD*atan2(mosaic->pc1_2, mosaic->pc1_1);
 
     Mcal[i]     = image[i].Mcal;