Changeset 28989 for branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/ImageSelection.c

Timestamp:

Aug 20, 2010, 11:04:39 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/ImageSelection.c (modified) (2 diffs)

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/ImageSelection.c

@@ -38 +38 @@
 /* free loaded images */
 void FreeImageSelection () {
-  if (image != NULL) free (image);
+  if (image != NULL) FreeImages(image);
   if (subset != NULL) free (subset);
   image = NULL;
@@ -45 +45 @@
 }
 
-Image *MatchImage (unsigned int time, short int source) { 
+Image *MatchImage (unsigned int time, short int source, unsigned int imageID) { 
 
   int m;
 
-  m = match_image_subset (image, subset, Nsubset, time, source);
+  if ((imageID != 0) && (imageID < Nimage)) {
+    m = (int) imageID - 1;
+  } else {
+    m = match_image_subset (image, subset, Nsubset, time, source);
+  }
   if (m == -1) return (NULL);
   if (!FindMosaicForImage (image, Nimage, m)) return (NULL);