Changeset 29124 for branches/eam_branches/ipp-20100823/Ohana/src/opihi/dvo/ImageSelection.c

Timestamp:

Sep 7, 2010, 9:16:10 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20100823

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/dvo/ImageSelection.c (modified) (1 diff)

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

@@ -47 +47 @@
 Image *MatchImage (unsigned int time, short int source, unsigned int imageID) { 
 
-  int m;
+  int m = -1;
 
   if ((imageID != 0) && (imageID < Nimage)) {
-    m = (int) imageID - 1;
-  } else {
+    // imageID is in range for the array of images. If the table is still in order and
+    // no images have been deleted the index of the image we are looking for will be imageID - 1
+    // If this is the case, we have it. Otherwise we'll have to go search for it below
+    int guess = (int) imageID - 1;
+    if (image[guess].imageID == imageID) {
+        m = guess;
+    }
+  } 
+  if (m == -1) {
     m = match_image_subset (image, subset, Nsubset, time, source);
   }